Merge lp:~pitti/software-properties/pygi into lp:software-properties

[Martin Pitt]

This ports the GTK UI from pygtk2 to gobject-introspection. It's mostly working now, except for the Drag & Drop parts; they work fine when using GTK3, but since in GTK 2 GtkTargetEntry is not a class and thus not constructable.

[Martin Pitt (pitti)]

Note that with our current GTK package I get crashes when clicking wildly in the mirror selection tree view. I just debugged that and fixed it in upstream GTK:

  http://git.gnome.org/browse/gtk+/commit/?h=gtk-2-24&id=461d71f6aa7f93a7a57a1d19053cd79597a09070

So we'll get this fix into Natty.

[Michael Vogt (mvo)]

Thanks, code looks good. However when I run it on my box I get:
sudo ./software-properties-gtk

** (software-properties-gtk:17374): WARNING **: Out argument 0 in get_cursor returns a struct with a transfer mode of "full". Transfer mode should be set to "none" for struct type returns as there is no way to free them safely. Ignoring transfer mode to prevent a potential invalid free. This may cause a leak in your application.

I guess that is ok for now?

[Michael Vogt (mvo)]

The other thing that does not work is the ping test on:
"Download from: Other…", "Select best server"
Its supposed to open a window with a lot of pings. That does not work currently, it hangs instead.

[Martin Pitt (pitti)]

Right, the get_cursor() warning is expected; that eventually needs to be fixed in the GTK overrides or pygobject. It doesn't hurt, though.

I'll look at the ping window, thanks for the review!

[Martin Pitt (pitti)]

So the problem is that this uses GTK from two different threads: the main one, and the MirrorTestGtk class, which is instantiated and run in a parallel one. Apparently pygtk had some magic to have that work, but with plain GTK it has never worked well. In particular, the worker thread doesn't seem to have a main loop, so there are no updates.

It would be a lot better if the GTK bits could be in the main thread only, and the worker thread would just do the pings and update callbacks, and the main thread would receive the callbacks and continue to run the main loop. Michael, would you mind if I reorganized the code accordingly?

[Michael Vogt (mvo)]

Thanks for looking into this Martin! I am absolutely in favour for this reorganizing.

[lp:~pitti/software-properties/pygi]

649. By Martin Pitt on 2011-02-11

software-properties-gtk, softwareproperties/gtk/DialogMirror.py: Drop
calls to Gdk.threads_*(). They were insufficient and causing lockups, and
since multi-threaded Gtk is a pain to get right, we'll rather change the
code structure to only use Gtk from the main thread.

650. By Martin Pitt on 2011-02-11

softwareproperties/gtk/DialogMirror.py: Run GTK operations in main thread,
to avoid thread lockups.

651. By Martin Pitt on 2011-02-11

softwareproperties/MirrorTest.py: Move additional MirrorTestGtk
functionality (setting threading.Event flag and storing current
action/progress into main MirrorTest class, so that we can entirely drop
MirrorTestGtk from softwareproperties/gtk/DialogMirror.py. KDE still uses
its own implementation with real threads, as this is still easier to do.

[Martin Pitt (pitti)]

r650 moved all GTK operations to the main thread, to avoid the thread lockups. r649 removed all the Gdk.thread_* stuff, as this is now obsolete.

r651 is not a functional change, but simplifies the code a bit.

This now works fine, so I resubmit this. I verified that the kde frontend still works well, too.

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-13 08:42:40 +0000
+++ debian/changelog	2011-02-11 12:13:56 +0000
@@ -1,3 +1,31 @@
+software-properties (0.79) UNRELEASED; urgency=low
+
+  * software-properties-gtk, ./softwareproperties/gtk/*: Port from pygtk to
+    gobject-introspection. This works with both GTK 2 and 3, but in GTK2 we
+    have to disable the drag&drop functionality (as current GTK2 does not have
+    a gtk_target_entry_new() and thus you can't construct those).
+  * softwareproperties/gtk/SoftwarePropertiesGtk.py: When doing string
+    interpolation with translated text and unicode objects, encode the latter
+    into UTF-8 first. pygtk did that for us using some black magic (by calling
+    PyUnicode_SetDefaultEncoding()).
+  * software-properties-gtk: Force using GTK 2 for now, as in Natty we don't
+    currently ship GTK 3 on the default installation (we don't have a theme
+    yet).
+  * debian/control: Update dependencies for the pygtk → pygi switch.
+  * software-properties-gtk, softwareproperties/gtk/DialogMirror.py: Drop
+    calls to Gdk.threads_*(). They were insufficient and causing lockups, and
+    since multi-threaded Gtk is a pain to get right, we'll rather change the
+    code structure to only use Gtk from the main thread.
+  * softwareproperties/gtk/DialogMirror.py: Run GTK operations in main thread,
+    to avoid thread lockups.
+  * softwareproperties/MirrorTest.py: Move additional MirrorTestGtk
+    functionality (setting threading.Event flag and storing current
+    action/progress into main MirrorTest class, so that we can entirely drop
+    MirrorTestGtk from softwareproperties/gtk/DialogMirror.py. KDE still uses
+    its own implementation with real threads, as this is still easier to do.
+
+ -- Martin Pitt <[e-mail]>  Tue, 25 Jan 2011 18:54:54 +0100
+
 software-properties (0.78.1) natty; urgency=low
 
   * use port 80 by default when getting gpg keys for PPAs

=== modified file 'debian/control'
--- debian/control	2010-08-25 18:06:17 +0000
+++ debian/control	2011-02-11 12:13:56 +0000
@@ -22,7 +22,7 @@
 Replaces: update-manager (<< 0.55)
 Conflicts: update-manager (<< 0.55)
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, python, synaptic (>= 0.57.8), gksu, python-software-properties, python-gtk2
+Depends: ${python:Depends}, ${misc:Depends}, python, synaptic (>= 0.57.8), gksu, python-software-properties, python-gobject (>= 2.27), gir1.2-gtk-2.0 (>= 2.23.90-0ubuntu3)
 Description: manage the repositories that you install software from
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software

=== modified file 'software-properties-gtk'
--- software-properties-gtk	2010-08-25 08:51:00 +0000
+++ software-properties-gtk	2011-02-11 12:13:56 +0000
@@ -22,16 +22,13 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
-import pygtk
-pygtk.require('2.0')
-import gtk
-import gtk.gdk
+from gi.repository import Gtk
+Gtk.require_version('2.0')
 import gobject
 import gettext
 import os
 import sys
-
-gtk.gdk.threads_init()
+import locale
 
 from optparse import OptionParser
 
@@ -75,21 +72,19 @@
   parser.add_option("--data-dir", "",
                     action="store", type="string", default="/usr/share/software-properties/",
                     help="Use data files (UI) from the given directory")
-  gtk.init_check()
   
   (options, args) = parser.parse_args()
   # Check for root permissions
   if os.geteuid() != 0:
-    dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, 
+    dialog = Gtk.MessageDialog(None, 0, Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, 
                                _("You need to be root to run this program") )
-    dialog.set_default_response(gtk.RESPONSE_CLOSE)
+    dialog.set_default_response(Gtk.ResponseType.CLOSE)
     dialog.run()
     dialog.destroy()
     sys.exit(1)
                      
+  locale.setlocale(locale.LC_ALL, '')
   localesApp="software-properties"
-  localesDir="/usr/share/locale"
-  gettext.bindtextdomain(localesApp, localesDir)
   gettext.textdomain(localesApp)
 
   # force new files to be 644 (LP: #497778)

=== modified file 'softwareproperties/MirrorTest.py'
--- softwareproperties/MirrorTest.py	2009-11-14 14:13:30 +0000
+++ softwareproperties/MirrorTest.py	2011-02-11 12:13:56 +0000
@@ -52,8 +52,12 @@
                     self.results.append([float(result[0]), host, mirror])
                 MirrorTest.completed_lock.release()
 
-    def __init__(self, mirrors, test_file, running=None):
+    def __init__(self, mirrors, test_file, event, running=None):
         threading.Thread.__init__(self)
+        self.action = ''
+        self.progress = (0, 0, 0.0) # cur, max, %
+        self.event = event
+        self.best = None
         self.test_file = test_file
         self.threads = []
         MirrorTest.completed = 0
@@ -66,14 +70,18 @@
             self.running = running
 
     def report_action(self, text):
-        """Subclasses should override this method to receive
-           action message updates"""
-        print text
+        self.action = text
+        if self.event:
+            self.event.set()
 
     def report_progress(self, current, max, borders=(0,100), mod=(0,0)):
         """Subclasses should override this method to receive
            progress status updates"""
-        print "Completed %s of %s" % (current + mod[0], max + mod[1])
+        self.progress = (current + mod[0], 
+                         max + mod[1],
+                         borders[0] + (borders[1] - borders[0]) / max * current)
+        if self.event:
+            self.event.set()
 
     def run_full_test(self):
         # Determinate the 5 top ping servers
@@ -149,6 +157,11 @@
         results.sort()
         return results[0:max]
 
+    def run(self):
+        """Complete test exercise, set self.best when done"""
+        self.best = self.run_full_test()
+        self.running.clear()
+
 if __name__ == "__main__":
     distro = aptsources.distro.get_distro()
     distro.get_sources(aptsources.SourcesList())

=== modified file 'softwareproperties/gtk/CdromProgress.py'
--- softwareproperties/gtk/CdromProgress.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/CdromProgress.py	2011-02-11 12:13:56 +0000
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 import apt
-import gtk
+from gi.repository import Gtk
 from gettext import gettext as _
 
 from softwareproperties.gtk.utils import *
@@ -43,34 +43,34 @@
         self.button_cdrom_close.set_sensitive(True)
     if text != "":
       self.label_cdrom.set_text(text)
-    while gtk.events_pending():
-      gtk.main_iteration()
+    while Gtk.events_pending():
+      Gtk.main_iteration()
   def askCdromName(self):
-    dialog = gtk.MessageDialog(parent=self.dialog_cdrom_progress,
-                               flags=gtk.DIALOG_MODAL,
-                               type=gtk.MESSAGE_QUESTION,
-                               buttons=gtk.BUTTONS_OK_CANCEL,
+    dialog = Gtk.MessageDialog(parent=self.dialog_cdrom_progress,
+                               flags=Gtk.DialogFlags.MODAL,
+                               type=Gtk.MessageType.QUESTION,
+                               buttons=Gtk.ButtonsType.OK_CANCEL,
                                message_format=None)
     dialog.set_markup(_("Please enter a name for the disc"))
-    entry = gtk.Entry()
+    entry = Gtk.Entry()
     entry.show()
-    dialog.vbox.pack_start(entry)
+    dialog.vbox.pack_start(entry, True, True, 0)
     res = dialog.run()
     dialog.destroy()
-    if res == gtk.RESPONSE_OK:
+    if res == Gtk.ResponseType.OK:
       name = entry.get_text()
       return (True,name)
     return (False,"")
   def changeCdrom(self):
-    dialog = gtk.MessageDialog(parent=self.dialog_cdrom_progress,
-                               flags=gtk.DIALOG_MODAL,
-                               type=gtk.MESSAGE_QUESTION,
-                               buttons=gtk.BUTTONS_OK_CANCEL,
+    dialog = Gtk.MessageDialog(parent=self.dialog_cdrom_progress,
+                               flags=Gtk.DialogFlags.MODAL,
+                               type=Gtk.MessageType.QUESTION,
+                               buttons=Gtk.ButtonsType.OK_CANCEL,
                                message_format=None)
     dialog.set_markup(_("Please insert a disk in the drive:"))
-    dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)
+    dialog.set_position(Gtk.WindowPosition.CENTER_ON_PARENT)
     res = dialog.run()
     dialog.destroy()
-    if res == gtk.RESPONSE_OK:
+    if res == Gtk.ResponseType.OK:
       return True
     return False

=== modified file 'softwareproperties/gtk/DialogAdd.py'
--- softwareproperties/gtk/DialogAdd.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/DialogAdd.py	2011-02-11 12:13:56 +0000
@@ -25,7 +25,7 @@
 
 import os
 import gobject
-import gtk
+from gi.repository import Gtk
 from gettext import gettext as _
 
 from aptsources.sourceslist import SourceEntry
@@ -65,7 +65,7 @@
   def run(self):
     res = self.dialog.run()
     self.dialog.hide()
-    if res == gtk.RESPONSE_OK:
+    if res == Gtk.ResponseType.OK:
         line = self.entry.get_text() + "\n"
     else:
         line = None

=== modified file 'softwareproperties/gtk/DialogAddSourcesList.py'
--- softwareproperties/gtk/DialogAddSourcesList.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/DialogAddSourcesList.py	2011-02-11 12:13:56 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import pygtk
-import gtk
+from gi.repository import Gdk
+from gi.repository import Gtk
 import gobject
 import os
 from optparse import OptionParser
@@ -34,15 +35,15 @@
             self.dialog.set_transient_for(parent)
         else:
             self.dialog.set_title(_("Add Software Channels"))
-        self.dialog.window.set_functions(gtk.gdk.FUNC_MOVE)
+        self.dialog.get_window().set_functions(Gdk.FUNC_MOVE)
 
         # Setup the treeview
-        self.store = gtk.ListStore(gobject.TYPE_STRING)
+        self.store = Gtk.ListStore(gobject.TYPE_STRING)
         self.treeview.set_model(self.store)
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("xpad", 2)
         cell.set_property("ypad", 2)
-        column = gtk.TreeViewColumn("Software Channel", cell, markup=0)
+        column = Gtk.TreeViewColumn("Software Channel", cell, markup=0)
         column.set_max_width(500)
         self.treeview.append_column(column)
 
@@ -93,7 +94,7 @@
         self.button_cancel.set_label("gtk-close")
         self.button_replace.hide()
         self.scrolled.hide()
-        self.image.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG)
+        self.image.set_from_stock(Gtk.STOCK_DIALOG_ERROR, Gtk.IconSize.DIALOG)
         header = _("There are no sources to install software from")
         body = _("The file '%s' does not contain any valid "
                  "software sources." % self.file)

=== modified file 'softwareproperties/gtk/DialogCacheOutdated.py'
--- softwareproperties/gtk/DialogCacheOutdated.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/DialogCacheOutdated.py	2011-02-11 12:13:56 +0000
@@ -25,7 +25,7 @@
 import thread
 import time
 import gobject
-import gtk
+from gi.repository import Gtk
 import apt_pkg
 
 from softwareproperties.gtk.utils import *
@@ -56,15 +56,19 @@
         """run the dialog, and if reload was pressed run synaptic"""
         res = self.dialog.run()
         self.dialog.hide()
-        if res == gtk.RESPONSE_APPLY:
+        if res == Gtk.ResponseType.APPLY:
             self.parent.set_sensitive(False)
             lock = thread.allocate_lock()
             lock.acquire()
+            try:
+                xid = self.parent.get_window().get_xid()
+            except AttributeError:
+                xid = ''
             t = thread.start_new_thread(self.update_cache,
-                                       (self.parent.window.xid, lock))
+                                       (xid, lock))
             while lock.locked():
-                while gtk.events_pending():
-                    gtk.main_iteration()
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
                 time.sleep(0.05)
             self.parent.set_sensitive(True)
         return res

=== modified file 'softwareproperties/gtk/DialogEdit.py'
--- softwareproperties/gtk/DialogEdit.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/DialogEdit.py	2011-02-11 12:13:56 +0000
@@ -24,7 +24,7 @@
 
 import os
 import gobject
-import gtk
+from gi.repository import Gtk
 
 from aptsources.sourceslist import SourceEntry
 from softwareproperties.gtk.utils import *
@@ -115,7 +115,7 @@
           
   def run(self):
       res = self.main.run()
-      if res == gtk.RESPONSE_OK:
+      if res == Gtk.ResponseType.OK:
         line = self.get_line()
 
         # change repository

=== modified file 'softwareproperties/gtk/DialogMirror.py'
--- softwareproperties/gtk/DialogMirror.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/DialogMirror.py	2011-02-11 12:13:56 +0000
@@ -22,7 +22,7 @@
 
 import os
 import gobject
-import gtk
+from gi.repository import Gtk
 from gettext import gettext as _
 import threading
 import string
@@ -35,22 +35,11 @@
 from softwareproperties.gtk.utils import *
 
 
-testing = threading.Event()
-
 (COLUMN_PROTO, COLUMN_DIR) = range(2)
 (COLUMN_URI, COLUMN_SEPARATOR, COLUMN_CUSTOM, COLUMN_MIRROR) = range(4)
 
 from softwareproperties.CountryInformation import CountryInformation
 
-def threaded(f):
-    ''' Thanks to Ross Burton for this piece of code '''
-    def wrapper(*args, **kwargs):
-        t = threading.Thread(target=f, args=args, kwargs=kwargs)
-        t.setDaemon(True)
-        t.start()
-    wrapper.__name__ = f.__name__
-    return wrapper
-
 def sort_mirrors(model, iter1, iter2, data=None):
       ''' sort function for the mirror list:
            - at first show all custom urls
@@ -103,31 +92,31 @@
     self.label_action = self.label_test_mirror
 
     # store each proto and its dir
-    model_proto = gtk.ListStore(gobject.TYPE_STRING,
+    model_proto = Gtk.ListStore(gobject.TYPE_STRING,
                                 gobject.TYPE_STRING)
     self.combobox.set_model(model_proto)
-    cr = gtk.CellRendererText()
-    self.combobox.pack_start(cr)
+    cr = Gtk.CellRendererText()
+    self.combobox.pack_start(cr, True)
     self.combobox.add_attribute(cr, "markup", 0)
 
-    self.model = gtk.TreeStore(gobject.TYPE_STRING,  # COLUMN_URI
+    self.model = Gtk.TreeStore(gobject.TYPE_STRING,  # COLUMN_URI
                                gobject.TYPE_BOOLEAN, # COLUMN_SEPARATOR
                                gobject.TYPE_BOOLEAN, # COLUMN_CUSTOM
                                gobject.TYPE_PYOBJECT)# COLUMN_MIRROR
-    self.treeview.set_row_separator_func(is_separator)
-    self.model_sort = gtk.TreeModelSort(self.model)
-    self.model_sort.set_default_sort_func(sort_mirrors)
+    self.treeview.set_row_separator_func(is_separator, None)
+    self.model_sort = Gtk.TreeModelSort(model=self.model)
+    self.model_sort.set_default_sort_func(sort_mirrors, None)
 
     self.distro = distro
 
     self.treeview.set_model(self.model_sort)
     # the cell renderer for the mirror uri
-    self.renderer_mirror = gtk.CellRendererText()
+    self.renderer_mirror = Gtk.CellRendererText()
     self.renderer_mirror.connect('edited', 
                                  self.on_edited_custom_mirror, 
                                  self.model)
     # the visible column that holds the mirror uris
-    self.column_mirror = gtk.TreeViewColumn("URI", 
+    self.column_mirror = Gtk.TreeViewColumn("URI", 
                                             self.renderer_mirror, 
                                             text=COLUMN_URI)
     self.treeview.append_column(self.column_mirror)
@@ -161,9 +150,9 @@
             model.append(None, [hostname, False, False, mirror])
     # Scroll to the local mirror set
     if patriot != None:
-        path_sort = self.model_sort.get_path(self.model_sort.convert_child_iter_to_iter(None, patriot))
+        path_sort = self.model_sort.get_path(self.model_sort.convert_child_iter_to_iter(patriot)[1])
         self.treeview.expand_row(path_sort, False)
-        self.treeview.set_cursor(path_sort)
+        self.treeview.set_cursor(path_sort, None, False)
         self.treeview.scroll_to_cell(path_sort, use_align=True, row_align=0.5)
 
   def on_edited_custom_mirror(self, cell, path, new_text, model):
@@ -273,7 +262,7 @@
     mirror = model.get_value(iter, COLUMN_MIRROR)
 
     # FIXME: we should also return the list of custom servers
-    if res == gtk.RESPONSE_OK:
+    if res == Gtk.ResponseType.OK:
         if mirror == None:
             # Return the URL of the selected custom mirror
             return model.get_value(iter, COLUMN_URI)
@@ -288,63 +277,55 @@
     else:
         return None
 
-  @threaded
   def on_button_test_clicked(self, button, data=None):
     ''' Perform a test to find the best mirror and select it 
         afterwards in the treeview '''
-    class MirrorTestGtk(MirrorTest):
-        def __init__(self, mirrors, test_file, running, progressbar, label):
-            MirrorTest.__init__(self, mirrors, test_file, running)
-            self.progress = progressbar
-            self.label = label
-        def report_action(self, text):
-            gtk.gdk.threads_enter()
-            self.label.set_label(str("<i>%s</i>" % text))
-            gtk.gdk.threads_leave()
-        def report_progress(self, current, max, borders=(0,1), mod=(0,0)):
-            gtk.gdk.threads_enter()
-            self.progress.set_text(_("Completed %s of %s tests") % \
-                                   (current + mod[0], max + mod[1]))
-            frac = borders[0] + (borders[1] - borders[0]) / max * current
-            self.progress.set_fraction(frac)
-            gtk.gdk.threads_leave()
-
-    gtk.gdk.threads_enter()
     self.button_cancel.set_sensitive(True)
     self.dialog_test.show()
-    gtk.gdk.threads_leave()
     self.running = threading.Event()
     self.running.set()
+    progress_update = threading.Event()
     pipe = os.popen("dpkg --print-architecture")
     arch = pipe.read().strip()
     test_file = "dists/%s/%s/binary-%s/Packages.gz" % \
                  (self.distro.source_template.name,
                   self.distro.source_template.components[0].name,
                   arch)
-    test = MirrorTestGtk(self.distro.source_template.mirror_set.values(), 
+    test = MirrorTest(self.distro.source_template.mirror_set.values(),
                          test_file,
-                         self.running,
-                         self.progress,
-                         self.label_action)
+                         progress_update,
+                         self.running)
     test.start()
-    rocker = test.run_full_test()
-    gtk.gdk.threads_enter()
-    testing.clear()
+
+    # now run the tests in a background thread, and update the UI on each event
+    while self.running.is_set():
+        while Gtk.events_pending():
+            Gtk.main_iteration_do(False)
+
+        # don't spin the CPU until there's something to update; but update the
+        # UI at least every 100 ms
+        progress_update.wait(0.1)
+
+        if progress_update.is_set():
+            self.progress.set_text(_("Completed %s of %s tests") % \
+                                   (test.progress[0], test.progress[1]))
+            self.progress.set_fraction(test.progress[2])
+            progress_update.clear()
+
     self.dialog_test.hide()
     # Select the mirror in the list or show an error dialog
-    if rocker != None:
-        self.model_sort.foreach(self.select_mirror, rocker)
+    if test.best != None:
+        self.model_sort.foreach(self.select_mirror, test.best)
     else:
         dialogs.show_error_dialog(self.dialog, 
                                   _("No suitable download server was found"),
                                   _("Please check your Internet connection."))
-    gtk.gdk.threads_leave()
 
   def select_mirror(self, model, path, iter, mirror):
     """Select and expand the path to a matching mirror in the list"""
     if model.get_value(iter, COLUMN_URI) == mirror:
         self.treeview.expand_to_path(path)
-        self.treeview.set_cursor(path)
+        self.treeview.set_cursor(path, None, False)
         self.treeview.scroll_to_cell(path, use_align=True, row_align=0.5)
         self.treeview.grab_focus()
         # breaks foreach

=== modified file 'softwareproperties/gtk/SimpleGtkbuilderApp.py'
--- softwareproperties/gtk/SimpleGtkbuilderApp.py	2010-08-25 08:51:00 +0000
+++ softwareproperties/gtk/SimpleGtkbuilderApp.py	2011-02-11 12:13:56 +0000
@@ -20,19 +20,19 @@
 # USA
 
 import sys
-import gtk
+from gi.repository import Gtk
 
 # based on SimpleGladeApp
 class SimpleGtkbuilderApp:
 
     def __init__(self, path, domain):
-        self.builder = gtk.Builder()
+        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)
+            if issubclass(type(o), Gtk.Buildable):
+                name = Gtk.Buildable.get_name(o)
                 setattr(self, name, o)
             else:
                 print >> sys.stderr, "WARNING: can not get name for '%s'" % o
@@ -47,7 +47,7 @@
         Use this method for starting programs.
         """
         try:
-            gtk.main()
+            Gtk.main()
         except KeyboardInterrupt:
             self.on_keyboard_interrupt()
 
@@ -61,11 +61,11 @@
     def quit(self):
         """
         Quit processing events.
-        The default implementation calls gtk.main_quit()
+        The default implementation calls Gtk.main_quit()
         
         Useful for applications that needs a non gtk main loop.
         For example, applications based on gstreamer needs to override
         this method with gst.main_quit()
         """
-        gtk.main_quit()
+        Gtk.main_quit()
 

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2010-09-13 08:15:42 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2011-02-11 12:13:56 +0000
@@ -30,7 +30,8 @@
 import re
 from xml.sax.saxutils import escape
 
-import gtk
+from gi.repository import Gdk
+from gi.repository import Gtk
 import gobject
 
 from SimpleGtkbuilderApp import SimpleGtkbuilderApp
@@ -68,10 +69,10 @@
 
 def error(parent_window, summary, msg):
   " show a error dialog "
-  dialog = gtk.MessageDialog(parent=parent_window,
-                             flags=gtk.DIALOG_MODAL,
-                             type=gtk.MESSAGE_ERROR,
-                             buttons=gtk.BUTTONS_OK,
+  dialog = Gtk.MessageDialog(parent=parent_window,
+                             flags=Gtk.DialogFlags.MODAL,
+                             type=Gtk.MessageType.ERROR,
+                             buttons=Gtk.ButtonsType.OK,
                              message_format=None)
   dialog.set_markup("<big><b>%s</b></big>\n\n%s" % (summary, msg))
   res = dialog.run()
@@ -84,13 +85,13 @@
         the used software repositories, corresponding authentication keys
         and update automation """
     SoftwareProperties.__init__(self, options=options, datadir=datadir)
-    gtk.window_set_default_icon_name("software-properties")
+    Gtk.Window.set_default_icon_name("software-properties")
 
     SimpleGtkbuilderApp.__init__(self, os.path.join(datadir, "gtkbuilder", "main.ui"),
                             domain="software-properties")
 
     if parent:
-      self.window_main.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+      self.window_main.set_type_hint(Gdk.WindowTypeHint.DIALOG)
       self.window_main.show()
       try:
         self.window_main.set_transient_for(parent)
@@ -100,12 +101,12 @@
     # If externally called, reparent to external application.
     self.options = options
     if options and options.toplevel != None:
-      self.window_main.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
+      self.window_main.set_type_hint(Gdk.WindowTypeHint.DIALOG)
       self.window_main.show()
-      toplevel = gtk.gdk.window_foreign_new(int(options.toplevel))
+      toplevel = Gdk.window_foreign_new(int(options.toplevel))
       if (toplevel):
         try:
-          self.window_main.window.set_transient_for(toplevel)
+          self.window_main.set_transient_for(toplevel)
         except: 
           pass
     if options and options.open_tab:
@@ -147,8 +148,8 @@
 
   def update_interface(self):
     " abstract interface to keep the UI alive "
-    while gtk.events_pending():
-      gtk.main_iteration()
+    while Gtk.events_pending():
+      Gtk.main_iteration()
 
   def init_popcon(self):
     """ If popcon is enabled show the statistics tab and an explanation
@@ -167,8 +168,8 @@
 
   def init_auto_update(self):
     """ Set up the widgets that allow to configure the update automation """
-    self.combobox_update_interval = gtk.combo_box_new_text()
-    self.hbox_check_for_updates.pack_start(self.combobox_update_interval)
+    self.combobox_update_interval = Gtk.ComboBoxText.new_with_entry()
+    self.hbox_check_for_updates.pack_start(self.combobox_update_interval, True, True, 0)
     self.combobox_update_interval.show()
     
     # this maps the key (combo-box-index) to the auto-update-interval value
@@ -185,7 +186,7 @@
     self.combobox_update_interval.append_text(_("Weekly"))
     self.combobox_update_interval.append_text(_("Every two weeks"))
 
-    model_check_interval = gtk.ListStore(gobject.TYPE_STRING,
+    model_check_interval = Gtk.ListStore(gobject.TYPE_STRING,
                                          gobject.TYPE_INT)
     update_days = self.get_update_interval()
 
@@ -261,9 +262,9 @@
 
     # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
     self.label_updates.set_label("<b>%s</b>" % (_("%s updates") %\
-                                                self.distro.id))
+                                                self.distro.id.encode('UTF-8')))
     # TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-    self.label_dist_name.set_label(_("%s Software") % self.distro.id)
+    self.label_dist_name.set_label(_("%s Software") % self.distro.id.encode('UTF-8'))
 
 
     self.handlers.append((self.checkbutton_source_code,
@@ -278,7 +279,7 @@
         #              first %s is the description of the component
         #              second %s is the code name of the comp, eg main, universe
         label = _("%s (%s)") % (comp.get_description(), comp.name)
-        checkbox = gtk.CheckButton(label)
+        checkbox = Gtk.CheckButton(label)
 
         checkbox.comp = comp
         # setup the callback and show the checkbutton
@@ -295,7 +296,7 @@
     if len(self.distro.source_template.children) < 1:
         self.frame_children.hide()
     for template in self.distro.source_template.children:
-        checkbox = gtk.CheckButton(label="%s (%s)" % (template.description,
+        checkbox = Gtk.CheckButton(label="%s (%s)" % (template.description,
                                                       template.name))
         checkbox.template = template
         self.handlers.append((checkbox,
@@ -307,13 +308,13 @@
 
 
     # setup the server chooser
-    cell = gtk.CellRendererText()
+    cell = Gtk.CellRendererText()
     self.combobox_server.pack_start(cell, True)
     self.combobox_server.add_attribute(cell, 'text', 0)
     self.handlers.append((self.combobox_server,
                           self.combobox_server.connect("changed",
                               self.on_combobox_server_changed)))
-    server_store = gtk.ListStore(gobject.TYPE_STRING,
+    server_store = Gtk.ListStore(gobject.TYPE_STRING,
                                  gobject.TYPE_STRING,
                                  gobject.TYPE_BOOLEAN)
     self.combobox_server.set_model(server_store)
@@ -421,7 +422,7 @@
     '''Call the backend to set the update automation level to the given 
        value'''
     if widget.get_active() == True:
-        self.vbox_auto_updates.foreach(lambda b: b.set_inconsistent(False))
+        self.vbox_auto_updates.foreach(lambda b, d: b.set_inconsistent(False), None)
         SoftwareProperties.set_update_automation_level(self, state)
     self.set_modified_config()
 
@@ -536,13 +537,13 @@
     # STORE_SOURCE - the source entry object
     # STORE_SEPARATOR - if the entry is a separator
     # STORE_VISIBLE - if the entry is shown or hidden
-    self.cdrom_store = gtk.ListStore(gobject.TYPE_BOOLEAN, 
+    self.cdrom_store = Gtk.ListStore(gobject.TYPE_BOOLEAN, 
                                      gobject.TYPE_STRING,
                                      gobject.TYPE_PYOBJECT,
                                      gobject.TYPE_BOOLEAN,
                                      gobject.TYPE_BOOLEAN)
     self.treeview_cdroms.set_model(self.cdrom_store)
-    self.source_store = gtk.ListStore(gobject.TYPE_BOOLEAN, 
+    self.source_store = Gtk.ListStore(gobject.TYPE_BOOLEAN, 
                                       gobject.TYPE_STRING,
                                       gobject.TYPE_PYOBJECT,
                                       gobject.TYPE_BOOLEAN,
@@ -551,51 +552,55 @@
     self.treeview_sources.set_row_separator_func(self.is_separator,
                                                  STORE_SEPARATOR)
 
-    cell_desc = gtk.CellRendererText()
+    cell_desc = Gtk.CellRendererText()
     cell_desc.set_property("xpad", 2)
     cell_desc.set_property("ypad", 2)
-    col_desc = gtk.TreeViewColumn(_("Software Sources"), cell_desc,
+    col_desc = Gtk.TreeViewColumn(_("Software Sources"), cell_desc,
                                   markup=COLUMN_DESC)
     col_desc.set_max_width(1000)
 
-    cell_toggle = gtk.CellRendererToggle()
+    cell_toggle = Gtk.CellRendererToggle()
     cell_toggle.set_property("xpad", 2)
     cell_toggle.set_property("ypad", 2)
     self.handlers.append([cell_toggle,
                           cell_toggle.connect('toggled', 
                                               self.on_isv_source_toggled, 
                                               self.cdrom_store)])
-    col_active = gtk.TreeViewColumn(_("Active"), cell_toggle,
+    col_active = Gtk.TreeViewColumn(_("Active"), cell_toggle,
                                     active=COLUMN_ACTIVE)
 
     self.treeview_cdroms.append_column(col_active)
     self.treeview_cdroms.append_column(col_desc)
 
-    cell_desc = gtk.CellRendererText()
+    cell_desc = Gtk.CellRendererText()
     cell_desc.set_property("xpad", 2)
     cell_desc.set_property("ypad", 2)
-    col_desc = gtk.TreeViewColumn(_("Software Sources"), cell_desc,
+    col_desc = Gtk.TreeViewColumn(_("Software Sources"), cell_desc,
                                   markup=COLUMN_DESC)
     col_desc.set_max_width(1000)
 
-    cell_toggle = gtk.CellRendererToggle()
+    cell_toggle = Gtk.CellRendererToggle()
     cell_toggle.set_property("xpad", 2)
     cell_toggle.set_property("ypad", 2)
     self.handlers.append([cell_toggle,
                           cell_toggle.connect('toggled', 
                                               self.on_isv_source_toggled, 
                                               self.source_store)])
-    col_active = gtk.TreeViewColumn(_("Active"), cell_toggle,
+    col_active = Gtk.TreeViewColumn(_("Active"), cell_toggle,
                                     active=COLUMN_ACTIVE)
 
     self.treeview_sources.append_column(col_active)
     self.treeview_sources.append_column(col_desc)
     # drag and drop support for sources.list
-    self.treeview_sources.drag_dest_set(gtk.DEST_DEFAULT_ALL,
-                                        [('text/uri-list',0, 0)],
-                                        gtk.gdk.ACTION_COPY)
-    self.treeview_sources.connect("drag_data_received",
-                                  self.on_sources_drag_data_received)
+    try:
+        Gtk.drag_dest_set(self.treeview_sources, Gtk.DestDefaults.ALL,
+                                            [Gtk.TargetEntry.new('text/uri-list', 0, 0)],
+                                            Gdk.DragAction.COPY)
+        self.treeview_sources.connect("drag_data_received",
+                                      self.on_sources_drag_data_received)
+    except AttributeError:
+        # does not work with Gtk2/GI
+        pass
 
   def on_isv_source_activate(self, treeview, path, column):
     """Open the edit dialog if a channel was double clicked"""
@@ -621,22 +626,27 @@
 
   def init_keys(self):
     """Setup the user interface parts needed for the key handling"""
-    self.keys_store = gtk.ListStore(str)
+    self.keys_store = Gtk.ListStore(str)
     self.treeview_auth.set_model(self.keys_store)
-    tr = gtk.CellRendererText()
-    keys_col = gtk.TreeViewColumn("Key", tr, text=0)
+    tr = Gtk.CellRendererText()
+    keys_col = Gtk.TreeViewColumn("Key", tr, text=0)
     self.treeview_auth.append_column(keys_col)
-    self.treeview_auth.enable_model_drag_dest(
-      [('text/plain', 0, 0)], gtk.gdk.ACTION_COPY)
-    self.treeview_auth.connect("drag_data_received",
-                                  self.on_auth_drag_data_received)
+    try:
+        self.treeview_auth.enable_model_drag_dest(
+          [('text/plain', 0, 0)], Gdk.DragAction.COPY)
+        self.treeview_auth.connect("drag_data_received",
+                                      self.on_auth_drag_data_received)
+    except AttributeError:
+        # Does not work with GTK 2/GI
+        pass
+
     self.treeview_auth.connect("button-press-event",
                                self.show_auth_context_menu)
 
   def show_auth_context_menu(self, widget, event):
-    if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
-      menu = gtk.Menu()
-      item_paste = gtk.MenuItem(_("_Add key from paste data"))
+    if event.type == Gdk.EventType.BUTTON_PRESS and event.button == 3:
+      menu = Gtk.Menu()
+      item_paste = Gtk.MenuItem(_("_Add key from paste data"))
       item_paste.connect("activate", self.on_auth_add_key_from_paste)
       menu.add(item_paste)
       menu.popup(None, None, None, 0, event.time)
@@ -644,7 +654,7 @@
       return True
 
   def on_auth_add_key_from_paste(self, widget):
-    keydata = gtk.Clipboard().wait_for_text()
+    keydata = Gtk.Clipboard().wait_for_text()
     if not keydata:
       return
     if not self.add_key_from_data(keydata):
@@ -744,7 +754,7 @@
           self.combobox_update_interval.set_active(i)
       value = self.combobox_interval_mapping[i]
       # A little hack to re-set the former selected update automation level
-      self.vbox_auto_updates.foreach(lambda b: b.toggled())
+      self.vbox_auto_updates.foreach(lambda b, d: b.toggled(), None)
     else:
       self.combobox_update_interval.set_sensitive(False)
       self.vbox_auto_updates.set_sensitive(False)
@@ -770,7 +780,7 @@
     source_entry = model.get_value(iter, LIST_ENTRY_OBJ)
     dialog = DialogEdit(self.window_main, self.sourceslist,
                         source_entry, self.datadir)
-    if dialog.run() == gtk.RESPONSE_OK:
+    if dialog.run() == Gtk.ResponseType.OK:
         self.set_modified_sourceslist()
 
   # FIXME:outstanding from merge
@@ -812,17 +822,17 @@
   def add_key_clicked(self, widget):
     """Provide a file chooser that allows to add the gnupg of a trusted
        software vendor"""
-    chooser = gtk.FileChooserDialog(title=_("Import key"),
+    chooser = Gtk.FileChooserDialog(title=_("Import key"),
                                     parent=self.window_main,
-                                    buttons=(gtk.STOCK_CANCEL,
-                                             gtk.RESPONSE_REJECT,
-                                             gtk.STOCK_OK,gtk.RESPONSE_ACCEPT))
+                                    buttons=(Gtk.STOCK_CANCEL,
+                                             Gtk.ResponseType.REJECT,
+                                             Gtk.STOCK_OK,Gtk.ResponseType.ACCEPT))
     if "SUDO_USER" in os.environ:
         home = os.path.expanduser("~%s" % os.environ["SUDO_USER"])
         chooser.set_current_folder(home)
     res = chooser.run()
     chooser.hide()
-    if res == gtk.RESPONSE_ACCEPT:
+    if res == Gtk.ResponseType.ACCEPT:
       if not self.add_key(chooser.get_filename()):
         error(self.window_main,
               _("Error importing selected file"),

=== modified file 'softwareproperties/gtk/dialogs.py'
--- softwareproperties/gtk/dialogs.py	2007-02-02 19:45:52 +0000
+++ softwareproperties/gtk/dialogs.py	2011-02-11 12:13:56 +0000
@@ -21,12 +21,12 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
-import gtk
+from gi.repository import Gtk
 
 def show_error_dialog(parent, primary, secondary):
     p = "<span weight=\"bold\" size=\"larger\">%s</span>" % primary
-    dialog = gtk.MessageDialog(parent,gtk.DIALOG_MODAL,
-                               gtk.MESSAGE_ERROR,gtk.BUTTONS_CLOSE,"")
+    dialog = Gtk.MessageDialog(parent,Gtk.DialogFlags.MODAL,
+                               Gtk.MessageType.ERROR,Gtk.ButtonsType.CLOSE,"")
     dialog.set_markup(p);
     dialog.format_secondary_text(secondary);
     dialog.run()

=== modified file 'softwareproperties/gtk/utils.py'
--- softwareproperties/gtk/utils.py	2010-09-20 12:58:51 +0000
+++ softwareproperties/gtk/utils.py	2011-02-11 12:13:56 +0000
@@ -16,19 +16,19 @@
 # this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-import gtk
+from gi.repository import Gtk
 import os
 import sys
 
 def setup_ui(self, path, domain):
     # setup ui
-    self.builder = gtk.Builder()
+    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)
+        if issubclass(type(o), Gtk.Buildable):
+            name = Gtk.Buildable.get_name(o)
             setattr(self, name, o)
         else:
             print >> sys.stderr, "WARNING: can not get name for '%s'" % o

=== modified file 'softwareproperties/kde/DialogMirror.py'
--- softwareproperties/kde/DialogMirror.py	2010-08-16 12:31:06 +0000
+++ softwareproperties/kde/DialogMirror.py	2011-02-11 12:13:56 +0000
@@ -160,7 +160,7 @@
         afterwards in the treeview '''
     class MirrorTestKDE(MirrorTest):
         def __init__(self, mirrors, test_file, running, dialog, parent):
-            MirrorTest.__init__(self, mirrors, test_file, running)
+            MirrorTest.__init__(self, mirrors, test_file, None, running)
             self.dialog = dialog
             self.parent = parent