Merge lp:~evfool/software-properties/lp709079 into lp:software-properties

[Robert Roth]

Refactored SimpleGtkBuilder __init__ method to use the setup_ui method containing exactly the same code (removes some duplicated code) and replaced print to stderr with debug logging message, fixing bug #709079.

=== modified file 'softwareproperties/gtk/SimpleGtkbuilderApp.py'
--- softwareproperties/gtk/SimpleGtkbuilderApp.py	2011-07-25 09:56:30 +0000
+++ softwareproperties/gtk/SimpleGtkbuilderApp.py	2012-06-05 18:09:17 +0000
@@ -22,23 +22,14 @@
 import logging
 import sys
 from gi.repository import Gtk
-
+from softwareproperties.gtk.utils import setup_ui
 LOG=logging.getLogger(__name__)
 
 # based on SimpleGladeApp
 class SimpleGtkbuilderApp:
 
     def __init__(self, path, domain):
-        self.builder = Gtk.Builder()
-        self.builder.set_translation_domain(domain)
-        self.builder.add_from_file(path)
-        self.builder.connect_signals(self)
-        for o in self.builder.get_objects():
-            if issubclass(type(o), Gtk.Buildable):
-                name = Gtk.Buildable.get_name(o)
-                setattr(self, name, o)
-            else:
-                logging.debug("can not get name for object '%s'" % o)
+        setup_ui(self, path, domain)
 
     def run(self):
         """

=== modified file 'softwareproperties/gtk/utils.py'
--- softwareproperties/gtk/utils.py	2011-01-25 17:56:51 +0000
+++ softwareproperties/gtk/utils.py	2012-06-05 18:09:17 +0000
@@ -17,8 +17,10 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from gi.repository import Gtk
+import logging
 import os
 import sys
+LOG=logging.getLogger(__name__)
 
 def setup_ui(self, path, domain):
     # setup ui
@@ -31,4 +33,4 @@
             name = Gtk.Buildable.get_name(o)
             setattr(self, name, o)
         else:
-            print >> sys.stderr, "WARNING: can not get name for '%s'" % o
+            logging.debug("can not get name for object '%s'" % o)