[thorstenp] fix unreachable code

4 files changed, 51 insertions, 53 deletions

diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py
index ab88c200a..089a8b4d3 100644
--- a/src/common/GnuPG.py
+++ b/src/common/GnuPG.py
@@ -182,6 +182,9 @@ if gajim.HAVE_GPG:
 			output = proc.handles['stdout'].read()
 			proc.handles['stdout'].close()
 
+			try: proc.wait()
+			except IOError: pass
+
 			keys = {}
 			lines = output.split('\n')
 			for line in lines:
@@ -193,8 +196,6 @@ if gajim.HAVE_GPG:
 					# make it unicode instance
 					keys[sline[4][8:]] = helpers.decode_string(name)
 			return keys
-			try: proc.wait()
-			except IOError: pass
 
 		def get_secret_keys(self):
 			return self.get_keys(True)
diff --git a/src/common/proxy65_manager.py b/src/common/proxy65_manager.py
index 4782c13fa..c520ecb43 100644
--- a/src/common/proxy65_manager.py
+++ b/src/common/proxy65_manager.py
@@ -107,11 +107,10 @@ class ProxyResolver:
 		self.state = S_RESOLVED
 		#FIXME: re-enable proxy testing
 		self.state = S_FINISHED
-		return
-		self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
-			self.sid, self.sender_jid, self._on_receiver_success,
-			self._on_connect_failure)
-		self.receiver_tester.connect()
+		#self.receiver_tester = ReceiverTester(self.host, self.port, self.jid,
+		#	self.sid, self.sender_jid, self._on_receiver_success,
+		#	self._on_connect_failure)
+		#self.receiver_tester.connect()
 	
 	def _on_receiver_success(self):
 		self.host_tester = HostTester(self.host, self.port, self.jid, 
diff --git a/src/remote_control.py b/src/remote_control.py
index 75e9606e9..ec7054a93 100644
--- a/src/remote_control.py
+++ b/src/remote_control.py
@@ -328,7 +328,6 @@ class SignalObject(dbus.service.Object):
 		(optional) 'account' '''
 		if not jid:
 			raise MissingArgument
-			return DBUS_BOOLEAN(False)
 		jid = self._get_real_jid(jid, account)
 		try:
 			jid = helpers.parse_jid(jid)
@@ -409,7 +408,6 @@ class SignalObject(dbus.service.Object):
 			jid = unicode(jid)
 		if not jid:
 			raise MissingArgument
-			return DBUS_DICT_SV()
 		jid = self._get_real_jid(jid)
 
 		cached_vcard = gajim.connections.values()[0].get_cached_vcard(jid)
diff --git a/src/roster_window.py b/src/roster_window.py
index 28ca72b46..4e514f8b4 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -6050,52 +6050,52 @@ class RosterWindow:
 		return True
 
 	def setup_for_osx(self):
-		# This is broken
-		return
 		'''Massage the GTK menu so it will match up to the OS/X nib style menu
 		when passed to sync-menu and merged'''
-		main_menu = self.xml.get_widget('menubar')
-		app_item = gtk.MenuItem('Gajim')
-		main_menu.insert(app_item, 0)
-		win_item = gtk.MenuItem('Window')
-		main_menu.insert(win_item, 4)
-		actions_menu = self.xml.get_widget('actions_menu_menu')
-		quit_item = self.xml.get_widget('quit_menuitem')
-		actions_menu.remove(quit_item)
-		actions_menu.remove(self.xml.get_widget('separator1'))
-		edit_menu = self.xml.get_widget('edit_menu_menu')
-		#edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
-		edit_menu.remove(self.xml.get_widget('separator2'))
-		help_menu = self.xml.get_widget('help_menu_menu')
-		about_item = self.xml.get_widget('about_menuitem')
-		help_menu.remove(about_item)
-		# Build up App menu
-		app_menu = gtk.Menu()
-		app_item.set_submenu(app_menu)
-		app_menu.append(about_item)
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		prefs_item = gtk.MenuItem('Preferences...')
-		prefs_item.connect('activate', self.on_preferences_menuitem_activate)
-		accels = gtk.AccelGroup()
-		self.xml.get_widget('roster_window').add_accel_group(accels)
-		prefs_item.add_accelerator('activate', accels, ord(','),
-						gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
-		app_menu.append(prefs_item)
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(gtk.MenuItem('__SKIP__'))
-		app_menu.append(quit_item)
-		app_menu.show_all()
-		# Do the merge baby!
-		syncmenu.takeover_menu(main_menu)
-		self.make_menu(force=True)
-		# Hide the GTK menubar itself and let the OS/X menubar do its thing
-		#self.xml.get_widget('menubar').hide()
-		return
+		pass
+		# This is broken
+#		main_menu = self.xml.get_widget('menubar')
+#		app_item = gtk.MenuItem('Gajim')
+#		main_menu.insert(app_item, 0)
+#		win_item = gtk.MenuItem('Window')
+#		main_menu.insert(win_item, 4)
+#		actions_menu = self.xml.get_widget('actions_menu_menu')
+#		quit_item = self.xml.get_widget('quit_menuitem')
+#		actions_menu.remove(quit_item)
+#		actions_menu.remove(self.xml.get_widget('separator1'))
+#		edit_menu = self.xml.get_widget('edit_menu_menu')
+#		#edit_menu.remove(self.xml.get_widget('preferences_menuitem'))
+#		edit_menu.remove(self.xml.get_widget('separator2'))
+#		help_menu = self.xml.get_widget('help_menu_menu')
+#		about_item = self.xml.get_widget('about_menuitem')
+#		help_menu.remove(about_item)
+#		# Build up App menu
+#		app_menu = gtk.Menu()
+#		app_item.set_submenu(app_menu)
+#		app_menu.append(about_item)
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		prefs_item = gtk.MenuItem('Preferences...')
+#		prefs_item.connect('activate', self.on_preferences_menuitem_activate)
+#		accels = gtk.AccelGroup()
+#		self.xml.get_widget('roster_window').add_accel_group(accels)
+#		prefs_item.add_accelerator('activate', accels, ord(','),
+#						gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+#		app_menu.append(prefs_item)
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(gtk.MenuItem('__SKIP__'))
+#		app_menu.append(quit_item)
+#		app_menu.show_all()
+#		# Do the merge baby!
+#		syncmenu.takeover_menu(main_menu)
+#		self.make_menu(force=True)
+#		# Hide the GTK menubar itself and let the OS/X menubar do its thing
+#		#self.xml.get_widget('menubar').hide()
+#		return
 
 ################################################################################
 ###