Merge lp:~straemer/software-properties/fix-for-1058070 into lp:software-properties

[Stephen Kraemer]

Made software-properties only open one instance per session.

[Robert Roth (evfool)]

The improvement looks fine, and it makes software properties a "singleton" app, allowing it to run only one instance per session.

However it does the single-instance handling via a custom dbus interface. Gtk Application [1] can do single-instance handling since gtk 3.6, along with other maybe-useful features, like appmenu, etc. I don't know whether there are any best-practices regarding single-instance apps, but if it has been added to the core gtk platform, maybe we could make use of that (I guess that GObject introspection works with the gtkapplication class too, so it shouldn't be too tricky)

[1] http://developer.gnome.org/gtk3/3.6/GtkApplication.html

[Stephen Kraemer (straemer)]

It doesn't look like GtkApplication is being used within this application. It looks like SimpleGtkbuilderApp is used instead. Would there be any issues in replacing this with GtkApplication?

[lp:~straemer/software-properties/fix-for-1058070]

825. By Stephen Kraemer on 2013-01-08

softwareproperties/gtk/SimpleGtkBuilderApp.py: Use GtkApplication to make this application a singleton.

[Stephen Kraemer (straemer)]

I updated this to make use of GtkApplication. It looks to be a lot cleaner of a solution to me.

[Michael Vogt (mvo)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-09 17:44:47 +0000
+++ debian/changelog	2013-01-08 04:15:26 +0000
@@ -1,3 +1,10 @@
+software-properties (0.92.13ubuntu3) UNRELEASED; urgency=low
+
+  * softwareproperties/gtk/SimpleGtkBuilderApp.py: Use GtkApplication to make this application a singleton.
+    (LP: #1058070)
+
+ -- Stephen Kraemer <[e-mail]>  Mon, 07 Jan 2013 23:09:42 -0500
+
 software-properties (0.92.13) raring; urgency=low
 
   * data/gtkbuilder/main.ui: Fixed alignment of combo boxes in Updates tab

=== modified file 'softwareproperties/gtk/SimpleGtkbuilderApp.py'
--- softwareproperties/gtk/SimpleGtkbuilderApp.py	2012-06-14 00:30:45 +0000
+++ softwareproperties/gtk/SimpleGtkbuilderApp.py	2013-01-08 04:15:26 +0000
@@ -20,15 +20,21 @@
 # USA
 
 import logging
-from gi.repository import Gtk
+from gi.repository import Gtk, Gio
 from softwareproperties.gtk.utils import setup_ui
 LOG=logging.getLogger(__name__)
 
 # based on SimpleGladeApp
-class SimpleGtkbuilderApp:
+class SimpleGtkbuilderApp(Gtk.Application):
 
     def __init__(self, path, domain):
+        Gtk.Application.__init__(self, application_id="com.ubuntu.SoftwareProperties",
+                                 flags=Gio.ApplicationFlags.FLAGS_NONE)
         setup_ui(self, path, domain)
+        self.connect("activate", self.on_activate)
+
+    def on_activate(self, data=None):
+        self.add_window(self.window_main)
 
     def run(self):
         """
@@ -40,9 +46,9 @@
         Use this method for starting programs.
         """
         try:
-            Gtk.main()
+            Gtk.Application.run(self, None)
         except KeyboardInterrupt:
-            self.on_keyboard_interrupt()
+            self.on_keyboard_Interrupt() 
 
     def on_keyboard_interrupt(self):
         """
@@ -60,5 +66,5 @@
         For example, applications based on gstreamer needs to override
         this method with gst.main_quit()
         """
-        Gtk.main_quit()
+        Gtk.Application.quit(self)
 

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2012-11-23 09:24:47 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2013-01-08 04:15:26 +0000
@@ -145,6 +145,7 @@
         "AuthFailed", self.on_auth_failed)
     self.backend.connect_to_signal(
         "CdromScanFailed", self.on_cdrom_scan_failed)
+
     
     # Show what we have early
     self.window_main.show()