Merge lp:~jelmer/bzr-gtk/already-running into lp:bzr-gtk/gtk2

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

This makes bzr-notify start correctly if there's already an instance running and lan-notify is available.

[Jelmer Vernooij (jelmer)]

> This makes bzr-notify start correctly if there's already an instance running
> and lan-notify is available.
Oh, and some formatting cleanups in bzr-notify (contained tabs)

[Vincent Ladeuil (vila)]

Go ahead, land ! :)

review: Approve

=== modified file 'NEWS'
--- NEWS	2010-03-01 08:52:45 +0000
+++ NEWS	2010-03-03 14:16:19 +0000
@@ -4,6 +4,9 @@
 
    * Guard setup() call when not loaded as __main__. (Robert Collins)
 
+   * Don't crash when there is already a lan-notify instance running.
+     (Jelmer Vernooij, #339284)
+
 FEATURES
 
   * Add support for Indicator Application (Sense Hofstede, Jelmer Vernooij,

=== modified file 'bzr-notify'
--- bzr-notify	2010-02-28 15:19:15 +0000
+++ bzr-notify	2010-03-03 14:16:19 +0000
@@ -25,69 +25,68 @@
 
 menu = NotifyPopupMenu()
 try:
-	import appindicator
+    import appindicator
 except ImportError:
-	icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
-	icon.connect('popup-menu', menu.display)
-	icon.set_visible(False)
-	hide_icon = lambda: icon.set_visible(False)
-	show_icon = lambda: icon.set_visible(True)
+    icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
+    icon.connect('popup-menu', menu.display)
+    icon.set_visible(False)
+    hide_icon = lambda: icon.set_visible(False)
+    show_icon = lambda: icon.set_visible(True)
 else:
-	indicator = appindicator.Indicator ("bzr-gtk-notify",
-							  "bzr-icon-64",
-							  appindicator.CATEGORY_APPLICATION_STATUS)
-	indicator.set_status (appindicator.STATUS_PASSIVE)
-	indicator.set_attention_icon("bzr-icon-64")
-	indicator.set_menu(menu)
-	hide_icon = lambda: indicator.set_status (appindicator.STATUS_PASSIVE)
-	show_icon = lambda: indicator.set_status (appindicator.STATUS_ATTENTION)
+    indicator = appindicator.Indicator ("bzr-gtk-notify",
+        "bzr-icon-64", appindicator.CATEGORY_APPLICATION_STATUS)
+    indicator.set_status (appindicator.STATUS_PASSIVE)
+    indicator.set_attention_icon("bzr-icon-64")
+    indicator.set_menu(menu)
+    hide_icon = lambda: indicator.set_status (appindicator.STATUS_PASSIVE)
+    show_icon = lambda: indicator.set_status (appindicator.STATUS_ATTENTION)
 
 if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
-	import dbus.glib
+    import dbus.glib
 BROADCAST_INTERFACE = "org.bazaarvcs.plugins.dbus.Broadcast"
 bus = dbus.SessionBus()
 
 def catch_branch(revision_id, urls):
-	# TODO: show all the urls, or perhaps choose the 'best'.
-	url = urls[0]
-	try:
-		if isinstance(revision_id, unicode):
-			revision_id = revision_id.encode('utf8')
-		transport = get_transport(url)
-		a_dir = BzrDir.open_from_transport(transport)
-		branch = a_dir.open_branch()
-		revno = branch.revision_id_to_revno(revision_id)
-		revision = branch.repository.get_revision(revision_id)
-		summary = 'New revision %d in %s' % (revno, url)
-		body = 'Committer: %s\n' % revision.committer
-		body += 'Date: %s\n' % format_date(revision.timestamp,
-			revision.timezone)
-		body += '\n'
-		body += revision.message
-		body = cgi.escape(body)
-		nw = pynotify.Notification(summary, body)
-		def start_viz(notification=None, action=None, data=None):
-			"""Start the viz program."""
-			from bzrlib.plugins.gtk.commands import start_viz_window
-			pp = start_viz_window(branch, revision_id)
-			pp.show()
-		def start_branch(notification=None, action=None, data=None):
-			"""Start a Branch dialog"""
-			from bzrlib.plugins.gtk.branch import BranchDialog
-			bd = BranchDialog(remote_path=url)
-			bd.run()
-		if "actions" in pynotify.get_server_caps():
-			nw.add_action("inspect", "Inspect", start_viz, None)
-			nw.add_action("branch", "Branch", start_branch, None)
-		show_icon()
-		gobject.timeout_add(5000, hide_icon)
-		nw.set_timeout(5000)
-		nw.show()
-	except Exception, e:
-		print e
-		raise
+    # TODO: show all the urls, or perhaps choose the 'best'.
+    url = urls[0]
+    try:
+        if isinstance(revision_id, unicode):
+            revision_id = revision_id.encode('utf8')
+        transport = get_transport(url)
+        a_dir = BzrDir.open_from_transport(transport)
+        branch = a_dir.open_branch()
+        revno = branch.revision_id_to_revno(revision_id)
+        revision = branch.repository.get_revision(revision_id)
+        summary = 'New revision %d in %s' % (revno, url)
+        body = 'Committer: %s\n' % revision.committer
+        body += 'Date: %s\n' % format_date(revision.timestamp,
+            revision.timezone)
+        body += '\n'
+        body += revision.message
+        body = cgi.escape(body)
+        nw = pynotify.Notification(summary, body)
+        def start_viz(notification=None, action=None, data=None):
+            """Start the viz program."""
+            from bzrlib.plugins.gtk.commands import start_viz_window
+            pp = start_viz_window(branch, revision_id)
+            pp.show()
+        def start_branch(notification=None, action=None, data=None):
+            """Start a Branch dialog"""
+            from bzrlib.plugins.gtk.branch import BranchDialog
+            bd = BranchDialog(remote_path=url)
+            bd.run()
+        if "actions" in pynotify.get_server_caps():
+            nw.add_action("inspect", "Inspect", start_viz, None)
+            nw.add_action("branch", "Branch", start_branch, None)
+        show_icon()
+        gobject.timeout_add(5000, hide_icon)
+        nw.set_timeout(5000)
+        nw.show()
+    except Exception, e:
+        print e
+        raise
 bus.add_signal_receiver(catch_branch,
-						dbus_interface=BROADCAST_INTERFACE,
-						signal_name="Revision")
+                        dbus_interface=BROADCAST_INTERFACE,
+                        signal_name="Revision")
 pynotify.init("bzr-notify")
 gtk.main()

=== modified file 'notify.py'
--- notify.py	2009-01-29 10:06:26 +0000
+++ notify.py	2010-03-03 14:16:19 +0000
@@ -40,6 +40,7 @@
         self.create_items()
 
     def create_items(self):
+        from bzrlib import errors
         item = gtk.CheckMenuItem('_Gateway to LAN')
         item.connect('toggled', self.toggle_lan_gateway)
         self.append(item)
@@ -49,6 +50,10 @@
             self.langateway = LanGateway()
         except ImportError:
             item.set_sensitive(False)
+        except errors.BzrError:
+            # FIXME: Should only catch errors that indicate a lan-notify 
+            # process is already running.
+            item.set_sensitive(False)
 
         item = gtk.CheckMenuItem('Announce _branches on LAN')
         item.connect('toggled', self.toggle_announce_branches)