Merge lp:~sinzui/bzr-gtk/gtk3 into lp:bzr-gtk/gtk2

[Curtis Hovey]

Update bzr-gtk to Gtk3.

    Launchpad bug: https://bugs.launchpad.net/bugs/796856
    Pre-implementation: no one

bzr-gtk commands, widgets, cannot be used in a process that has imported gtk3.
    Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the
    same process is not supported Trace/breakpoint trap

The general approach to fix this is to
create a gtk3 series
Run pygi.convert.sh found in pygi's tree
Update all the obsolete 2.x calls to 3.

The majority of this branch is mechanical changes as outlined in the rules
below. There are three changes that should be given more attention in the
review:
    * I noticed that The plugins tab of the preferences window used
      'row-activated' activated to show the plugin information. This signal
      is emitted on enter/double-click. I change the signal to cursor-changed
      which is emitted when the use move the cursor via the arrow keys or
      single-clicks. This is a one line change that I think makes the widget
      work the way most people expect.
    * pygtk's GenericTreeModel is not supported. I chose to reimplement
      the class by subclassing ListStore. I removed many unneeded methods,
      and added two required methods. I added a test.
    * pygtk's GenericCellRenderer is not supported. I tried subclassing
      all the cellrenders, but all create widgets except for CellRenderPixbuf.
      The render method only need two changes, and I added other methods
      to disable the behaviours inherited from the superclass. There are
      many Pango and Cairo enums and macros that are missing from gi. The
      bugs are already reported. I chose to copy the definitions needed to
      keep the class operational. I added a test.

This branch works very well for my self, but I am sure that there are gtk3
conversion issues that I have not discovered. I more users are now needed
to find bugs.

I am seeing three warnings that I do not yet understand, but I am seeing
these issues in other gtk3 apps. I am not seeing failures, so I
think these should be fixed in a separate effort. The issues may be in
upstream code:

    * gpreferences
      (bzr:18153): Gtk-WARNING **: gtk_widget_size_allocate(): attempt to
      underallocate GtkNotebook's child
      bzrlib+plugins+gtk+preferences+identity+IdentityPage 0x9fdc828.
      Allocation is 311x398, but minimum required size is 315x220.
      ^ Changing the preferred sized does not fix this.

    * viz
      (bzr:6942): Gtk-WARNING **: gtk_widget_size_allocate(): attempt to
      underallocate GtkTreeView's child GtkButton 0x901c960. Allocation is
      1x27, but minimum required size is 12x27.
      ^ I have no idea how to set the size of the button/label used by
        the treeview's column headings.

    * gannotate
      /usr/lib/python2.7/dist-packages/gi/types.py:43: Warning:
      g_value_get_object: assertion `G_VALUE_HOLDS_OBJECT (value)' failed
      return info.invoke(*args, **kwargs)
      ^ I do not know what is causing this and the error only appeared a
        few days ago minutes after a gtk update to oneiric

    * setup.py check
      (setup.py:13572): Gdk-CRITICAL **: gdk_window_get_pointer:
       assertion `GDK_IS_WINDOW (window)' failed
      ^ This is because widget.show() is not called in test_commit.py when
        set_cursor() is called by the window. The fix is to show the window
        which is very annoying. The tests do work, so I chose not to change
        the affected tests.

--------------------------------------------------------------------

RULES

    * Run pygi.convert.sh found in pygi's tree
    * Removed pygtk import and require('2.0')
    * Gdk.EventMask.CONTROL_MASK -> Gdk.ModifierType.CONTROL_MASK
    * Gtk.Dialog.vbox -> Gtk.Dialog.get_content_area()
    * Replace kwargs with args because gi does not provide defaults. Because
      There are no defaults, many arguments must be added that pygtk was
      providing:
      * pack_end(widget, expand) -> pack_end(widget, expand, fill, padding)
      * pack_start(widget, expand) -> pack_start(widget, expand, fill, padding)
      * buffer.get_text(start, end) -> .get_text(start, end, True)
      * GTKTreeView.setCursor() -> .setCursor(path, None, False)
    * Either use kwargs with implicit constructors, or use the
      explicit constructor
      * GtkComboBoxEntry -> Gtk.ComboBox.new_with_entry()
      * Gtk.RadioButton() -> Gtk.RadioButton.new_with_label_from_widget()
    * gi does not support the integer-tuple conversion used by pygtk. There
      is not generic treemodel and cellrender classes to create python
      implementations.
      * int_or_tuple -> Gtk.TreePath(path=int_or_tuple)
      * treemodel.py GenericTreeModel -> ListStore
      * graphcell.py GenericCellRenderer -> CellRendererPixbuf

QA

    * Run every command from the menus for the appropriate branch/repo
    * I also test this using the commands called by gedit-developer-plugins
      bzr.

LINT

    There is a tremendous number of style issues. pygi.convert.sh created
    many long lines. I can fix these before I merge. I decided not to fix
    them for the review so the diff was clear about what changed on each line.

TEST

    ./setup.py check

IMPLEMENTATION

New implementation and hacks:
    branchview/graphcell.py
    branchview/treemodel.py
    tests/test_graphcell.py
    tests/test_treemodel.py

Mechanical changes by script or by addressing reported argument changes.
    HACKING
    README
    __init__.py
    about.py
    annotate/colormap.py
    annotate/config.py
    annotate/gannotate.py
    annotate/spanselector.py
    avatarsbox.py
    branch.py
    branchbox.py
    branchview/treeview.py
    bzr-handle-patch
    bzr-notify
    checkout.py
    commands.py
    commit.py
    conflicts.py
    dialog.py
    diff.py
    initialize.py
    keyring.py
    lock.py
    loom.py
    merge.py
    mergedirective.py
    missing.py
    nautilus-bzr.py
    notify.py
    preferences/__init__.py
    preferences/identity.py
    preferences/notifications.py
    preferences/plugins.py
    push.py
    revbrowser.py
    revidbox.py
    revisionmenu.py
    revisionview.py
    search.py
    setup.py
    status.py
    tags.py
    tests/__init__.py
    tests/test_commit.py
    tests/test_diff.py
    tests/test_revisionview.py
    ui.py
    viz/branchwin.py
    window.py

[Jelmer Vernooij (jelmer)]

Hi Curtis,

Thanks again for working on this, much appreciated. :)

Feel free to already push to lp:bzr-gtk/gtk3, which was a branch created earlier for gtk3 porting. I think we should create a lp:bzr-gtk/gtk2 once we merge your work into trunk, for people who are still using older versions of GNOME/GTK.

Trying out your branch on Oneiric I'm getting the following error on the terminal, and no visual graph in the "viz" window:
TypeError: Couldn't find conversion for foreign struct 'cairo.Context'

This seems like a Cairo bug to me - do I need a newer version or something?

Switching to a wide layout crashes here:
Traceback (most recent call last):
  File "/home/jelmer/src/bzr-gtk/gtk3/viz/branchwin.py", line 571, in _vertical_layout
    self.construct_paned(), True, True, True, 0)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 43, in function
    return info.invoke(*args, **kwargs)
TypeError: pack_start() takes exactly 5 arguments (6 given)

gloom crashes with another traceback:
  File "/home/jelmer/src/bzr-gtk/gtk3/commands.py", line 117, in run
    dialog = LoomDialog(br, tree)
  File "/home/jelmer/src/bzr-gtk/gtk3/loom.py", line 42, in __init__
    self._construct()
  File "/home/jelmer/src/bzr-gtk/gtk3/loom.py", line 80, in _construct
    hbox.pack_end(self._diff)
  File "/usr/lib/python2.7/dist-packages/gi/types.py", line 43, in function
    return info.invoke(*args, **kwargs)
TypeError: pack_end() takes exactly 5 arguments (2 given)

[lp:~sinzui/bzr-gtk/gtk3]

787. By Curtis Hovey on 2011-09-08

Fixed packing args.

[Curtis Hovey (sinzui)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/07/2011 04:59 PM, Jelmer Vernooij wrote:
> Hi Curtis,
>
> Thanks again for working on this, much appreciated. :)
>
> Feel free to already push to lp:bzr-gtk/gtk3, which was a branch
created earlier for gtk3 porting. I think we should create a
lp:bzr-gtk/gtk2 once we merge your work into trunk, for people who are
still using older versions of GNOME/GTK.
I pushed to lp:bzr-gtk/gtk3 after addressing the two packing argument
errors you reported. The were several other pack_end() calls that I had
missed.
> Trying out your branch on Oneiric I'm getting the following error
> on
the terminal, and no visual graph in the "viz" window:
> TypeError: Couldn't find conversion for foreign struct
> 'cairo.Context'
I saw several errors like this when python was trying to create the
context. I was confident that changes to avoid creating contexts was
complete.
> This seems like a Cairo bug to me - do I need a newer version or
> something?

I believe these are the libs in play, though as said, cairo is not
directly used. The gi chain may be importing.
libcairo2 1.10.2-6ubuntu3
gir1.2-freedesktop 1.29.17-0ubuntu1
python-cairo 1.8.8-1ubuntu2
python-object-cairo 2.90.3-1svn1

- --
Curtis Hovey
http://launchpad.net/~sinzui
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk5oNlMACgkQnGlTRlchMn3LNwCfWWxljybBcekJgO0LY/ukc3D5
cYsAnimY1r4Z8KBVDTDr2ACsCrcCito1
=ZX4l
-----END PGP SIGNATURE-----

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 09/07/2011 06:40 PM, Curtis Hovey wrote:
> Curtis Hovey has proposed merging lp:~sinzui/bzr-gtk/gtk3 into lp:bzr-gtk.
>
> Requested reviews:
> Bazaar GTK maintainers (bzr-gtk)
>
> For more details, see:
> https://code.launchpad.net/~sinzui/bzr-gtk/gtk3/+merge/74472
>
> Update bzr-gtk to Gtk3.
>
> Launchpad bug: https://bugs.launchpad.net/bugs/796856
> Pre-implementation: no one
>
> bzr-gtk commands, widgets, cannot be used in a process that has imported gtk3.
> Gtk-ERROR **: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the
> same process is not supported Trace/breakpoint trap
>
> The general approach to fix this is to
> create a gtk3 series
> Run pygi.convert.sh found in pygi's tree
> Update all the obsolete 2.x calls to 3.
>
> The majority of this branch is mechanical changes as outlined in the rules
> below. There are three changes that should be given more attention in the
> review:

I don't think bzr-gtk is particularly well supported by "upstream" at
this point. So I'm going to rubber stamp your work, assuming you did a
good job. We can wait a bit, and see if anyone complains before landing
it. But the patch is large enough, I don't think people will really go
through it anyway.

 review: approve

> This branch works very well for my self, but I am sure that there are gtk3
> conversion issues that I have not discovered. I more users are now needed
> to find bugs.

I think that is a pretty good estimate, though.

I think overall this is an improvement, which may not be perfect, but it
better than the status quo, so it should be merged.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk5ofE0ACgkQJdeBCYSNAAMYRwCcDPSACyo8oYL6NLJXXyx6L4Xj
X1YAoNM+3TvYygZwFZr1mL1ZhufTNCOv
=sgU+
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'HACKING'
--- HACKING	2008-07-17 11:51:03 +0000
+++ HACKING	2011-09-08 03:12:25 +0000
@@ -8,8 +8,6 @@
 (http://developer.gnome.org/projects/gup/hig/) should be followed where 
 possible.
 
-Several parts of bzr-gtk are currently using glade. However, we are slowly
-trying to move away from glade so please don't add new code that uses glade and
-try to remove the use of glade.
+Don't add new code that uses glade.
 
 Please update the NEWS file when closing bugs or adding new features.

=== modified file 'README'
--- README	2009-05-26 13:58:24 +0000
+++ README	2011-09-08 03:12:25 +0000
@@ -15,7 +15,7 @@
 
   * Python 2.4
   * Bazaar with the same major version as bzr-gtk
-  * PyGTK 2.8 or later
+  * PyGObject
 
 In order to see graphs in the visualisation tool, you will also need:
 
@@ -119,7 +119,7 @@
 
  - Python: http://www.python.org/download/releases/2.4.3/
  - GTK: http://gladewin32.sourceforge.net/
- - PyGTK: http://www.mapr.ucl.ac.be/~gustin/win32_ports (pygtk, pygobject and pycairo)
+ - PyGTK: http://www.mapr.ucl.ac.be/~gustin/win32_ports (pygobject and pycairo)
  - Bazaar: http://bazaar-vcs.org/WindowsDownloads (Python-based should be okay)
  - pyWin32: http://sourceforge.net/project/showfiles.php?group_id=78018
 

=== modified file '__init__.py'
--- __init__.py	2011-04-10 18:44:39 +0000
+++ __init__.py	2011-09-08 03:12:25 +0000
@@ -75,17 +75,8 @@
     from bzrlib.trace import warning
     warning("Not running as bzrlib.plugins.gtk, things may break.")
 
-def import_pygtk():
-    try:
-        import pygtk
-    except ImportError:
-        raise errors.BzrCommandError("PyGTK not installed.")
-    pygtk.require('2.0')
-    return pygtk
-
 
 def set_ui_factory():
-    import_pygtk()
     from ui import GtkUIFactory
     import bzrlib.ui
     bzrlib.ui.ui_factory = GtkUIFactory()
@@ -168,8 +159,8 @@
     try:
         result = basic_tests
         try:
-            import_pygtk()
-        except errors.BzrCommandError:
+            import gi.repository.Gtk
+        except ImportError:
             return basic_tests
         basic_tests.addTest(loader.loadTestsFromModuleNames(
                 ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))

=== modified file 'about.py'
--- about.py	2011-03-14 20:12:19 +0000
+++ about.py	2011-09-08 03:12:25 +0000
@@ -14,13 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
+from gi.repository import GdkPixbuf
 import os
 
 import bzrlib
@@ -49,14 +44,14 @@
     return credits
 
 
-class AboutDialog(gtk.AboutDialog):
+class AboutDialog(Gtk.AboutDialog):
     def __init__(self):
         super(AboutDialog, self).__init__()
         self.set_name("Bazaar GTK")
         self.set_version(bzrlib.plugins.gtk.version_string)
         self.set_website("http://bazaar-vcs.org/BzrGtk")
         self.set_license(read_license())
-        self.set_logo(gtk.gdk.pixbuf_new_from_file(icon_path("bzr-icon-64.png")))
+        self.set_logo(GdkPixbuf.Pixbuf.new_from_file(icon_path("bzr-icon-64.png")))
         credits = load_credits()
         if credits is not None:
             (authors, documenters, artists, translators) = credits

=== modified file 'annotate/colormap.py'
--- annotate/colormap.py	2011-03-14 20:12:19 +0000
+++ annotate/colormap.py	2011-09-08 03:12:25 +0000
@@ -14,9 +14,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+__metaclass__ = type
+
 import sys
 
-class AnnotateColorMap(object):
+
+class AnnotateColorMap:
 
     really_old_color = "#0046FF"
 
@@ -62,9 +65,10 @@
 
         return color
 
+
 class AnnotateColorSaturation(AnnotateColorMap):
     def __init__(self, span=340.):
-        AnnotateColorMap.__init__(self, span)
+        super(AnnotateColorSaturation, self).__init__(span)
         self.current_angle = 0
 
     def hue(self, angle):

=== modified file 'annotate/config.py'
--- annotate/config.py	2011-06-17 12:54:05 +0000
+++ annotate/config.py	2011-09-08 03:12:25 +0000
@@ -16,7 +16,7 @@
 
 import os
 
-import gtk.gdk
+from gi.repository import Gdk
 
 from bzrlib import config
 try:
@@ -38,7 +38,7 @@
     """
 
     def __init__(self, window):
-        configobj.ConfigObj.__init__(self, gannotate_config_filename())
+        super(GAnnotateConfig, self).__init__(gannotate_config_filename())
         self.window = window
         self.pane = window.pane
 
@@ -74,7 +74,7 @@
         self.pane.connect("notify", self._save_pane_props)
 
     def _save_window_props(self, w, e, *args):
-        if e.window.get_state() & gtk.gdk.WINDOW_STATE_MAXIMIZED:
+        if e.window.get_state() & Gdk.WindowState.MAXIMIZED:
             maximized = True
         else:
             self["window"]["width"], self["window"]["height"] = w.get_size()
@@ -84,7 +84,7 @@
         return False
 
     def _save_pane_props(self, w, gparam):
-        if gparam.name == "position":
+        if gparam and gparam.name == "position":
             self["window"]["pane_position"] = w.get_position()
 
         return False

=== modified file 'annotate/gannotate.py'
--- annotate/gannotate.py	2011-03-23 09:49:44 +0000
+++ annotate/gannotate.py	2011-09-08 03:12:25 +0000
@@ -16,11 +16,10 @@
 
 import time
 
-import pygtk
-pygtk.require("2.0")
-import gobject
-import gtk
-import pango
+from gi.repository import GObject
+from gi.repository import Gdk
+from gi.repository import Gtk
+from gi.repository import Pango
 import re
 
 from bzrlib import patiencediff
@@ -50,9 +49,10 @@
         self.plain = plain
         self._branch = branch
 
-        Window.__init__(self, parent)
+        super(GAnnotateWindow, self).__init__(parent=parent)
 
-        self.set_icon(self.render_icon(gtk.STOCK_FIND, gtk.ICON_SIZE_BUTTON))
+        self.set_icon(
+            self.render_icon_pixbuf(Gtk.STOCK_FIND, Gtk.IconSize.BUTTON))
         self.annotate_colormap = AnnotateColorSaturation()
 
         self._create()
@@ -70,12 +70,12 @@
                                    lambda: CURRENT_REVISION)()
 
         # [revision id, line number, author, revno, highlight color, line]
-        self.annomodel = gtk.ListStore(gobject.TYPE_STRING,
-                                       gobject.TYPE_INT,
-                                       gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING)
+        self.annomodel = Gtk.ListStore(GObject.TYPE_STRING,
+                                       GObject.TYPE_INT,
+                                       GObject.TYPE_STRING,
+                                       GObject.TYPE_STRING,
+                                       GObject.TYPE_STRING,
+                                       GObject.TYPE_STRING)
 
         last_seen = None
         try:
@@ -129,8 +129,9 @@
         else:
             row = lineno - 1
 
-        self.annoview.set_cursor(row)
-        self.annoview.scroll_to_cell(row, use_align=True)
+        tree_path = Gtk.TreePath(path=row)
+        self.annoview.set_cursor(tree_path, None, False)
+        self.annoview.scroll_to_cell(tree_path, use_align=True)
 
 
     def _annotate(self, tree, file_id):
@@ -167,8 +168,9 @@
     def _highlight_annotation(self, model, path, iter, now):
         revision_id, = model.get(iter, REVISION_ID_COL)
         revision = self.revisions[revision_id]
-        model.set(iter, HIGHLIGHT_COLOR_COL,
-                  self.annotate_colormap.get_color(revision, now))
+        # XXX sinzui 2011-08-12: What does get_color return?
+        color = self.annotate_colormap.get_color(revision, now)
+        model.set_value(iter, HIGHLIGHT_COLOR_COL, color)
 
     def _selected_revision(self):
         (path, col) = self.annoview.get_cursor()
@@ -193,46 +195,46 @@
         self.revisionview = self._create_log_view()
         self.annoview = self._create_annotate_view()
 
-        vbox = gtk.VBox(False)
+        vbox = Gtk.VBox(homogeneous=False, spacing=0)
         vbox.show()
 
-        sw = gtk.ScrolledWindow()
-        sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        sw.set_shadow_type(gtk.SHADOW_IN)
+        sw = Gtk.ScrolledWindow()
+        sw.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        sw.set_shadow_type(Gtk.ShadowType.IN)
         sw.add(self.annoview)
         self.annoview.gwindow = self
         sw.show()
 
-        swbox = gtk.VBox()
-        swbox.pack_start(sw)
+        swbox = Gtk.VBox()
+        swbox.pack_start(sw, True, True, 0)
         swbox.show()
 
-        hbox = gtk.HBox(False, 6)
+        hbox = Gtk.HBox(homogeneous=False, spacing=6)
         self.back_button = self._create_back_button()
-        hbox.pack_start(self.back_button, expand=False, fill=True)
+        hbox.pack_start(self.back_button, False, True, 0)
         self.forward_button = self._create_forward_button()
-        hbox.pack_start(self.forward_button, expand=False, fill=True)
+        hbox.pack_start(self.forward_button, False, True, 0)
         self.find_button = self._create_find_button()
-        hbox.pack_start(self.find_button, expand=False, fill=True)
+        hbox.pack_start(self.find_button, False, True, 0)
         self.goto_button = self._create_goto_button()
-        hbox.pack_start(self.goto_button, expand=False, fill=True)
+        hbox.pack_start(self.goto_button, False, True, 0)
         hbox.show()
-        vbox.pack_start(hbox, expand=False, fill=True)
+        vbox.pack_start(hbox, False, True, 0)
 
-        self.pane = pane = gtk.VPaned()
+        self.pane = pane = Gtk.VPaned()
         pane.add1(swbox)
         pane.add2(self.revisionview)
         pane.show()
-        vbox.pack_start(pane, expand=True, fill=True)
+        vbox.pack_start(pane, True, True, 0)
 
         self._search = SearchBox()
-        swbox.pack_start(self._search, expand=False, fill=True)
-        accels = gtk.AccelGroup()
-        accels.connect_group(gtk.keysyms.f, gtk.gdk.CONTROL_MASK,
-                             gtk.ACCEL_LOCKED,
+        swbox.pack_start(self._search, False, True, 0)
+        accels = Gtk.AccelGroup()
+        accels.connect(Gdk.KEY_f, Gdk.ModifierType.CONTROL_MASK,
+                             Gtk.AccelFlags.LOCKED,
                              self._search_by_text)
-        accels.connect_group(gtk.keysyms.g, gtk.gdk.CONTROL_MASK,
-                             gtk.ACCEL_LOCKED,
+        accels.connect(Gdk.KEY_g, Gdk.ModifierType.CONTROL_MASK,
+                             Gtk.AccelFlags.LOCKED,
                              self._search_by_line)
         self.add_accel_group(accels)
 
@@ -247,7 +249,7 @@
         self._search.set_target(self.annoview, LINE_NUM_COL)
 
     def line_diff(self, tv, path, tvc):
-        row = path[0]
+        row = path.get_indices()[0]
         revision = self.annotations[row]
         repository = self.branch.repository
         if revision.revision_id == CURRENT_REVISION:
@@ -267,52 +269,52 @@
 
 
     def _create_annotate_view(self):
-        tv = gtk.TreeView()
+        tv = Gtk.TreeView()
         tv.set_rules_hint(False)
         tv.connect("cursor-changed", self._activate_selected_revision)
         tv.show()
         tv.connect("row-activated", self.line_diff)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("xalign", 1.0)
         cell.set_property("ypad", 0)
         cell.set_property("family", "Monospace")
         cell.set_property("cell-background-gdk",
-                          tv.get_style().bg[gtk.STATE_NORMAL])
-        col = gtk.TreeViewColumn()
+                          tv.get_style().bg[Gtk.StateType.NORMAL])
+        col = Gtk.TreeViewColumn()
         col.set_resizable(False)
-        col.pack_start(cell, expand=True)
+        col.pack_start(cell, True)
         col.add_attribute(cell, "text", LINE_NUM_COL)
         tv.append_column(col)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("ypad", 0)
-        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
+        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
         cell.set_property("cell-background-gdk",
-                          self.get_style().bg[gtk.STATE_NORMAL])
-        col = gtk.TreeViewColumn("Committer")
+                          self.get_style().bg[Gtk.StateType.NORMAL])
+        col = Gtk.TreeViewColumn("Committer")
         col.set_resizable(True)
-        col.pack_start(cell, expand=True)
+        col.pack_start(cell, True)
         col.add_attribute(cell, "text", COMMITTER_COL)
         tv.append_column(col)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("xalign", 1.0)
         cell.set_property("ypad", 0)
         cell.set_property("cell-background-gdk",
-                          self.get_style().bg[gtk.STATE_NORMAL])
-        col = gtk.TreeViewColumn("Revno")
+                          self.get_style().bg[Gtk.StateType.NORMAL])
+        col = Gtk.TreeViewColumn("Revno")
         col.set_resizable(False)
-        col.pack_start(cell, expand=True)
+        col.pack_start(cell, True)
         col.add_attribute(cell, "markup", REVNO_COL)
         tv.append_column(col)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("ypad", 0)
         cell.set_property("family", "Monospace")
-        col = gtk.TreeViewColumn()
+        col = Gtk.TreeViewColumn()
         col.set_resizable(False)
-        col.pack_start(cell, expand=True)
+        col.pack_start(cell, True)
 #        col.add_attribute(cell, "foreground", HIGHLIGHT_COLOR_COL)
         col.add_attribute(cell, "background", HIGHLIGHT_COLOR_COL)
         col.add_attribute(cell, "text", TEXT_LINE_COL)
@@ -323,7 +325,7 @@
             return model.get_value(iter, TEXT_LINE_COL).lower().find(key.lower()) == -1
 
         tv.set_enable_search(True)
-        tv.set_search_equal_func(search_equal_func)
+        tv.set_search_equal_func(search_equal_func, None)
 
         return tv
 
@@ -333,41 +335,41 @@
         return lv
 
     def _create_back_button(self):
-        button = gtk.Button()
+        button = Gtk.Button()
         button.set_use_stock(True)
         button.set_label("gtk-go-back")
         button.connect("clicked", lambda w: self.go_back())
-        button.set_relief(gtk.RELIEF_NONE)
+        button.set_relief(Gtk.ReliefStyle.NONE)
         button.show()
         return button
 
     def _create_forward_button(self):
-        button = gtk.Button()
+        button = Gtk.Button()
         button.set_use_stock(True)
         button.set_label("gtk-go-forward")
         button.connect("clicked", lambda w: self.go_forward())
-        button.set_relief(gtk.RELIEF_NONE)
+        button.set_relief(Gtk.ReliefStyle.NONE)
         button.show()
         button.set_sensitive(False)
         return button
 
     def _create_find_button(self):
-        button = gtk.Button()
+        button = Gtk.Button()
         button.set_use_stock(True)
         button.set_label("gtk-find")
         button.set_tooltip_text("Search for text (Ctrl+F)")
         button.connect("clicked", self._search_by_text)
-        button.set_relief(gtk.RELIEF_NONE)
+        button.set_relief(Gtk.ReliefStyle.NONE)
         button.show()
         button.set_sensitive(True)
         return button
 
     def _create_goto_button(self):
-        button = gtk.Button()
+        button = Gtk.Button()
         button.set_label("Goto Line")
         button.set_tooltip_text("Scroll to a line by entering its number (Ctrl+G)")
         button.connect("clicked", self._search_by_line)
-        button.set_relief(gtk.RELIEF_NONE)
+        button.set_relief(Gtk.ReliefStyle.NONE)
         button.show()
         button.set_sensitive(True)
         return button
@@ -396,12 +398,14 @@
         rev_id = self._selected_revision()
         if self.file_id in target_tree:
             offset = self.get_scroll_offset(target_tree)
-            (row,), col = self.annoview.get_cursor()
+            path, col = self.annoview.get_cursor()
+            (row,) = path.get_indices()
             self.annotate(target_tree, self.branch, self.file_id)
             new_row = row+offset
             if new_row < 0:
                 new_row = 0
-            self.annoview.set_cursor(new_row)
+            new_path = Gtk.TreePath(path=new_row)
+            self.annoview.set_cursor(new_path, None, False)
             return True
         else:
             return False
@@ -409,7 +413,8 @@
     def get_scroll_offset(self, tree):
         old = self.tree.get_file(self.file_id)
         new = tree.get_file(self.file_id)
-        (row,), col = self.annoview.get_cursor()
+        path, col = self.annoview.get_cursor()
+        (row,) = path.get_indices()
         matcher = patiencediff.PatienceSequenceMatcher(None, old.readlines(),
                                                        new.readlines())
         for i, j, n in matcher.get_matching_blocks():
@@ -452,57 +457,58 @@
             self.__cache[revision_id] = revision
         return self.__cache[revision_id]
 
-class SearchBox(gtk.HBox):
+
+class SearchBox(Gtk.HBox):
     """A button box for searching in text or lines of annotations"""
     def __init__(self):
-        gtk.HBox.__init__(self, False, 6)
+        super(SearchBox, self).__init__(homogeneous=False, spacing=6)
 
         # Close button
-        button = gtk.Button()
-        image = gtk.Image()
-        image.set_from_stock('gtk-stop', gtk.ICON_SIZE_BUTTON)
+        button = Gtk.Button()
+        image = Gtk.Image()
+        image.set_from_stock('gtk-stop', Gtk.IconSize.BUTTON)
         button.set_image(image)
-        button.set_relief(gtk.RELIEF_NONE)
-        button.connect("clicked", lambda w: self.hide_all())
-        self.pack_start(button, expand=False, fill=False)
+        button.set_relief(Gtk.ReliefStyle.NONE)
+        button.connect("clicked", lambda w: self.hide())
+        self.pack_start(button, False, False, 0)
 
         # Search entry
-        label = gtk.Label()
+        label = Gtk.Label()
         self._label = label
-        self.pack_start(label, expand=False, fill=False)
+        self.pack_start(label, False, False, 0)
 
-        entry = gtk.Entry()
+        entry = Gtk.Entry()
         self._entry = entry
         entry.connect("activate", lambda w, d: self._do_search(d),
                       'forward')
-        self.pack_start(entry, expand=False, fill=False)
+        self.pack_start(entry, False, False, 0)
 
         # Next/previous buttons
-        button = gtk.Button('_Next')
-        image = gtk.Image()
-        image.set_from_stock('gtk-go-forward', gtk.ICON_SIZE_BUTTON)
+        button = Gtk.Button('_Next')
+        image = Gtk.Image()
+        image.set_from_stock('gtk-go-forward', Gtk.IconSize.BUTTON)
         button.set_image(image)
         button.connect("clicked", lambda w, d: self._do_search(d),
                        'forward')
-        self.pack_start(button, expand=False, fill=False)
+        self.pack_start(button, False, False, 0)
 
-        button = gtk.Button('_Previous')
-        image = gtk.Image()
-        image.set_from_stock('gtk-go-back', gtk.ICON_SIZE_BUTTON)
+        button = Gtk.Button('_Previous')
+        image = Gtk.Image()
+        image.set_from_stock('gtk-go-back', Gtk.IconSize.BUTTON)
         button.set_image(image)
         button.connect("clicked", lambda w, d: self._do_search(d),
                        'backward')
-        self.pack_start(button, expand=False, fill=False)
+        self.pack_start(button, False, False, 0)
 
         # Search options
-        check = gtk.CheckButton('Match case')
+        check = Gtk.CheckButton('Match case')
         self._match_case = check
-        self.pack_start(check, expand=False, fill=False)
+        self.pack_start(check, False, False, 0)
 
-        check = gtk.CheckButton('Regexp')
+        check = Gtk.CheckButton('Regexp')
         check.connect("toggled", lambda w: self._set_label())
         self._regexp = check
-        self.pack_start(check, expand=False, fill=False)
+        self.pack_start(check, False, False, 0)
 
         self._view = None
         self._column = None
@@ -588,6 +594,6 @@
         for row in iterate(model, start):
             if self._match(model, row, self._column):
                 path = model.get_path(row)
-                self._view.set_cursor(path)
+                self._view.set_cursor(path, None, False)
                 self._view.scroll_to_cell(path, use_align=True)
                 break

=== modified file 'annotate/spanselector.py'
--- annotate/spanselector.py	2011-03-14 20:12:19 +0000
+++ annotate/spanselector.py	2011-09-08 03:12:25 +0000
@@ -15,10 +15,8 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
-import pygtk
-pygtk.require("2.0")
-import gobject
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 
 (
@@ -29,7 +27,7 @@
 ) = range(4)
 
 
-class SpanSelector(gtk.HBox):
+class SpanSelector(Gtk.HBox):
     """Encapsulates creation and functionality of widgets used for changing
     highlight spans.
 
@@ -41,18 +39,19 @@
     last_selected = None
 
     def __init__(self, homogeneous=False, spacing=6):
-        gtk.HBox.__init__(self, homogeneous, spacing)
+        super(SpanSelector, self).__init__(
+            homogeneous=homogeneous, spacing=spacing)
 
         self.model = self._create_model()
         self.combo = self._create_combobox(self.model)
         self.entry = self._create_custom_entry()
 
-        label = gtk.Label("Highlighting spans:")
+        label = Gtk.Label(label="Highlighting spans:")
         label.show()
 
-        self.pack_start(label, expand=False, fill=True)
-        self.pack_start(self.combo, expand=False, fill=False)
-        self.pack_start(self.entry, expand=False, fill=False)
+        self.pack_start(label, False, True, True, 0)
+        self.pack_start(self.combo, False, False, True, 0)
+        self.pack_start(self.entry, False, False, True, 0)
 
     def set_to_oldest_span(self, span):
         """Set the span associated with the "to Oldest Revision" entry."""
@@ -67,7 +66,7 @@
         self.max_custom_spans = n
 
     def activate(self, iter):
-        """Activate the row pointed to by gtk.TreeIter iter."""
+        """Activate the row pointed to by Gtk.TreeIter iter."""
         index = self._get_index_from_iter(iter)
         self.combo.set_active(index)
 
@@ -100,7 +99,7 @@
             self.emit("span-changed", model.get_value(iter, SPAN_DAYS_COL))
 
     def _activate_custom_span_cb(self, w):
-        self.entry.hide_all()
+        self.entry.hide()
         self.combo.show()
 
         span = float(w.get_text())
@@ -137,10 +136,10 @@
     def _create_model(self):
         # [span in days, span as string, row is seperator?, row is select
         # default?]
-        m = gtk.ListStore(gobject.TYPE_FLOAT,
-                          gobject.TYPE_STRING,
-                          gobject.TYPE_BOOLEAN,
-                          gobject.TYPE_BOOLEAN)
+        m = Gtk.ListStore(GObject.TYPE_FLOAT,
+                          GObject.TYPE_STRING,
+                          GObject.TYPE_BOOLEAN,
+                          GObject.TYPE_BOOLEAN)
 
         self.separator = [0., "", True, False]
 
@@ -157,10 +156,10 @@
         return m
 
     def _create_combobox(self, model):
-        cb = gtk.ComboBox(model)
+        cb = Gtk.ComboBox(model)
         cb.set_row_separator_func(
             lambda m, i: m.get_value(i, SPAN_IS_SEPARATOR_COL))
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cb.pack_start(cell, False)
         cb.add_attribute(cell, "text", SPAN_STR_COL)
         cb.connect("changed", self._combo_changed_cb)
@@ -169,19 +168,19 @@
         return cb
 
     def _create_custom_entry(self):
-        entry = gtk.HBox(False, 6)
+        entry = Gtk.HBox(False, 6)
 
-        spin = gtk.SpinButton(digits=2)
+        spin = Gtk.SpinButton(digits=2)
         spin.set_numeric(True)
         spin.set_increments(1., 10.)
         spin.set_range(0., 100 * 365) # I presume 100 years is sufficient
         spin.connect("activate", self._activate_custom_span_cb)
         spin.connect("show", lambda w: w.grab_focus())
 
-        label = gtk.Label("Days")
+        label = Gtk.Label(label="Days")
 
-        entry.pack_start(spin, expand=False, fill=False)
-        entry.pack_start(label, expand=False, fill=False)
+        entry.pack_start(spin, False, False, True, 0)
+        entry.pack_start(label, False, False, True, 0)
 
         return entry
 
@@ -191,18 +190,18 @@
 
 Callback signature: def callback(SpanSelector, span, [user_param, ...])
 """
-gobject.signal_new("span-changed", SpanSelector,
-                   gobject.SIGNAL_RUN_LAST,
-                   gobject.TYPE_NONE,
-                   (gobject.TYPE_FLOAT,))
+GObject.signal_new("span-changed", SpanSelector,
+                   GObject.SignalFlags.RUN_LAST,
+                   None,
+                   (GObject.TYPE_FLOAT,))
 
 """The "custom-span-added" signal is emitted after a custom span has been
 added, but before it has been selected.
 
 Callback signature: def callback(SpanSelector, span, [user_param, ...])
 """
-gobject.signal_new("custom-span-added", SpanSelector,
-                   gobject.SIGNAL_RUN_LAST,
-                   gobject.TYPE_NONE,
-                   (gobject.TYPE_FLOAT,))
+GObject.signal_new("custom-span-added", SpanSelector,
+                   GObject.SignalFlags.RUN_LAST,
+                   None,
+                   (GObject.TYPE_FLOAT,))
 

=== modified file 'avatarsbox.py'
--- avatarsbox.py	2011-09-03 21:24:24 +0000
+++ avatarsbox.py	2011-09-08 03:12:25 +0000
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import gtk
+from gi.repository import Gtk
+from gi.repository import GdkPixbuf
 
 from bzrlib.config import parse_username
 
@@ -25,12 +26,12 @@
     )
 
 
-class Avatar(gtk.HBox):
+class Avatar(Gtk.HBox):
     """ Author or committer avatar """
 
     def __init__(self, apparent_username):
         """ Constructor """
-        gtk.HBox.__init__(self)
+        super(Avatar, self).__init__()
 
         self.apparent_username = apparent_username
         self.username, self.email = parse_username(apparent_username)
@@ -43,44 +44,41 @@
 
     def show_spinner(self):
         """
-        Replace the current content of the Avatar with a gtk.Spinner
-        if an email address has been parsed. If not, show an gtk.Label with
+        Replace the current content of the Avatar with a Gtk.Spinner
+        if an email address has been parsed. If not, show an Gtk.Label with
         the translatable 'No email' text.
         """
         if self.email:
             tooltip = _i18n("Retrieving avatar for %s...") % self.email
-            if getattr(gtk, "Spinner", False):
-                spinner = gtk.Spinner()
-                spinner.start()
-                self.pack_start(spinner, False)
-                spinner.set_tooltip_text(tooltip)
-                spinner.set_size_request(20, 20)
-                spinner.show()
-            else:
-                spinner = gtk.Label(tooltip)
-                self.pack_start(spinner)
-                self.set_tooltip_text(self.apparent_username)
-                spinner.show()
+            spinner = Gtk.Spinner()
+            spinner.start()
+            self.pack_start(spinner, False, True, 0)
+            spinner.set_tooltip_text(tooltip)
+            spinner.set_size_request(20, 20)
+            spinner.show()
         else:
-            no_email = gtk.Label(_i18n("No email"))
-            self.pack_start(no_email)
+            no_email = Gtk.Label(label=_i18n("No email"))
+            self.pack_start(no_email, True, True, 0)
             self.set_tooltip_text(self.apparent_username)
             no_email.show()
 
     def show_image(self):
-        """Replace the current content of the Avatar with the gtk.Image """
+        """Replace the current content of the Avatar with the Gtk.Image """
         if self.email and self.image:
-            self.remove(self.get_children()[0])
-            self.pack_start(self.image)
+            children = self.get_children()
+            if children != []:
+                self.remove(children[0])
+            self.pack_start(self.image, True, True, 0)
             self.image.set_tooltip_text(self.apparent_username)
             self.image.show()
 
 
-class AvatarBox(gtk.HBox):
+class AvatarBox(Gtk.HBox):
     """HBox showing an avatar."""
 
     def __init__(self, homogeneous=False, spacing=0):
-        gtk.HBox.__init__(self, homogeneous, spacing)
+        super(AvatarBox, self).__init__(
+            homogeneous=homogeneous, spacing=spacing)
         self.__avatars = {}
         self.avatar = None
         self.__displaying = None
@@ -129,9 +127,9 @@
         return self
 
     def update_avatar_image_from_pixbuf_loader(self, loader):
-        """Replace the gtk.Spinner with the given loader."""
+        """Replace the Gtk.Spinner with the given loader."""
         if self.avatar:
-            self.avatar.image = gtk.Image()
+            self.avatar.image = Gtk.Image()
             self.avatar.image.set_from_pixbuf(loader.get_pixbuf())
             self.avatar.show_image()
             self.__displaying = self.avatar
@@ -139,31 +137,30 @@
     def come_back_to_gui(self):
         """Render back avatar in the GUI."""
         if self.avatar:
-            self.pack_start(self.avatar)
+            self.pack_start(self.avatar, True, True, 0)
             self.__displaying = self.avatar
         else:
             self._show_no_email()
 
     def _new_cell_for_avatar(self, avatar):
-        """Create a new cell in this box with a gtk.Spinner."""
+        """Create a new cell in this box with a Gtk.Spinner."""
         avatar.show_spinner()
-        self.pack_start(avatar)
+        self.pack_start(avatar, True, True, 0)
         avatar.show()
         self.__displaying = avatar
 
     def _show_no_email(self):
-        """Show a gtk.Label with test 'No email'."""
-        no_email = gtk.Label(_i18n("No email"))
-        self.pack_start(no_email)
+        """Show a Gtk.Label with text 'No email'."""
+        no_email = Gtk.Label(label=_i18n("No email"))
+        self.pack_start(no_email, True, True, 0)
         no_email.show()
 
 
-class AvatarsBox(gtk.HBox):
+class AvatarsBox(Gtk.HBox):
     """GTK container for author and committer avatars."""
 
     def __init__(self):
-        gtk.HBox.__init__(self, False, 10)
-
+        super(AvatarsBox, self).__init__(homogeneous=False, spacing=10)
         self.__committer_box = None
         self.__authors_box = None
         self._init_gui()
@@ -215,15 +212,15 @@
 
     def _init_gui(self):
         """Create boxes where avatars will be displayed."""
-        # 2 gtk.HBox: One for the committer and one for authors
+        # 2 Gtk.HBox: One for the committer and one for authors
         # Committer
         self.__committer_box = AvatarBox()
         self.__committer_box.set_size_request(80, 80)
-        self.pack_end(self.__committer_box, False)
+        self.pack_end(self.__committer_box, False, True, 0)
         self.__committer_box.show()
         # Authors
         self.__authors_box = AvatarBox()
-        self.pack_end(self.__authors_box, False)
+        self.pack_end(self.__authors_box, False, True, 0)
         self.__authors_box.set_spacing(10)
         self.__authors_box.show()
 
@@ -234,8 +231,8 @@
         :param email: used to identify item from self.__avatars.
         """
         if email:
-            # Convert downloaded image from provider to gtk.Image
-            loader = gtk.gdk.PixbufLoader()
+            # Convert downloaded image from provider to Gtk.Image
+            loader = GdkPixbuf.PixbufLoader()
             loader.write(response.read())
             loader.close()
 
@@ -244,7 +241,7 @@
                     email).update_avatar_image_from_pixbuf_loader(loader)
 
     def _role_box_for(self, role):
-        """ Return the gtk.HBox for the given role """
+        """ Return the Gtk.HBox for the given role """
         if role == "committer":
             return self.__committer_box
         else:

=== modified file 'branch.py'
--- branch.py	2011-04-10 18:44:39 +0000
+++ branch.py	2011-09-08 03:12:25 +0000
@@ -16,13 +16,7 @@
 
 import os
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 from bzrlib import (
     errors,
@@ -36,33 +30,32 @@
 from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
 
 
-class BranchDialog(gtk.Dialog):
+class BranchDialog(Gtk.Dialog):
     """ New implementation of the Branch dialog. """
 
     def __init__(self, path=None, parent=None, remote_path=None):
         """ Initialize the Branch dialog. """
-        gtk.Dialog.__init__(self, title="Branch - Olive",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(BranchDialog, self).__init__(
+            title="Branch - Olive", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
         # Get arguments
         self.path = path
 
         # Create the widgets
-        self._button_branch = gtk.Button(_i18n("_Branch"), use_underline=True)
+        self._button_branch = Gtk.Button(_i18n("_Branch"), use_underline=True)
         self._remote_branch = BranchSelectionBox()
-        self._button_revision = gtk.Button('')
-        self._label_location = gtk.Label(_i18n("Branch location:"))
+        self._button_revision = Gtk.Button('')
+        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
         self._label_location.set_alignment(0, 0.5)
-        self._label_destination = gtk.Label(_i18n("Destination:"))
-        self._label_nick = gtk.Label(_i18n("Branck nick:"))
-        self._label_revision = gtk.Label(_i18n("Revision:"))
-        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
-        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
-        self._hbox_revision = gtk.HBox()
-        self._entry_revision = gtk.Entry()
-        self._entry_nick = gtk.Entry()
+        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
+        self._label_nick = Gtk.Label(label=_i18n("Branck nick:"))
+        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
+        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
+        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
+        self._hbox_revision = Gtk.HBox()
+        self._entry_revision = Gtk.Entry()
+        self._entry_nick = Gtk.Entry()
 
         # Set callbacks
         self._button_branch.connect('clicked', self._on_branch_clicked)
@@ -70,7 +63,7 @@
         self._remote_branch.connect('branch-changed', self._on_branch_changed)
 
         # Create the table and pack the widgets into it
-        self._table = gtk.Table(rows=3, columns=2)
+        self._table = Gtk.Table(rows=3, columns=2)
         self._table.attach(self._label_location, 0, 1, 0, 1)
         self._table.attach(self._remote_branch, 1, 2, 0, 1)
         self._table.attach(self._label_destination, 0, 1, 1, 2)
@@ -81,8 +74,8 @@
         self._table.attach(self._hbox_revision, 1, 2, 3, 4)
 
         # Set properties
-        self._image_browse = gtk.Image()
-        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
+        self._image_browse = Gtk.Image()
+        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
         self._button_revision.set_image(self._image_browse)
         self._button_revision.set_sensitive(False)
         self._label_destination.set_alignment(0, 0.5)
@@ -90,20 +83,20 @@
         self._label_revision.set_alignment(0, 0.5)
         self._table.set_row_spacings(3)
         self._table.set_col_spacings(3)
-        self.vbox.set_spacing(3)
+        self.get_content_area().set_spacing(3)
         if remote_path is not None:
             self._remote_branch.set_url(remote_path)
         if self.path is not None:
             self._filechooser.set_filename(self.path)
 
         # Pack some widgets
-        self._hbox_revision.pack_start(self._entry_revision, True, True)
-        self._hbox_revision.pack_start(self._button_revision, False, False)
-        self.vbox.add(self._table)
-        self.action_area.pack_end(self._button_branch)
+        self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
+        self._hbox_revision.pack_start(self._button_revision, False, False, 0)
+        self.get_content_area().add(self._table)
+        self.action_area.pack_end(self._button_branch, False, False, 0)
 
         # Show the dialog
-        self.vbox.show_all()
+        self.get_content_area().show_all()
 
     def _get_last_revno(self):
         """ Get the revno of the last revision (if any). """
@@ -124,10 +117,10 @@
             return
         revb = RevisionBrowser(br, self)
         response = revb.run()
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             revb.hide()
 
-            if response == gtk.RESPONSE_OK:
+            if response == Gtk.ResponseType.OK:
                 if revb.selected_revno is not None:
                     self._entry_revision.set_text(revb.selected_revno)
 
@@ -181,7 +174,7 @@
         info_dialog(_i18n('Branching successful'),
                     _i18n('%d revision(s) branched.') % revs)
 
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)
 
     def _on_branch_changed(self, widget, event):
         """ We try to get the last revision if focus lost. """

=== modified file 'branchbox.py'
--- branchbox.py	2011-03-14 20:12:19 +0000
+++ branchbox.py	2011-09-08 03:12:25 +0000
@@ -14,26 +14,22 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 
 from bzrlib.branch import Branch
 from bzrlib.config import GlobalConfig
 
 from bzrlib.plugins.gtk.history import UrlHistory
 
-class BranchSelectionBox(gtk.HBox):
+
+class BranchSelectionBox(Gtk.HBox):
 
     def __init__(self, path=None):
-        gobject.GObject.__init__(self)
-        self._combo = gtk.ComboBoxEntry()
-        self._combo.child.connect('focus-out-event', self._on_combo_changed)
+        super(BranchSelectionBox, self).__init__()
+        self._combo = Gtk.ComboBox.new_with_entry()
+        self._combo.get_child().connect(
+            'focus-out-event', self._on_combo_changed)
 
         # Build branch history
         self._history = UrlHistory(GlobalConfig(), 'branch_history')
@@ -55,18 +51,19 @@
 
     def _build_history(self):
         """ Build up the branch history. """
-        self._combo_model = gtk.ListStore(str)
+        self._combo_model = Gtk.ListStore(str)
 
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
 
         self._combo.set_model(self._combo_model)
-        self._combo.set_text_column(0)
+        self._combo.set_entry_text_column(0)
 
     def _on_combo_changed(self, widget, event):
         self.emit('branch-changed', widget)
 
-gobject.signal_new('branch-changed', BranchSelectionBox,
-                   gobject.SIGNAL_RUN_LAST,
-                   gobject.TYPE_NONE, (gobject.TYPE_OBJECT,))
-gobject.type_register(BranchSelectionBox)
+
+GObject.signal_new('branch-changed', BranchSelectionBox,
+                   GObject.SignalFlags.RUN_LAST,
+                   None, (GObject.TYPE_OBJECT,))
+GObject.type_register(BranchSelectionBox)

=== modified file 'branchview/graphcell.py'
--- branchview/graphcell.py	2011-03-14 20:12:19 +0000
+++ branchview/graphcell.py	2011-09-08 03:12:25 +0000
@@ -10,19 +10,34 @@
 just be for the background.
 """
 
-__copyright__ = "Copyright © 2005 Canonical Ltd."
+__copyright__ = "Copyright © 2005-2011 Canonical Ltd."
 __author__    = "Scott James Remnant <[e-mail]>"
 
 
 import math
 
-import gtk
-import gobject
-import pango
-import cairo
-
-
-class CellRendererGraph(gtk.GenericCellRenderer):
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import Pango
+from gi.repository import PangoCairo
+
+
+# Cairo constants are not exported yet. These are taken from documentation.
+CAIRO_LINE_CAP_BUTT = 0
+CAIRO_LINE_CAP_ROUND = 1
+CAIRO_LINE_CAP_SQUARE = 2
+
+
+CAIRO_FILL_RULE_WINDING = 0
+CAIRO_FILL_RULE_EVEN_ODD = 1
+
+
+# Macro from  Pango header.
+def PANGO_PIXELS(d):
+    return (d + 512) / 1000
+
+
+class CellRendererGraph(Gtk.CellRendererPixbuf):
     """Cell renderer for directed graph.
 
     Properties:
@@ -34,21 +49,21 @@
     columns_len = 0
 
     __gproperties__ = {
-        "node":         ( gobject.TYPE_PYOBJECT, "node",
+        "node":         ( GObject.TYPE_PYOBJECT, "node",
                           "revision node instruction",
-                          gobject.PARAM_WRITABLE
+                          GObject.PARAM_WRITABLE
                         ),
-        "tags":         ( gobject.TYPE_PYOBJECT, "tags",
+        "tags":         ( GObject.TYPE_PYOBJECT, "tags",
                           "list of tags associated with the node",
-                          gobject.PARAM_WRITABLE
+                          GObject.PARAM_WRITABLE
                         ),
-        "in-lines":     ( gobject.TYPE_PYOBJECT, "in-lines",
+        "in-lines":     ( GObject.TYPE_PYOBJECT, "in-lines",
                           "instructions to draw lines into the cell",
-                          gobject.PARAM_WRITABLE
+                          GObject.PARAM_WRITABLE
                         ),
-        "out-lines":    ( gobject.TYPE_PYOBJECT, "out-lines",
+        "out-lines":    ( GObject.TYPE_PYOBJECT, "out-lines",
                           "instructions to draw lines out of the cell",
-                          gobject.PARAM_WRITABLE
+                          GObject.PARAM_WRITABLE
                         ),
         }
 
@@ -76,11 +91,9 @@
         except AttributeError:
             pango_ctx = widget.get_pango_context()
             font_desc = widget.get_style().font_desc
-            metrics = pango_ctx.get_metrics(font_desc)
-
-            ascent = pango.PIXELS(metrics.get_ascent())
-            descent = pango.PIXELS(metrics.get_descent())
-
+            metrics = pango_ctx.get_metrics(font_desc, None)
+            ascent = PANGO_PIXELS(metrics.get_ascent())
+            descent = PANGO_PIXELS(metrics.get_descent())
             self._box_size = ascent + descent + 6
             return self._box_size
 
@@ -113,7 +126,15 @@
 
         ctx.set_source_rgb(red, green, blue)
 
-    def on_get_size(self, widget, cell_area):
+    def do_activate(event, widget, path, bg_area, cell_area, flags):
+        """Renderers cannot be activated; always return True."""
+        return True
+
+    def do_editing_started(event, widget, path, fb_area, cell_area, flags):
+        """Renderers cannot be edited; always return None."""
+        return None
+
+    def do_get_size(self, widget, cell_area):
         """Return the size we need for this cell.
 
         Each cell is drawn individually and is only as wide as it needs
@@ -128,7 +149,7 @@
         # FIXME I have no idea how to use cell_area properly
         return (0, 0, width, height)
 
-    def on_render(self, window, widget, bg_area, cell_area, exp_area, flags):
+    def do_render(self, ctx, widget, bg_area, cell_area, flags):
         """Render an individual cell.
 
         Draws the cell contents using cairo, taking care to clip what we
@@ -142,7 +163,6 @@
         instead of a pure diagonal ... this reduces confusion by an
         incredible amount.
         """
-        ctx = window.cairo_create()
         ctx.rectangle(bg_area.x, bg_area.y, bg_area.width, bg_area.height)
         ctx.clip()
 
@@ -168,7 +188,7 @@
                 cell_area.y + cell_area.height / 2,
                 box_size / 4, 0, 2 * math.pi)
 
-        if flags & gtk.CELL_RENDERER_SELECTED:
+        if flags & Gtk.CellRendererState.SELECTED:
             ctx.set_source_rgb(1.0, 1.0, 1.0)
             ctx.set_line_width(box_size / 4)
             ctx.stroke_preserve()
@@ -182,9 +202,10 @@
 
         self.render_tags(ctx, widget.create_pango_context(), cell_area, box_size)
 
-    def render_line(self, ctx, cell_area, box_size, mid, height, start, end, colour, flags):
+    def render_line(self, ctx, cell_area, box_size,
+                    mid, height, start, end, colour, flags):
         if start is None:
-            ctx.set_line_cap(cairo.LINE_CAP_ROUND)
+            ctx.set_line_cap(CAIRO_LINE_CAP_ROUND)
             x = cell_area.x + box_size * end + box_size / 2
             ctx.move_to(x, mid + height / 3)
             ctx.line_to(x, mid + height / 3)
@@ -192,7 +213,7 @@
             ctx.line_to(x, mid + height / 6)
 
         elif end is None:
-            ctx.set_line_cap(cairo.LINE_CAP_ROUND)
+            ctx.set_line_cap(CAIRO_LINE_CAP_ROUND)
             x = cell_area.x + box_size * start + box_size / 2
             ctx.move_to(x, mid - height / 3)
             ctx.line_to(x, mid - height / 3)
@@ -200,7 +221,7 @@
             ctx.line_to(x, mid - height / 6)
 
         else:
-            ctx.set_line_cap(cairo.LINE_CAP_BUTT)
+            ctx.set_line_cap(CAIRO_LINE_CAP_BUTT)
             startx = cell_area.x + box_size * start + box_size / 2
             endx = cell_area.x + box_size * end + box_size / 2
 
@@ -217,7 +238,7 @@
                              endx, mid + height / 5 ,
                              endx, mid + height / 2 + 1)
 
-        if flags & gtk.CELL_RENDERER_SELECTED:
+        if flags & Gtk.CellRendererState.SELECTED:
             ctx.set_source_rgb(1.0, 1.0, 1.0)
             ctx.set_line_width(box_size / 5)
             ctx.stroke_preserve()
@@ -233,17 +254,17 @@
 
         (column, colour) = self.node
 
-        font_desc = pango.FontDescription()
-        font_desc.set_size(pango.SCALE * 7)
+        font_desc = Pango.FontDescription()
+        font_desc.set_size(Pango.SCALE * 7)
 
-        tag_layout = pango.Layout(pango_ctx)
+        tag_layout = Pango.Layout(pango_ctx)
         tag_layout.set_font_description(font_desc)
 
         # The width of the tag label stack
         width = 0
 
         for tag_idx, tag in enumerate(self.tags):
-            tag_layout.set_text(" " + tag + " ")
+            tag_layout.set_text(" " + tag + " ", -1)
             text_width, text_height = tag_layout.get_pixel_size()
 
             x0 = cell_area.x + \
@@ -272,12 +293,11 @@
             self.set_colour(ctx, TAG_COLOUR_ID, 0.0, 0.5)
             ctx.stroke_preserve()
 
-            ctx.set_fill_rule (cairo.FILL_RULE_EVEN_ODD)
+            ctx.set_fill_rule (CAIRO_FILL_RULE_EVEN_ODD)
             self.set_colour(ctx, TAG_COLOUR_ID, 0.5, 1.0)
             ctx.fill()
 
             # Draw the tag text
             self.set_colour(ctx, 0, 0.0, 0.0)
             ctx.move_to(x0, y0)
-            ctx.show_layout(tag_layout)
-
+            PangoCairo.show_layout(ctx, tag_layout)

=== modified file 'branchview/treemodel.py'
--- branchview/treemodel.py	2011-03-14 20:12:19 +0000
+++ branchview/treemodel.py	2011-09-08 03:12:25 +0000
@@ -1,14 +1,12 @@
 # -*- coding: UTF-8 -*-
-"""Tree model.
-
-"""
+"""BranchTreeModel."""
 
 __copyright__ = "Copyright © 2005 Canonical Ltd."
-__author__    = "Gary van der Merwe <[e-mail]>"
-
-
-import gtk
-import gobject
+__author__ = "Gary van der Merwe <[e-mail]>"
+
+
+from gi.repository import Gtk
+from gi.repository import GObject
 from xml.sax.saxutils import escape
 
 from bzrlib.config import parse_username
@@ -19,6 +17,7 @@
     localtime,
     )
 
+
 REVID = 0
 NODE = 1
 LINES = 2
@@ -34,19 +33,34 @@
 TAGS = 12
 AUTHORS = 13
 
-class TreeModel(gtk.GenericTreeModel):
-
-    def __init__ (self, branch, line_graph_data):
-        gtk.GenericTreeModel.__init__(self)
+
+class BranchTreeModel(Gtk.ListStore):
+    """A model of branch's merge history."""
+
+    def __init__(self, branch, line_graph_data):
+        super(BranchTreeModel, self).__init__(
+            GObject.TYPE_STRING,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_STRING,
+            GObject.TYPE_STRING,
+            GObject.TYPE_STRING,
+            GObject.TYPE_STRING,
+            GObject.TYPE_STRING,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
+            GObject.TYPE_STRING)
         self.revisions = {}
         self.branch = branch
         self.repository = branch.repository
-        self.line_graph_data = line_graph_data
-
         if self.branch.supports_tags():
             self.tags = self.branch.tags.get_reverse_tag_dict()
         else:
             self.tags = {}
+        self.set_line_graph_data(line_graph_data)
 
     def add_tag(self, tag, revid):
         self.branch.tags.set_tag(tag, revid)
@@ -55,93 +69,39 @@
         except KeyError:
             self.tags[revid] = [tag]
 
-    def on_get_flags(self):
-        return gtk.TREE_MODEL_LIST_ONLY
-
-    def on_get_n_columns(self):
-        return 14
-
-    def on_get_column_type(self, index):
-        if index == REVID: return gobject.TYPE_STRING
-        if index == NODE: return gobject.TYPE_PYOBJECT
-        if index == LINES: return gobject.TYPE_PYOBJECT
-        if index == LAST_LINES: return gobject.TYPE_PYOBJECT
-        if index == REVNO: return gobject.TYPE_STRING
-        if index == SUMMARY: return gobject.TYPE_STRING
-        if index == MESSAGE: return gobject.TYPE_STRING
-        if index == COMMITTER: return gobject.TYPE_STRING
-        if index == TIMESTAMP: return gobject.TYPE_STRING
-        if index == REVISION: return gobject.TYPE_PYOBJECT
-        if index == PARENTS: return gobject.TYPE_PYOBJECT
-        if index == CHILDREN: return gobject.TYPE_PYOBJECT
-        if index == TAGS: return gobject.TYPE_PYOBJECT
-        if index == AUTHORS: return gobject.TYPE_STRING
-
-    def on_get_iter(self, path):
-        return path[0]
-
-    def on_get_path(self, rowref):
-        return rowref
-
-    def on_get_value(self, rowref, column):
-        if len(self.line_graph_data) > 0:
-            (revid, node, lines, parents,
-             children, revno_sequence) = self.line_graph_data[rowref]
+    def _line_graph_item_to_model_row(self, rowref, data):
+        revid, node, lines, parents, children, revno_sequence = data
+        if rowref > 0:
+            last_lines = self.line_graph_data[rowref - 1][2]
         else:
-            (revid, node, lines, parents,
-             children, revno_sequence) = (None, (0, 0), (), (),
-                                          (), ())
-        if column == REVID: return revid
-        if column == NODE: return node
-        if column == LINES: return lines
-        if column == PARENTS: return parents
-        if column == CHILDREN: return children
-        if column == LAST_LINES:
-            if rowref>0:
-                return self.line_graph_data[rowref-1][2]
-            return []
-        if column == REVNO: return ".".join(["%d" % (revno)
-                                      for revno in revno_sequence])
-
-        if column == TAGS: return self.tags.get(revid, [])
-
+            last_lines = []
+        revno = ".".join(["%d" % (revno) for revno in revno_sequence])
+        tags = self.tags.get(revid, [])
         if not revid or revid == NULL_REVISION:
-            return None
-        if revid not in self.revisions:
+            revision = None
+        elif revid not in self.revisions:
             revision = self.repository.get_revisions([revid])[0]
             self.revisions[revid] = revision
         else:
             revision = self.revisions[revid]
-
-        if column == REVISION: return revision
-        if column == SUMMARY: return escape(revision.get_summary())
-        if column == MESSAGE: return escape(revision.message)
-        if column == COMMITTER: return parse_username(revision.committer)[0]
-        if column == TIMESTAMP:
-            return strftime("%Y-%m-%d %H:%M", localtime(revision.timestamp))
-        if column == AUTHORS:
-            return ", ".join([
-                parse_username(author)[0] for author in revision.get_apparent_authors()])
-
-    def on_iter_next(self, rowref):
-        if rowref < len(self.line_graph_data) - 1:
-            return rowref+1
-        return None
-
-    def on_iter_children(self, parent):
-        if parent is None: return 0
-        return None
-
-    def on_iter_has_child(self, rowref):
-        return False
-
-    def on_iter_n_children(self, rowref):
-        if rowref is None: return len(self.line_graph_data)
-        return 0
-
-    def on_iter_nth_child(self, parent, n):
-        if parent is None: return n
-        return None
-
-    def on_iter_parent(self, child):
-        return None
+        if revision is None:
+            summary = message = committer = timestamp = authors = None
+        else:
+            summary = escape(revision.get_summary())
+            message = escape(revision.message)
+            committer = parse_username(revision.committer)[0]
+            timestamp = strftime(
+                "%Y-%m-%d %H:%M", localtime(revision.timestamp))
+            authors = ", ".join([
+                parse_username(author)[0]
+                for author in revision.get_apparent_authors()])
+        return (revid, node, lines, last_lines, revno, summary, message,
+                committer, timestamp, revision, parents, children, tags,
+                authors)
+
+    def set_line_graph_data(self, line_graph_data):
+        self.clear()
+        self.line_graph_data = line_graph_data
+        for rowref, data in enumerate(self.line_graph_data):
+            row = self._line_graph_item_to_model_row(rowref, data)
+            self.append(row)

=== modified file 'branchview/treeview.py'
--- branchview/treeview.py	2011-04-15 01:07:44 +0000
+++ branchview/treeview.py	2011-09-08 03:12:25 +0000
@@ -6,9 +6,9 @@
 __copyright__ = "Copyright © 2005 Canonical Ltd."
 __author__    = "Daniel Schierbeck <[e-mail]>"
 
-import gtk
-import gobject
-import pango
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import Pango
 
 from bzrlib import ui
 from bzrlib.revision import NULL_REVISION
@@ -20,78 +20,78 @@
 from bzrlib.plugins.gtk.branchview.graphcell import CellRendererGraph
 
 
-class TreeView(gtk.VBox):
+class TreeView(Gtk.VBox):
 
     __gproperties__ = {
-        'branch': (gobject.TYPE_PYOBJECT,
+        'branch': (GObject.TYPE_PYOBJECT,
                    'Branch',
                    'The Bazaar branch being visualized',
-                   gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE),
+                   GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE),
 
-        'revision': (gobject.TYPE_PYOBJECT,
+        'revision': (GObject.TYPE_PYOBJECT,
                      'Revision',
                      'The currently selected revision',
-                     gobject.PARAM_READWRITE),
+                     GObject.PARAM_READWRITE),
 
-        'revision-number': (gobject.TYPE_STRING,
+        'revision-number': (GObject.TYPE_STRING,
                             'Revision number',
                             'The number of the selected revision',
                             '',
-                            gobject.PARAM_READABLE),
+                            GObject.PARAM_READABLE),
 
-        'children': (gobject.TYPE_PYOBJECT,
+        'children': (GObject.TYPE_PYOBJECT,
                      'Child revisions',
                      'Children of the currently selected revision',
-                     gobject.PARAM_READABLE),
+                     GObject.PARAM_READABLE),
 
-        'parents': (gobject.TYPE_PYOBJECT,
+        'parents': (GObject.TYPE_PYOBJECT,
                     'Parent revisions',
                     'Parents to the currently selected revision',
-                    gobject.PARAM_READABLE),
+                    GObject.PARAM_READABLE),
 
-        'revno-column-visible': (gobject.TYPE_BOOLEAN,
+        'revno-column-visible': (GObject.TYPE_BOOLEAN,
                                  'Revision number column',
                                  'Show revision number column',
                                  True,
-                                 gobject.PARAM_READWRITE),
+                                 GObject.PARAM_READWRITE),
 
-        'graph-column-visible': (gobject.TYPE_BOOLEAN,
+        'graph-column-visible': (GObject.TYPE_BOOLEAN,
                                  'Graph column',
                                  'Show graph column',
                                  True,
-                                 gobject.PARAM_READWRITE),
+                                 GObject.PARAM_READWRITE),
 
-        'date-column-visible': (gobject.TYPE_BOOLEAN,
+        'date-column-visible': (GObject.TYPE_BOOLEAN,
                                  'Date',
                                  'Show date column',
                                  False,
-                                 gobject.PARAM_READWRITE),
+                                 GObject.PARAM_READWRITE),
 
-        'compact': (gobject.TYPE_BOOLEAN,
+        'compact': (GObject.TYPE_BOOLEAN,
                     'Compact view',
                     'Break ancestry lines to save space',
                     True,
-                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
+                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
-        'mainline-only': (gobject.TYPE_BOOLEAN,
+        'mainline-only': (GObject.TYPE_BOOLEAN,
                     'Mainline only',
                     'Only show the mainline history.',
                     False,
-                    gobject.PARAM_CONSTRUCT | gobject.PARAM_READWRITE),
+                    GObject.PARAM_CONSTRUCT | GObject.PARAM_READWRITE),
 
     }
 
     __gsignals__ = {
-        'revision-selected': (gobject.SIGNAL_RUN_FIRST,
-                              gobject.TYPE_NONE,
+        'revision-selected': (GObject.SignalFlags.RUN_FIRST,
+                              None,
                               ()),
-        'revision-activated': (gobject.SIGNAL_RUN_FIRST,
-                              gobject.TYPE_NONE,
-                              (gobject.TYPE_PYOBJECT, gobject.TYPE_PYOBJECT)),
-        'tag-added': (gobject.SIGNAL_RUN_FIRST,
-                              gobject.TYPE_NONE,
-                              (gobject.TYPE_STRING, gobject.TYPE_STRING)),
-        'refreshed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+        'revision-activated': (GObject.SignalFlags.RUN_FIRST,
+                              None,
+                              (GObject.TYPE_PYOBJECT, GObject.TYPE_PYOBJECT)),
+        'tag-added': (GObject.SignalFlags.RUN_FIRST,
+                              None,
+                              (GObject.TYPE_STRING, GObject.TYPE_STRING)),
+        'refreshed': (GObject.SignalFlags.RUN_FIRST, None,
                               ())
     }
 
@@ -105,20 +105,20 @@
         :param broken_line_length: After how much lines to break 
                                    branches.
         """
-        gtk.VBox.__init__(self, spacing=0)
+        super(TreeView, self).__init__(homogeneous=False, spacing=0)
 
         self.progress_widget = ProgressPanel()
-        self.pack_start(self.progress_widget, expand=False, fill=True)
+        self.pack_start(self.progress_widget, False, True, 0)
         if getattr(ui.ui_factory, "set_progress_bar_widget", None) is not None:
             # We'are using our own ui, let's tell it to use our widget.
             ui.ui_factory.set_progress_bar_widget(self.progress_widget)
 
-        self.scrolled_window = gtk.ScrolledWindow()
-        self.scrolled_window.set_policy(gtk.POLICY_AUTOMATIC,
-                                        gtk.POLICY_AUTOMATIC)
-        self.scrolled_window.set_shadow_type(gtk.SHADOW_IN)
+        self.scrolled_window = Gtk.ScrolledWindow()
+        self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                        Gtk.PolicyType.AUTOMATIC)
+        self.scrolled_window.set_shadow_type(Gtk.ShadowType.IN)
         self.scrolled_window.show()
-        self.pack_start(self.scrolled_window, expand=True, fill=True)
+        self.pack_start(self.scrolled_window, True, True, 0)
 
         self.scrolled_window.add(self.construct_treeview())
 
@@ -131,8 +131,8 @@
         self.maxnum = maxnum
         self.compact = compact
 
-        self.model = treemodel.TreeModel(self.branch, [])
-        gobject.idle_add(self.populate)
+        self.model = treemodel.BranchTreeModel(self.branch, [])
+        GObject.idle_add(self.populate)
 
         self.connect("destroy", self._on_destroy)
 
@@ -211,7 +211,8 @@
 
         :param revid: Revision id of revision to display.
         """
-        self.treeview.set_cursor(self.index[revid])
+        self.treeview.set_cursor(
+            Gtk.TreePath(path=self.index[revid]), None, False)
         self.treeview.grab_focus()
 
     def get_children(self):
@@ -243,7 +244,7 @@
             self.emit('tag-added', tag, revid)
 
     def refresh(self):
-        gobject.idle_add(self.populate, self.get_revision())
+        GObject.idle_add(self.populate, self.get_revision())
 
     def update(self):
         try:
@@ -259,7 +260,7 @@
     def back(self):
         """Signal handler for the Back button."""
         parents = self.get_parents()
-        if not len(parents):
+        if not parents:
             return
 
         for parent_id in parents:
@@ -274,7 +275,7 @@
     def forward(self):
         """Signal handler for the Forward button."""
         children = self.get_children()
-        if not len(children):
+        if not children:
             return
 
         for child_id in children:
@@ -311,26 +312,30 @@
             show_graph = self.graph_column.get_visible()
 
             self.branch.lock_read()
-            (linegraphdata, index, columns_len) = linegraph(self.branch.repository.get_graph(),
-                                                            self.start,
-                                                            self.maxnum, 
-                                                            broken_line_length,
-                                                            show_graph,
-                                                            self.mainline_only,
-                                                            self.progress_bar)
+            (linegraphdata, index, columns_len) = linegraph(
+                self.branch.repository.get_graph(),
+                self.start,
+                self.maxnum, 
+                broken_line_length,
+                show_graph,
+                self.mainline_only,
+                self.progress_bar)
 
-            self.model.line_graph_data = linegraphdata
+            self.model.set_line_graph_data(linegraphdata)
             self.graph_cell.columns_len = columns_len
-            width = self.graph_cell.get_size(self.treeview)[2]
+            width = self.graph_cell.get_preferred_width(self.treeview)[1]
             if width > 500:
                 width = 500
+            elif width == 0:
+                # The get_preferred_width() call got an insane value.
+                width = 200
             self.graph_column.set_fixed_width(width)
             self.graph_column.set_max_width(width)
             self.index = index
             self.treeview.set_model(self.model)
 
             if not revision or revision == NULL_REVISION:
-                self.treeview.set_cursor(0)
+                self.treeview.set_cursor(Gtk.TreePath(path=0), None, False)
             else:
                 self.set_revision(revision)
 
@@ -340,7 +345,7 @@
             self.progress_bar.finished()
 
     def construct_treeview(self):
-        self.treeview = gtk.TreeView()
+        self.treeview = Gtk.TreeView()
 
         self.treeview.set_rules_hint(True)
         # combined revno/summary interactive search
@@ -353,13 +358,11 @@
             return (model.get_value(iter, treemodel.REVNO).find(key) != 0
                 and model.get_value(iter, treemodel.MESSAGE).lower().find(key.lower()) == -1)
 
-        self.treeview.set_search_equal_func(search_equal_func)
+        self.treeview.set_search_equal_func(search_equal_func, None)
         self.treeview.set_enable_search(True)
 
-        # Fix old PyGTK bug - by JAM
-        set_tooltip = getattr(self.treeview, 'set_tooltip_column', None)
-        if set_tooltip is not None:
-            set_tooltip(treemodel.MESSAGE)
+        self.treeview.set_tooltip_column(treemodel.MESSAGE)
+        self.treeview.set_headers_visible(True)
 
         self._prev_cursor_path = None
         self.treeview.connect("cursor-changed",
@@ -375,60 +378,66 @@
 
         self.treeview.show()
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("width-chars", 15)
-        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
-        self.revno_column = gtk.TreeViewColumn("Revision No")
+        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+        self.revno_column = Gtk.TreeViewColumn("Revision No")
         self.revno_column.set_resizable(True)
-        self.revno_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-        self.revno_column.set_fixed_width(cell.get_size(self.treeview)[2])
-        self.revno_column.pack_start(cell, expand=True)
+        self.revno_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
+        self.revno_column.set_fixed_width(
+            cell.get_preferred_width(self.treeview)[1])
+        self.revno_column.pack_start(cell, True)
         self.revno_column.add_attribute(cell, "text", treemodel.REVNO)
         self.treeview.append_column(self.revno_column)
 
         self.graph_cell = CellRendererGraph()
-        self.graph_column = gtk.TreeViewColumn()
+        self.graph_column = Gtk.TreeViewColumn()
         self.graph_column.set_resizable(True)
-        self.graph_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-        self.graph_column.pack_start(self.graph_cell, expand=True)
-        self.graph_column.add_attribute(self.graph_cell, "node", treemodel.NODE)
-        self.graph_column.add_attribute(self.graph_cell, "tags", treemodel.TAGS)
-        self.graph_column.add_attribute(self.graph_cell, "in-lines", treemodel.LAST_LINES)
-        self.graph_column.add_attribute(self.graph_cell, "out-lines", treemodel.LINES)
+        self.graph_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
+        self.graph_column.pack_start(self.graph_cell, True)
+        self.graph_column.add_attribute(
+            self.graph_cell, "node", treemodel.NODE)
+        self.graph_column.add_attribute(
+            self.graph_cell, "tags", treemodel.TAGS)
+        self.graph_column.add_attribute(
+            self.graph_cell, "in-lines", treemodel.LAST_LINES)
+        self.graph_column.add_attribute(
+            self.graph_cell, "out-lines", treemodel.LINES)
         self.treeview.append_column(self.graph_column)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("width-chars", 65)
-        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
-        self.summary_column = gtk.TreeViewColumn("Summary")
+        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+        self.summary_column = Gtk.TreeViewColumn("Summary")
         self.summary_column.set_resizable(True)
         self.summary_column.set_expand(True)
-        self.summary_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
-        self.summary_column.set_fixed_width(cell.get_size(self.treeview)[2])
-        self.summary_column.pack_start(cell, expand=True)
+        self.summary_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
+        self.summary_column.set_fixed_width(
+            cell.get_preferred_width(self.treeview)[1])
+        self.summary_column.pack_start(cell, True)
         self.summary_column.add_attribute(cell, "markup", treemodel.SUMMARY)
         self.treeview.append_column(self.summary_column)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("width-chars", 15)
-        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
-        self.authors_column = gtk.TreeViewColumn("Author(s)")
+        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+        self.authors_column = Gtk.TreeViewColumn("Author(s)")
         self.authors_column.set_resizable(False)
-        self.authors_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+        self.authors_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
         self.authors_column.set_fixed_width(200)
-        self.authors_column.pack_start(cell, expand=True)
+        self.authors_column.pack_start(cell, True)
         self.authors_column.add_attribute(cell, "text", treemodel.AUTHORS)
         self.treeview.append_column(self.authors_column)
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("width-chars", 20)
-        cell.set_property("ellipsize", pango.ELLIPSIZE_END)
-        self.date_column = gtk.TreeViewColumn("Date")
+        cell.set_property("ellipsize", Pango.EllipsizeMode.END)
+        self.date_column = Gtk.TreeViewColumn("Date")
         self.date_column.set_visible(False)
         self.date_column.set_resizable(True)
-        self.date_column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+        self.date_column.set_sizing(Gtk.TreeViewColumnSizing.FIXED)
         self.date_column.set_fixed_width(130)
-        self.date_column.pack_start(cell, expand=True)
+        self.date_column.pack_start(cell, True)
         self.date_column.add_attribute(cell, "text", treemodel.TIMESTAMP)
         self.treeview.append_column(self.date_column)
 

=== modified file 'bzr-handle-patch'
--- bzr-handle-patch	2011-04-04 17:52:28 +0000
+++ bzr-handle-patch	2011-09-08 03:12:25 +0000
@@ -31,7 +31,7 @@
 		controller = MergeDirectiveController(path, directive)
 	window = controller.window
 	window.show()
-	gtk = open_display()
+	Gtk = open_display()
 	window.connect("destroy", gtk.main_quit)
 except Exception, e:
 	from bzrlib.plugins.gtk.dialog import error_dialog

=== modified file 'bzr-notify'
--- bzr-notify	2011-04-02 12:42:35 +0000
+++ bzr-notify	2011-09-08 03:12:25 +0000
@@ -12,7 +12,7 @@
 from bzrlib.plugins.gtk.commands import open_display
 
 from bzrlib.plugins.gtk.notify import NotifyPopupMenu
-gtk = open_display()
+Gtk = open_display()
 
 import cgi
 import dbus

=== modified file 'checkout.py'
--- checkout.py	2011-04-10 18:44:39 +0000
+++ checkout.py	2011-09-08 03:12:25 +0000
@@ -16,13 +16,8 @@
 
 import os
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 from bzrlib.branch import Branch
 from bzrlib.config import GlobalConfig
@@ -33,42 +28,41 @@
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class CheckoutDialog(gtk.Dialog):
+class CheckoutDialog(Gtk.Dialog):
     """ New implementation of the Checkout dialog. """
 
     def __init__(self, path=None, parent=None, remote_path=None):
         """ Initialize the Checkout dialog. """
-        gtk.Dialog.__init__(self, title="Checkout - Olive",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(CheckoutDialog, self).__init__(
+            title="Checkout - Olive", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
         # Get arguments
         self.path = path
 
         # Create the widgets
-        self._button_checkout = gtk.Button(_i18n("Check_out"), use_underline=True)
-        self._button_revision = gtk.Button('')
-        self._image_browse = gtk.Image()
-        self._filechooser = gtk.FileChooserButton(_i18n("Please select a folder"))
-        self._combo = gtk.ComboBoxEntry()
-        self._label_location = gtk.Label(_i18n("Branch location:"))
-        self._label_destination = gtk.Label(_i18n("Destination:"))
-        self._label_nick = gtk.Label(_i18n("Branch nick:"))
-        self._label_revision = gtk.Label(_i18n("Revision:"))
-        self._hbox_revision = gtk.HBox()
-        self._entry_revision = gtk.Entry()
-        self._entry_nick = gtk.Entry()
-        self._check_lightweight = gtk.CheckButton(_i18n("_Lightweight checkout"),
+        self._button_checkout = Gtk.Button(_i18n("Check_out"), use_underline=True)
+        self._button_revision = Gtk.Button('')
+        self._image_browse = Gtk.Image()
+        self._filechooser = Gtk.FileChooserButton(_i18n("Please select a folder"))
+        self._combo = Gtk.ComboBox.new_with_entry()
+        self._label_location = Gtk.Label(label=_i18n("Branch location:"))
+        self._label_destination = Gtk.Label(label=_i18n("Destination:"))
+        self._label_nick = Gtk.Label(label=_i18n("Branch nick:"))
+        self._label_revision = Gtk.Label(label=_i18n("Revision:"))
+        self._hbox_revision = Gtk.HBox()
+        self._entry_revision = Gtk.Entry()
+        self._entry_nick = Gtk.Entry()
+        self._check_lightweight = Gtk.CheckButton(_i18n("_Lightweight checkout"),
                                                   use_underline=True)
 
         # Set callbacks
         self._button_checkout.connect('clicked', self._on_checkout_clicked)
         self._button_revision.connect('clicked', self._on_revision_clicked)
-        self._combo.child.connect('focus-out-event', self._on_combo_changed)
+        self._combo.get_child().connect('focus-out-event', self._on_combo_changed)
 
         # Create the table and pack the widgets into it
-        self._table = gtk.Table(rows=3, columns=2)
+        self._table = Gtk.Table(rows=3, columns=2)
         self._table.attach(self._label_location, 0, 1, 0, 1)
         self._table.attach(self._label_destination, 0, 1, 1, 2)
         self._table.attach(self._label_nick, 0, 1, 2, 3)
@@ -80,30 +74,30 @@
         self._table.attach(self._check_lightweight, 1, 2, 4, 5)
 
         # Set properties
-        self._image_browse.set_from_stock(gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON)
+        self._image_browse.set_from_stock(Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON)
         self._button_revision.set_image(self._image_browse)
         self._button_revision.set_sensitive(False)
-        self._filechooser.set_action(gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER)
+        self._filechooser.set_action(Gtk.FileChooserAction.SELECT_FOLDER)
         self._label_location.set_alignment(0, 0.5)
         self._label_destination.set_alignment(0, 0.5)
         self._label_nick.set_alignment(0, 0.5)
         self._label_revision.set_alignment(0, 0.5)
         self._table.set_row_spacings(3)
         self._table.set_col_spacings(3)
-        self.vbox.set_spacing(3)
+        self.get_content_area().set_spacing(3)
         if self.path is not None:
             self._filechooser.set_filename(self.path)
         if remote_path is not None:
-            self._combo.child.set_text(remote_path)
+            self._combo.get_child().set_text(remote_path)
 
         # Pack some widgets
-        self._hbox_revision.pack_start(self._entry_revision, True, True)
-        self._hbox_revision.pack_start(self._button_revision, False, False)
-        self.vbox.add(self._table)
-        self.action_area.pack_end(self._button_checkout)
+        self._hbox_revision.pack_start(self._entry_revision, True, True, 0)
+        self._hbox_revision.pack_start(self._button_revision, False, False, 0)
+        self.get_content_area().add(self._table)
+        self.action_area.pack_end(self._button_checkout, False, False, 0)
 
         # Show the dialog
-        self.vbox.show_all()
+        self.get_content_area().show_all()
 
         # Build checkout history
         self._history = UrlHistory(GlobalConfig(), 'branch_history')
@@ -111,13 +105,13 @@
 
     def _build_history(self):
         """ Build up the checkout history. """
-        self._combo_model = gtk.ListStore(str)
+        self._combo_model = Gtk.ListStore(str)
 
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
 
         self._combo.set_model(self._combo_model)
-        self._combo.set_text_column(0)
+        self._combo.set_entry_text_column(0)
 
     def _get_last_revno(self):
         """ Get the revno of the last revision (if any). """
@@ -142,10 +136,10 @@
         else:
             revb = RevisionBrowser(br, self)
             response = revb.run()
-            if response != gtk.RESPONSE_NONE:
+            if response != Gtk.ResponseType.NONE:
                 revb.hide()
 
-                if response == gtk.RESPONSE_OK:
+                if response == Gtk.ResponseType.OK:
                     if revb.selected_revno is not None:
                         self._entry_revision.set_text(revb.selected_revno)
 
@@ -182,7 +176,7 @@
 
         self._history.add_entry(location)
 
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)
 
     def _on_combo_changed(self, widget, event):
         """ We try to get the last revision if focus lost. """

=== modified file 'commands.py'
--- commands.py	2011-04-10 18:44:39 +0000
+++ commands.py	2011-09-08 03:12:25 +0000
@@ -32,7 +32,6 @@
 from bzrlib.option import Option
 
 from bzrlib.plugins.gtk import (
-    import_pygtk,
     set_ui_factory,
     )
 from bzrlib.plugins.gtk.i18n import _i18n
@@ -46,14 +45,13 @@
 
 
 def open_display():
-    pygtk = import_pygtk()
     try:
-        import gtk
+        from gi.repository import Gtk
     except RuntimeError, e:
         if str(e) == "could not open display":
             raise NoDisplayError
     set_ui_factory()
-    return gtk
+    return Gtk
 
 
 
@@ -150,9 +148,9 @@
                 tree2 = tree1.basis_tree()
 
             from diff import DiffWindow
-            import gtk
+            from gi.repository import Gtk
             window = DiffWindow()
-            window.connect("destroy", gtk.main_quit)
+            window.connect("destroy", Gtk.main_quit)
             window.set_diff("Working Tree", tree1, tree2)
             if filename is not None:
                 tree_filename = wt.relpath(filename)
@@ -166,7 +164,7 @@
                                           filename)
             window.show()
 
-            gtk.main()
+            Gtk.main()
         finally:
             wt.unlock()
 
@@ -209,11 +207,11 @@
                 revids.append(br.last_revision())
             else:
                 revids.append(revision[0].as_revision_id(br))
-        import gtk
+        from gi.repository import Gtk
         pp = start_viz_window(br, revids, limit)
-        pp.connect("destroy", lambda w: gtk.main_quit())
+        pp.connect("destroy", lambda w: Gtk.main_quit())
         pp.show()
-        gtk.main()
+        Gtk.main()
 
 
 class cmd_gannotate(GTKCommand):
@@ -236,7 +234,7 @@
     aliases = ["gblame", "gpraise"]
     
     def run(self, filename, all=False, plain=False, line='1', revision=None):
-        gtk = open_display()
+        Gtk = open_display()
 
         try:
             line = int(line)
@@ -267,7 +265,7 @@
             revision_id = getattr(tree, 'get_revision_id', lambda: None)()
 
         window = GAnnotateWindow(all, plain, branch=br)
-        window.connect("destroy", lambda w: gtk.main_quit())
+        window.connect("destroy", lambda w: Gtk.main_quit())
         config = GAnnotateConfig(window)
         window.show()
         br.lock_read()
@@ -276,7 +274,7 @@
         try:
             window.annotate(tree, br, file_id)
             window.jump_to_line(line)
-            gtk.main()
+            Gtk.main()
         finally:
             br.unlock()
             if wt is not None:
@@ -331,7 +329,7 @@
     takes_options = ['revision']
 
     def run(self, path='.', revision=None):
-        gtk = open_display()
+        Gtk = open_display()
         from bzrlib.plugins.gtk.status import StatusWindow
         (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
 
@@ -346,9 +344,9 @@
             revision_id = None
 
         status = StatusWindow(wt, wt_path, revision_id)
-        status.connect("destroy", gtk.main_quit)
+        status.connect("destroy", Gtk.main_quit)
         status.show()
-        gtk.main()
+        Gtk.main()
 
 
 class cmd_gsend(GTKCommand):
@@ -357,11 +355,11 @@
     """
     def run(self):
         (br, path) = branch.Branch.open_containing(".")
-        gtk = open_display()
+        Gtk = open_display()
         from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
         from StringIO import StringIO
         dialog = SendMergeDirectiveDialog(br)
-        if dialog.run() == gtk.RESPONSE_OK:
+        if dialog.run() == Gtk.ResponseType.OK:
             outf = StringIO()
             outf.writelines(dialog.get_merge_directive().to_lines())
             mail_client = br.get_config().get_mail_client()
@@ -424,9 +422,8 @@
     """
     takes_args = ["other_branch?"]
     def run(self, other_branch=None):
-        pygtk = import_pygtk()
         try:
-            import gtk
+            from gi.repository import Gtk
         except RuntimeError, e:
             if str(e) == "could not open display":
                 raise NoDisplayError
@@ -476,8 +473,8 @@
     def run(self):
         br = branch.Branch.open_containing('.')[0]
         
-        gtk = open_display()
+        Gtk = open_display()
         from tags import TagsWindow
         window = TagsWindow(br)
         window.show()
-        gtk.main()
+        Gtk.main()

=== modified file 'commit.py'
--- commit.py	2011-04-10 18:44:39 +0000
+++ commit.py	2011-09-08 03:12:25 +0000
@@ -16,15 +16,10 @@
 
 import re
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-import gobject
-import pango
+from gi.repository import Gdk
+from gi.repository import Gtk
+from gi.repository import GObject
+from gi.repository import Pango
 
 from bzrlib import (
     errors,
@@ -109,16 +104,16 @@
     return fixed_newline.decode('utf-8')
 
 
-class CommitDialog(gtk.Dialog):
+class CommitDialog(Gtk.Dialog):
     """Implementation of Commit."""
 
     def __init__(self, wt, selected=None, parent=None):
-        gtk.Dialog.__init__(self, title="Commit to %s" % wt.basedir,
-                            parent=parent, flags=0,)
+        super(CommitDialog, self).__init__(
+            title="Commit to %s" % wt.basedir, parent=parent, flags=0)
         self.connect('delete-event', self._on_delete_window)
         self._question_dialog = question_dialog
 
-        self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
+        self.set_type_hint(Gdk.WindowTypeHint.NORMAL)
 
         self._wt = wt
         # TODO: Do something with this value, it is used by Olive
@@ -127,7 +122,8 @@
         self._enable_per_file_commits = True
         self._commit_all_changes = True
         self.committed_revision_id = None # Nothing has been committed yet
-        self._saved_commit_messages_manager = SavedCommitMessagesManager(self._wt, self._wt.branch)
+        self._saved_commit_messages_manager = SavedCommitMessagesManager(
+            self._wt, self._wt.branch)
 
         self.setup_params()
         self.construct()
@@ -232,7 +228,7 @@
         # This sets the cursor, which causes the expander to close, which
         # causes the _file_message_text_view to never get realized. So we have
         # to give it a little kick, or it warns when we try to grab the focus
-        self._treeview_files.set_cursor(initial_cursor)
+        self._treeview_files.set_cursor(initial_cursor, None, False)
 
         def _realize_file_message_tree_view(*args):
             self._file_message_text_view.realize()
@@ -286,13 +282,13 @@
         """Build up the dialog widgets."""
         # The primary pane which splits it into left and right (adjustable)
         # sections.
-        self._hpane = gtk.HPaned()
+        self._hpane = Gtk.HPaned()
 
         self._construct_left_pane()
         self._construct_right_pane()
         self._construct_action_pane()
 
-        self.vbox.pack_start(self._hpane)
+        self.get_content_area().pack_start(self._hpane, True, True, 0)
         self._hpane.show()
         self.set_focus(self._global_message_text_view)
 
@@ -317,22 +313,22 @@
         self._hpane.set_position(300)
 
     def _construct_accelerators(self):
-        group = gtk.AccelGroup()
-        group.connect_group(gtk.gdk.keyval_from_name('N'),
-                            gtk.gdk.CONTROL_MASK, 0, self._on_accel_next)
+        group = Gtk.AccelGroup()
+        group.connect(Gdk.keyval_from_name('N'),
+                      Gdk.ModifierType.CONTROL_MASK, 0, self._on_accel_next)
         self.add_accel_group(group)
 
         # ignore the escape key (avoid closing the window)
         self.connect_object('close', self.emit_stop_by_name, 'close')
 
     def _construct_left_pane(self):
-        self._left_pane_box = gtk.VBox(homogeneous=False, spacing=5)
+        self._left_pane_box = Gtk.VBox(homogeneous=False, spacing=5)
         self._construct_file_list()
         self._construct_pending_list()
 
-        self._check_local = gtk.CheckButton(_i18n("_Only commit locally"),
+        self._check_local = Gtk.CheckButton(_i18n("_Only commit locally"),
                                             use_underline=True)
-        self._left_pane_box.pack_end(self._check_local, False, False)
+        self._left_pane_box.pack_end(self._check_local, False, False, 0)
         self._check_local.set_active(False)
 
         self._hpane.pack1(self._left_pane_box, resize=False, shrink=False)
@@ -345,7 +341,7 @@
         # commit, and 1 for file commit, and it looked good. But I don't seem
         # to have a way to do that with the gtk boxes... :( (Which is extra
         # weird since wx uses gtk on Linux...)
-        self._right_pane_table = gtk.Table(rows=10, columns=1, homogeneous=False)
+        self._right_pane_table = Gtk.Table(rows=10, columns=1, homogeneous=False)
         self._right_pane_table.set_row_spacings(5)
         self._right_pane_table.set_col_spacings(5)
         self._right_pane_table_row = 0
@@ -357,15 +353,17 @@
         self._hpane.pack2(self._right_pane_table, resize=True, shrink=True)
 
     def _construct_action_pane(self):
-        self._button_cancel = gtk.Button(stock=gtk.STOCK_CANCEL)
+        self._button_cancel = Gtk.Button(stock=Gtk.STOCK_CANCEL)
         self._button_cancel.connect('clicked', self._on_cancel_clicked)
         self._button_cancel.show()
-        self.action_area.pack_end(self._button_cancel)
-        self._button_commit = gtk.Button(_i18n("Comm_it"), use_underline=True)
+        self.get_action_area().pack_end(
+            self._button_cancel, True, True, 0)
+        self._button_commit = Gtk.Button(_i18n("Comm_it"), use_underline=True)
         self._button_commit.connect('clicked', self._on_commit_clicked)
-        self._button_commit.set_flags(gtk.CAN_DEFAULT)
+        self._button_commit.set_can_default(True)
         self._button_commit.show()
-        self.action_area.pack_end(self._button_commit)
+        self.get_action_area().pack_end(
+            self._button_commit, True, True, 0)
         self._button_commit.grab_default()
 
     def _add_to_right_table(self, widget, weight, expanding=False):
@@ -377,7 +375,7 @@
         """
         end_row = self._right_pane_table_row + weight
         options = 0
-        expand_opts = gtk.EXPAND | gtk.FILL | gtk.SHRINK
+        expand_opts = Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL | Gtk.AttachOptions.SHRINK
         if expanding:
             options = expand_opts
         self._right_pane_table.attach(widget, 0, 1,
@@ -386,20 +384,20 @@
         self._right_pane_table_row = end_row
 
     def _construct_file_list(self):
-        self._files_box = gtk.VBox(homogeneous=False, spacing=0)
-        file_label = gtk.Label(_i18n('Files'))
+        self._files_box = Gtk.VBox(homogeneous=False, spacing=0)
+        file_label = Gtk.Label(label=_i18n('Files'))
         # file_label.show()
-        self._files_box.pack_start(file_label, expand=False)
+        self._files_box.pack_start(file_label, False, True, 0)
 
-        self._commit_all_files_radio = gtk.RadioButton(
+        self._commit_all_files_radio = Gtk.RadioButton.new_with_label(
             None, _i18n("Commit all changes"))
-        self._files_box.pack_start(self._commit_all_files_radio, expand=False)
+        self._files_box.pack_start(self._commit_all_files_radio, False, True, 0)
         self._commit_all_files_radio.show()
         self._commit_all_files_radio.connect('toggled',
             self._toggle_commit_selection)
-        self._commit_selected_radio = gtk.RadioButton(
+        self._commit_selected_radio = Gtk.RadioButton.new_with_label_from_widget(
             self._commit_all_files_radio, _i18n("Only commit selected changes"))
-        self._files_box.pack_start(self._commit_selected_radio, expand=False)
+        self._files_box.pack_start(self._commit_selected_radio, False, True, 0)
         self._commit_selected_radio.show()
         self._commit_selected_radio.connect('toggled',
             self._toggle_commit_selection)
@@ -408,45 +406,44 @@
             self._commit_all_files_radio.set_sensitive(False)
             self._commit_selected_radio.set_sensitive(False)
 
-        scroller = gtk.ScrolledWindow()
-        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self._treeview_files = gtk.TreeView()
+        scroller = Gtk.ScrolledWindow()
+        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        self._treeview_files = Gtk.TreeView()
         self._treeview_files.show()
         scroller.add(self._treeview_files)
-        scroller.set_shadow_type(gtk.SHADOW_IN)
+        scroller.set_shadow_type(Gtk.ShadowType.IN)
         scroller.show()
-        self._files_box.pack_start(scroller,
-                                   expand=True, fill=True)
+        self._files_box.pack_start(scroller, True, True, 0)
         self._files_box.show()
-        self._left_pane_box.pack_start(self._files_box)
+        self._left_pane_box.pack_start(self._files_box, True, True, 0)
 
         # Keep note that all strings stored in a ListStore must be UTF-8
         # strings. GTK does not support directly setting and restoring Unicode
         # objects.
-        liststore = gtk.ListStore(
-            gobject.TYPE_STRING,  # [0] file_id
-            gobject.TYPE_STRING,  # [1] real path
-            gobject.TYPE_BOOLEAN, # [2] checkbox
-            gobject.TYPE_STRING,  # [3] display path
-            gobject.TYPE_STRING,  # [4] changes type
-            gobject.TYPE_STRING,  # [5] commit message
+        liststore = Gtk.ListStore(
+            GObject.TYPE_STRING,  # [0] file_id
+            GObject.TYPE_STRING,  # [1] real path
+            GObject.TYPE_BOOLEAN, # [2] checkbox
+            GObject.TYPE_STRING,  # [3] display path
+            GObject.TYPE_STRING,  # [4] changes type
+            GObject.TYPE_STRING,  # [5] commit message
             )
         self._files_store = liststore
         self._treeview_files.set_model(liststore)
-        crt = gtk.CellRendererToggle()
+        crt = Gtk.CellRendererToggle()
         crt.set_property('activatable', not bool(self._pending))
         crt.connect("toggled", self._toggle_commit, self._files_store)
         if self._pending:
             name = _i18n('Commit*')
         else:
             name = _i18n('Commit')
-        commit_col = gtk.TreeViewColumn(name, crt, active=2)
+        commit_col = Gtk.TreeViewColumn(name, crt, active=2)
         commit_col.set_visible(False)
         self._treeview_files.append_column(commit_col)
-        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Path'),
-                                           gtk.CellRendererText(), text=3))
-        self._treeview_files.append_column(gtk.TreeViewColumn(_i18n('Type'),
-                                           gtk.CellRendererText(), text=4))
+        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Path'),
+                                           Gtk.CellRendererText(), text=3))
+        self._treeview_files.append_column(Gtk.TreeViewColumn(_i18n('Type'),
+                                           Gtk.CellRendererText(), text=4))
         self._treeview_files.connect('cursor-changed',
                                      self._on_treeview_files_cursor_changed)
 
@@ -467,49 +464,48 @@
                 checked_col.set_visible(False)
             else:
                 checked_col.set_visible(True)
-            renderer = checked_col.get_cell_renderers()[0]
+            renderer = checked_col.get_cells()[0]
             renderer.set_property('activatable', not all_files)
 
     def _construct_pending_list(self):
         # Pending information defaults to hidden, we put it all in 1 box, so
         # that we can show/hide all of them at once
-        self._pending_box = gtk.VBox()
+        self._pending_box = Gtk.VBox()
         self._pending_box.hide()
 
-        pending_message = gtk.Label()
+        pending_message = Gtk.Label()
         pending_message.set_markup(
             _i18n('<i>* Cannot select specific files when merging</i>'))
-        self._pending_box.pack_start(pending_message, expand=False, padding=5)
+        self._pending_box.pack_start(pending_message, False, True, 5)
         pending_message.show()
 
-        pending_label = gtk.Label(_i18n('Pending Revisions'))
-        self._pending_box.pack_start(pending_label, expand=False, padding=0)
+        pending_label = Gtk.Label(label=_i18n('Pending Revisions'))
+        self._pending_box.pack_start(pending_label, False, True, 0)
         pending_label.show()
 
-        scroller = gtk.ScrolledWindow()
-        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self._treeview_pending = gtk.TreeView()
+        scroller = Gtk.ScrolledWindow()
+        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        self._treeview_pending = Gtk.TreeView()
         scroller.add(self._treeview_pending)
-        scroller.set_shadow_type(gtk.SHADOW_IN)
+        scroller.set_shadow_type(Gtk.ShadowType.IN)
         scroller.show()
-        self._pending_box.pack_start(scroller,
-                                     expand=True, fill=True, padding=5)
+        self._pending_box.pack_start(scroller, True, True, 5)
         self._treeview_pending.show()
-        self._left_pane_box.pack_start(self._pending_box)
+        self._left_pane_box.pack_start(self._pending_box, True, True, 0)
 
-        liststore = gtk.ListStore(gobject.TYPE_STRING, # revision_id
-                                  gobject.TYPE_STRING, # date
-                                  gobject.TYPE_STRING, # committer
-                                  gobject.TYPE_STRING, # summary
+        liststore = Gtk.ListStore(GObject.TYPE_STRING, # revision_id
+                                  GObject.TYPE_STRING, # date
+                                  GObject.TYPE_STRING, # committer
+                                  GObject.TYPE_STRING, # summary
                                  )
         self._pending_store = liststore
         self._treeview_pending.set_model(liststore)
-        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Date'),
-                                             gtk.CellRendererText(), text=1))
-        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Committer'),
-                                             gtk.CellRendererText(), text=2))
-        self._treeview_pending.append_column(gtk.TreeViewColumn(_i18n('Summary'),
-                                             gtk.CellRendererText(), text=3))
+        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Date'),
+                                             Gtk.CellRendererText(), text=1))
+        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Committer'),
+                                             Gtk.CellRendererText(), text=2))
+        self._treeview_pending.append_column(Gtk.TreeViewColumn(_i18n('Summary'),
+                                             Gtk.CellRendererText(), text=3))
 
     def _construct_diff_view(self):
         from bzrlib.plugins.gtk.diff import DiffView
@@ -518,7 +514,7 @@
         #       decide that we really don't ever want to display it, we should
         #       actually remove it, and other references to it, along with the
         #       tests that it is set properly.
-        self._diff_label = gtk.Label(_i18n('Diff for whole tree'))
+        self._diff_label = Gtk.Label(label=_i18n('Diff for whole tree'))
         self._diff_label.set_alignment(0, 0)
         self._right_pane_table.set_row_spacing(self._right_pane_table_row, 0)
         self._add_to_right_table(self._diff_label, 1, False)
@@ -529,27 +525,28 @@
         self._diff_view.show()
 
     def _construct_file_message(self):
-        scroller = gtk.ScrolledWindow()
-        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scroller = Gtk.ScrolledWindow()
+        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
-        self._file_message_text_view = gtk.TextView()
+        self._file_message_text_view = Gtk.TextView()
         scroller.add(self._file_message_text_view)
-        scroller.set_shadow_type(gtk.SHADOW_IN)
+        scroller.set_shadow_type(Gtk.ShadowType.IN)
         scroller.show()
 
-        self._file_message_text_view.modify_font(pango.FontDescription("Monospace"))
-        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
+        self._file_message_text_view.modify_font(Pango.FontDescription("Monospace"))
+        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
         self._file_message_text_view.set_accepts_tab(False)
         self._file_message_text_view.show()
 
-        self._file_message_expander = gtk.Expander(_i18n('File commit message'))
+        self._file_message_expander = Gtk.Expander(
+            label=_i18n('File commit message'))
         self._file_message_expander.set_expanded(True)
         self._file_message_expander.add(scroller)
         self._add_to_right_table(self._file_message_expander, 1, False)
         self._file_message_expander.show()
 
     def _construct_global_message(self):
-        self._global_message_label = gtk.Label(_i18n('Global Commit Message'))
+        self._global_message_label = Gtk.Label(label=_i18n('Global Commit Message'))
         self._global_message_label.set_markup(
             _i18n('<b>Global Commit Message</b>'))
         self._global_message_label.set_alignment(0, 0)
@@ -558,17 +555,17 @@
         # Can we remove the spacing between the label and the box?
         self._global_message_label.show()
 
-        scroller = gtk.ScrolledWindow()
-        scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scroller = Gtk.ScrolledWindow()
+        scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
 
-        self._global_message_text_view = gtk.TextView()
+        self._global_message_text_view = Gtk.TextView()
         self._set_global_commit_message(self._saved_commit_messages_manager.get()[0])
-        self._global_message_text_view.modify_font(pango.FontDescription("Monospace"))
+        self._global_message_text_view.modify_font(Pango.FontDescription("Monospace"))
         scroller.add(self._global_message_text_view)
-        scroller.set_shadow_type(gtk.SHADOW_IN)
+        scroller.set_shadow_type(Gtk.ShadowType.IN)
         scroller.show()
         self._add_to_right_table(scroller, 2, True)
-        self._file_message_text_view.set_wrap_mode(gtk.WRAP_WORD)
+        self._file_message_text_view.set_wrap_mode(Gtk.WrapMode.WORD)
         self._file_message_text_view.set_accepts_tab(False)
         self._global_message_text_view.show()
 
@@ -599,12 +596,13 @@
             # We have either made it to the end of the list, or nothing was
             # selected. Either way, select All Files, and jump to the global
             # commit message.
-            self._treeview_files.set_cursor((0,))
+            self._treeview_files.set_cursor(
+                Gtk.TreePath(path=0), None, False)
             self._global_message_text_view.grab_focus()
         else:
             # Set the cursor to this entry, and jump to the per-file commit
             # message
-            self._treeview_files.set_cursor(model.get_path(next))
+            self._treeview_files.set_cursor(model.get_path(next), None, False)
             self._file_message_text_view.grab_focus()
 
     def _save_current_file_message(self):
@@ -612,7 +610,7 @@
             return # Nothing to save
         text_buffer = self._file_message_text_view.get_buffer()
         cur_text = text_buffer.get_text(text_buffer.get_start_iter(),
-                                        text_buffer.get_end_iter())
+                                        text_buffer.get_end_iter(), True)
         last_selected = self._files_store.get_iter(self._last_selected_file)
         self._files_store.set_value(last_selected, 5, cur_text)
 
@@ -689,11 +687,11 @@
                 _i18n('Commit cancelled'),
                 _i18n('Do you want to save your commit messages ?'),
                 parent=self)
-            if response == gtk.RESPONSE_NO:
+            if response == Gtk.ResponseType.NO:
                  # save nothing and destroy old comments if any
                 mgr = SavedCommitMessagesManager()
         mgr.save(self._wt, self._wt.branch)
-        self.response(gtk.RESPONSE_CANCEL) # close window
+        self.response(Gtk.ResponseType.CANCEL) # close window
 
     @show_bzr_error
     def _on_commit_clicked(self, button):
@@ -708,7 +706,7 @@
                 _i18n('Commit with an empty message?'),
                 _i18n('You can describe your commit intent in the message.'),
                 parent=self)
-            if response == gtk.RESPONSE_NO:
+            if response == Gtk.ResponseType.NO:
                 # Kindly give focus to message area
                 self._global_message_text_view.grab_focus()
                 return
@@ -730,7 +728,7 @@
                 _i18n("Unknown files exist in the working tree. Commit anyway?"),
                 parent=self)
                 # Doesn't set a parent for the dialog..
-            if response == gtk.RESPONSE_NO:
+            if response == Gtk.ResponseType.NO:
                 return
             break
 
@@ -751,7 +749,7 @@
                 _i18n('There are no changes in the working tree.'
                       ' Do you want to commit anyway?'),
                 parent=self)
-            if response == gtk.RESPONSE_YES:
+            if response == Gtk.ResponseType.YES:
                 rev_id = self._wt.commit(message,
                                allow_pointless=True,
                                strict=False,
@@ -761,12 +759,12 @@
         self.committed_revision_id = rev_id
         # destroy old comments if any
         SavedCommitMessagesManager().save(self._wt, self._wt.branch)
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)
 
     def _get_global_commit_message(self):
         buf = self._global_message_text_view.get_buffer()
         start, end = buf.get_bounds()
-        text = buf.get_text(start, end)
+        text = buf.get_text(start, end, True)
         return _sanitize_and_decode_message(text)
 
     def _set_global_commit_message(self, message):

=== modified file 'conflicts.py'
--- conflicts.py	2011-03-14 20:12:19 +0000
+++ conflicts.py	2011-09-08 03:12:25 +0000
@@ -14,73 +14,67 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
 import subprocess
 
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 
 from bzrlib.config import GlobalConfig
-from bzrlib.plugins.gtk import _i18n
+from bzrlib.plugins.gtk.i18n import _i18n
 from bzrlib.plugins.gtk.dialog import (
     error_dialog,
     warning_dialog,
     )
 
 
-class ConflictsDialog(gtk.Dialog):
+class ConflictsDialog(Gtk.Dialog):
     """ This dialog displays the list of conflicts. """
 
     def __init__(self, wt, parent=None):
         """ Initialize the Conflicts dialog. """
-        gtk.Dialog.__init__(self, title="Conflicts - Olive",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CANCEL))
+        super(ConflictsDialog, self).__init__(
+            title="Conflicts - Olive", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CANCEL))
 
         # Get arguments
         self.wt = wt
 
         # Create the widgets
-        self._scrolledwindow = gtk.ScrolledWindow()
-        self._treeview = gtk.TreeView()
-        self._label_diff3 = gtk.Label(_i18n("External utility:"))
-        self._entry_diff3 = gtk.Entry()
-        self._image_diff3 = gtk.Image()
-        self._button_diff3 = gtk.Button()
-        self._hbox_diff3 = gtk.HBox()
+        self._scrolledwindow = Gtk.ScrolledWindow()
+        self._treeview = Gtk.TreeView()
+        self._label_diff3 = Gtk.Label(label=_i18n("External utility:"))
+        self._entry_diff3 = Gtk.Entry()
+        self._image_diff3 = Gtk.Image()
+        self._button_diff3 = Gtk.Button()
+        self._hbox_diff3 = Gtk.HBox()
 
         # Set callbacks
         self._button_diff3.connect('clicked', self._on_diff3_clicked)
 
         # Set properties
-        self._scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC,
-                                        gtk.POLICY_AUTOMATIC)
-        self._image_diff3.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
+        self._scrolledwindow.set_policy(Gtk.PolicyType.AUTOMATIC,
+                                        Gtk.PolicyType.AUTOMATIC)
+        self._image_diff3.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
         self._button_diff3.set_image(self._image_diff3)
         self._entry_diff3.set_text(self._get_diff3())
         self._hbox_diff3.set_spacing(3)
-        self.vbox.set_spacing(3)
+        content_area = self.get_content_area()
+        content_area.set_spacing(3)
         self.set_default_size(400, 300)
 
         # Construct dialog
-        self._hbox_diff3.pack_start(self._label_diff3, False, False)
-        self._hbox_diff3.pack_start(self._entry_diff3, True, True)
-        self._hbox_diff3.pack_start(self._button_diff3, False, False)
+        self._hbox_diff3.pack_start(self._label_diff3, False, False, 0)
+        self._hbox_diff3.pack_start(self._entry_diff3, True, True, 0)
+        self._hbox_diff3.pack_start(self._button_diff3, False, False, 0)
         self._scrolledwindow.add(self._treeview)
-        self.vbox.pack_start(self._scrolledwindow, True, True)
-        self.vbox.pack_start(self._hbox_diff3, False, False)
+        content_area.pack_start(self._scrolledwindow, True, True, 0)
+        content_area.pack_start(self._hbox_diff3, False, False, 0)
 
         # Create the conflict list
         self._create_conflicts()
 
         # Show the dialog
-        self.vbox.show_all()
+        content_area.show_all()
 
     def _get_diff3(self):
         """ Get the specified diff3 utility. Default is meld. """
@@ -98,22 +92,22 @@
     def _create_conflicts(self):
         """ Construct the list of conflicts. """
         if len(self.wt.conflicts()) == 0:
-            self.model = gtk.ListStore(gobject.TYPE_STRING)
+            self.model = Gtk.ListStore(GObject.TYPE_STRING)
             self._treeview.set_model(self.model)
-            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Conflicts'),
-                                         gtk.CellRendererText(), text=0))
+            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Conflicts'),
+                                         Gtk.CellRendererText(), text=0))
             self._treeview.set_headers_visible(False)
             self.model.append([ _i18n("No conflicts in working tree.") ])
             self._button_diff3.set_sensitive(False)
         else:
-            self.model = gtk.ListStore(gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING,
-                                       gobject.TYPE_STRING)
+            self.model = Gtk.ListStore(GObject.TYPE_STRING,
+                                       GObject.TYPE_STRING,
+                                       GObject.TYPE_STRING)
             self._treeview.set_model(self.model)
-            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Path'),
-                                         gtk.CellRendererText(), text=0))
-            self._treeview.append_column(gtk.TreeViewColumn(_i18n('Type'),
-                                         gtk.CellRendererText(), text=1))
+            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Path'),
+                                         Gtk.CellRendererText(), text=0))
+            self._treeview.append_column(Gtk.TreeViewColumn(_i18n('Type'),
+                                         Gtk.CellRendererText(), text=1))
             self._treeview.set_search_column(0)
             for conflict in self.wt.conflicts():
                 if conflict.typestring == 'path conflict':

=== modified file 'dialog.py'
--- dialog.py	2011-03-14 20:12:19 +0000
+++ dialog.py	2011-09-08 03:12:25 +0000
@@ -14,24 +14,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-
-def _message_dialog(type, primary, secondary, parent=None, buttons=gtk.BUTTONS_OK):
+from gi.repository import Gtk
+
+
+def _message_dialog(type, primary, secondary, parent=None, buttons=Gtk.ButtonsType.OK):
     """ Display a given type of MessageDialog with the given message.
 
     :param type: message dialog type
 
     :param message: the message you want to display.
     """
-    dialog = gtk.MessageDialog(flags=gtk.DIALOG_MODAL, type=type, parent=parent,
-                               buttons=buttons)
+    dialog = Gtk.MessageDialog(parent=parent, flags=Gtk.DialogFlags.MODAL,
+                               type=type, buttons=buttons)
     dialog.set_markup('<big><b>' + primary + '</b></big>')
     dialog.format_secondary_text(secondary)
     response = dialog.run()
@@ -40,16 +34,16 @@
 
 def error_dialog(primary, secondary, parent=None):
     """ Display an error dialog with the given message. """
-    return _message_dialog(gtk.MESSAGE_ERROR, primary, secondary, parent)
+    return _message_dialog(Gtk.MessageType.ERROR, primary, secondary, parent)
 
 def info_dialog(primary, secondary, parent=None):
     """ Display an info dialog with the given message. """
-    return _message_dialog(gtk.MESSAGE_INFO, primary, secondary, parent)
+    return _message_dialog(Gtk.MessageType.INFO, primary, secondary, parent)
 
 def warning_dialog(primary, secondary, parent=None):
     """ Display a warning dialog with the given message. """
-    return _message_dialog(gtk.MESSAGE_WARNING, primary, secondary, parent)
+    return _message_dialog(Gtk.MessageType.WARNING, primary, secondary, parent)
 
 def question_dialog(primary, secondary, parent=None):
     """ Display a dialog with the given question. """
-    return _message_dialog(gtk.MESSAGE_QUESTION, primary, secondary, parent, gtk.BUTTONS_YES_NO)
+    return _message_dialog(Gtk.MessageType.QUESTION, primary, secondary, parent, Gtk.ButtonsType.YES_NO)

=== modified file 'diff.py'
--- diff.py	2011-04-10 18:44:39 +0000
+++ diff.py	2011-09-08 03:12:25 +0000
@@ -10,10 +10,8 @@
 
 from cStringIO import StringIO
 
-import pygtk
-pygtk.require("2.0")
-import gtk
-import pango
+from gi.repository import Gtk
+from gi.repository import Pango
 import os
 import re
 import sys
@@ -24,12 +22,12 @@
     from elementtree.ElementTree import Element, SubElement, tostring
 
 try:
-    import gtksourceview2
+    from gi.repository import GtkSource
     have_gtksourceview = True
 except ImportError:
     have_gtksourceview = False
 try:
-    import gconf
+    from gi.repository import GConf
     have_gconf = True
 except ImportError:
     have_gconf = False
@@ -66,37 +64,35 @@
     pass
 
 
-class DiffFileView(gtk.ScrolledWindow):
+class DiffFileView(Gtk.ScrolledWindow):
     """Window for displaying diffs from a diff file"""
 
     def __init__(self):
-        gtk.ScrolledWindow.__init__(self)
+        super(DiffFileView, self).__init__()
         self.construct()
         self._diffs = {}
 
     def construct(self):
-        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self.set_shadow_type(gtk.SHADOW_IN)
+        self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        self.set_shadow_type(Gtk.ShadowType.IN)
 
         if have_gtksourceview:
-            self.buffer = gtksourceview2.Buffer()
-            slm = gtksourceview2.LanguageManager()
-            guess_language = getattr(gtksourceview2.LanguageManager, 
-                "guess_language", fallback_guess_language)
-            gsl = guess_language(slm, content_type="text/x-patch")
+            self.buffer = GtkSource.Buffer()
+            lang_manager = GtkSource.LanguageManager.get_default()
+            language = lang_manager.guess_language(None, "text/x-patch")
             if have_gconf:
                 self.apply_gedit_colors(self.buffer)
             self.apply_colordiff_colors(self.buffer)
-            self.buffer.set_language(gsl)
+            self.buffer.set_language(language)
             self.buffer.set_highlight_syntax(True)
 
-            self.sourceview = gtksourceview2.View(self.buffer)
+            self.sourceview = GtkSource.View(buffer=self.buffer)
         else:
-            self.buffer = gtk.TextBuffer()
-            self.sourceview = gtk.TextView(self.buffer)
+            self.buffer = Gtk.TextBuffer()
+            self.sourceview = Gtk.TextView(self.buffer)
 
         self.sourceview.set_editable(False)
-        self.sourceview.modify_font(pango.FontDescription("Monospace"))
+        self.sourceview.modify_font(Pango.FontDescription("Monospace"))
         self.add(self.sourceview)
         self.sourceview.show()
 
@@ -106,15 +102,15 @@
 
         This method needs the gconf module.
 
-        :param buf: a gtksourceview2.Buffer object.
+        :param buf: a GtkSource.Buffer object.
         """
         GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
         GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
 
-        client = gconf.client_get_default()
+        client = GConf.Client.get_default()
         style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
         if style_scheme_name is not None:
-            style_scheme_mgr = gtksourceview2.StyleSchemeManager()
+            style_scheme_mgr = GtkSource.StyleSchemeManager()
             style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
             
             style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
@@ -128,9 +124,9 @@
 
         Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
 
-        :param buf: a "Diff" gtksourceview2.Buffer object.
+        :param buf: a "Diff" GtkSource.Buffer object.
         """
-        scheme_manager = gtksourceview2.StyleSchemeManager()
+        scheme_manager = GtkSource.StyleSchemeManager()
         style_scheme = scheme_manager.get_scheme('colordiff')
         
         # if style scheme not found, we'll generate it from colordiffrc
@@ -254,7 +250,7 @@
     """This is the soft and chewy filling for a DiffWindow."""
 
     def __init__(self):
-        DiffFileView.__init__(self)
+        super(DiffView, self).__init__()
         self.rev_tree = None
         self.parent_tree = None
 
@@ -284,7 +280,7 @@
         self.buffer.set_text(decoded.encode('UTF-8'))
 
 
-class DiffWidget(gtk.HPaned):
+class DiffWidget(Gtk.HPaned):
     """Diff widget
 
     """
@@ -292,24 +288,24 @@
         super(DiffWidget, self).__init__()
 
         # The file hierarchy: a scrollable treeview
-        scrollwin = gtk.ScrolledWindow()
-        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
-        scrollwin.set_shadow_type(gtk.SHADOW_IN)
+        scrollwin = Gtk.ScrolledWindow()
+        scrollwin.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
+        scrollwin.set_shadow_type(Gtk.ShadowType.IN)
         self.pack1(scrollwin)
         scrollwin.show()
         
-        self.model = gtk.TreeStore(str, str)
-        self.treeview = gtk.TreeView(self.model)
+        self.model = Gtk.TreeStore(str, str)
+        self.treeview = Gtk.TreeView(model=self.model)
         self.treeview.set_headers_visible(False)
         self.treeview.set_search_column(1)
         self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
         scrollwin.add(self.treeview)
         self.treeview.show()
 
-        cell = gtk.CellRendererText()
+        cell = Gtk.CellRendererText()
         cell.set_property("width-chars", 20)
-        column = gtk.TreeViewColumn()
-        column.pack_start(cell, expand=True)
+        column = Gtk.TreeViewColumn()
+        column.pack_start(cell, True)
         column.add_attribute(cell, "text", 0)
         self.treeview.append_column(column)
 
@@ -386,7 +382,7 @@
                     break
         if tv_path is None:
             raise errors.NoSuchFile(file_path)
-        self.treeview.set_cursor(tv_path)
+        self.treeview.set_cursor(tv_path, None, False)
         self.treeview.scroll_to_cell(tv_path)
 
     def _treeview_cursor_cb(self, *args):
@@ -403,9 +399,9 @@
     def _on_wraplines_toggled(self, widget=None, wrap=False):
         """Callback for when the wrap lines checkbutton is toggled"""
         if wrap or widget.get_active():
-            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
+            self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.WORD)
         else:
-            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
+            self.diff_view.sourceview.set_wrap_mode(Gtk.WrapMode.NONE)
 
 class DiffWindow(Window):
     """Diff window.
@@ -415,7 +411,7 @@
     """
 
     def __init__(self, parent=None, operations=None):
-        Window.__init__(self, parent)
+        super(DiffWindow, self).__init__(parent=parent)
         self.set_border_width(0)
         self.set_title("bzrk diff")
 
@@ -429,7 +425,7 @@
 
     def construct(self, operations):
         """Construct the window contents."""
-        self.vbox = gtk.VBox()
+        self.vbox = Gtk.VBox()
         self.add(self.vbox)
         self.vbox.show()
         self.diff = DiffWidget()
@@ -444,11 +440,12 @@
         
     
     def _get_menu_bar(self):
-        menubar = gtk.MenuBar()
+        menubar = Gtk.MenuBar()
         # View menu
-        mb_view = gtk.MenuItem(_i18n("_View"))
-        mb_view_menu = gtk.Menu()
-        mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
+        mb_view = Gtk.MenuItem.new_with_mnemonic(_i18n("_View"))
+        mb_view_menu = Gtk.Menu()
+        mb_view_wrapsource = Gtk.CheckMenuItem.new_with_mnemonic(
+            _i18n("Wrap _Long Lines"))
         mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
         mb_view_wrapsource.show()
         mb_view_menu.append(mb_view_wrapsource)
@@ -466,26 +463,26 @@
         """
         if operations is None:
             return None
-        hbox = gtk.HButtonBox()
-        hbox.set_layout(gtk.BUTTONBOX_START)
+        hbox = Gtk.HButtonBox()
+        hbox.set_layout(Gtk.ButtonBoxStyle.START)
         for title, method in operations:
-            merge_button = gtk.Button(title)
+            merge_button = Gtk.Button(title)
             merge_button.show()
-            merge_button.set_relief(gtk.RELIEF_NONE)
+            merge_button.set_relief(Gtk.ReliefStyle.NONE)
             merge_button.connect("clicked", method)
             hbox.pack_start(merge_button, expand=False, fill=True)
         hbox.show()
         return hbox
 
     def _get_merge_target(self):
-        d = gtk.FileChooserDialog('Merge branch', self,
-                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
-                                           gtk.STOCK_CANCEL,
-                                           gtk.RESPONSE_CANCEL,))
+        d = Gtk.FileChooserDialog('Merge branch', self,
+                                  Gtk.FileChooserAction.SELECT_FOLDER,
+                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
+                                           Gtk.STOCK_CANCEL,
+                                           Gtk.ResponseType.CANCEL,))
         try:
             result = d.run()
-            if result != gtk.RESPONSE_OK:
+            if result != Gtk.ResponseType.OK:
                 raise SelectCancelled()
             return d.get_current_folder_uri()
         finally:
@@ -505,15 +502,15 @@
         error_dialog('Error', str(e))
 
     def _get_save_path(self, basename):
-        d = gtk.FileChooserDialog('Save As', self,
-                                  gtk.FILE_CHOOSER_ACTION_SAVE,
-                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
-                                           gtk.STOCK_CANCEL,
-                                           gtk.RESPONSE_CANCEL,))
+        d = Gtk.FileChooserDialog('Save As', self,
+                                  Gtk.FileChooserAction.SAVE,
+                                  buttons=(Gtk.STOCK_OK, Gtk.ResponseType.OK,
+                                           Gtk.STOCK_CANCEL,
+                                           Gtk.ResponseType.CANCEL,))
         d.set_current_name(basename)
         try:
             result = d.run()
-            if result != gtk.RESPONSE_OK:
+            if result != Gtk.ResponseType.OK:
                 raise SelectCancelled()
             return urlutils.local_path_from_url(d.get_uri())
         finally:
@@ -581,8 +578,8 @@
 class MergeDirectiveController(DiffController):
 
     def __init__(self, path, directive, window=None):
-        DiffController.__init__(self, path, directive.patch.splitlines(True),
-                                window)
+        super(MergeDirectiveController, self).__init__(
+            path, directive.patch.splitlines(True), window)
         self.directive = directive
         self.merge_target = None
 

=== modified file 'initialize.py'
--- initialize.py	2011-04-10 18:44:39 +0000
+++ initialize.py	2011-09-08 03:12:25 +0000
@@ -14,13 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 import os
 
@@ -35,26 +30,27 @@
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class InitDialog(gtk.Dialog):
+class InitDialog(Gtk.Dialog):
     """ Initialize dialog. """
 
     def __init__(self, path, parent=None):
         """ Initialize the Initialize dialog. """
-        gtk.Dialog.__init__(self, title="Initialize - Olive",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(InitDialog, self).__init__(
+            title="Initialize - Olive", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
         
         # Get arguments
         self.path = path
         
         # Create the widgets
-        self._button_init = gtk.Button(_i18n("_Initialize"), use_underline=True)
-        self._label_question = gtk.Label(_i18n("Which directory do you want to initialize?"))
-        self._radio_current = gtk.RadioButton(None, _i18n("Current directory"))
-        self._radio_custom = gtk.RadioButton(self._radio_current, _i18n("Create a new directory with the name:"))
-        self._entry_custom = gtk.Entry()
-        self._hbox_custom = gtk.HBox()
+        self._button_init = Gtk.Button(_i18n("_Initialize"), use_underline=True)
+        self._label_question = Gtk.Label(label=_i18n("Which directory do you want to initialize?"))
+        self._radio_current = Gtk.RadioButton.new_with_label(
+            None, _i18n("Current directory"))
+        self._radio_custom = Gtk.RadioButton.new_with_label_from_widget(
+            self._radio_current, _i18n("Create a new directory with the name:"))
+        self._entry_custom = Gtk.Entry()
+        self._hbox_custom = Gtk.HBox()
         
         # Set callbacks
         self._button_init.connect('clicked', self._on_init_clicked)
@@ -64,17 +60,18 @@
         self._entry_custom.set_sensitive(False)
         
         # Construct the dialog
-        self.action_area.pack_end(self._button_init)
-        
-        self._hbox_custom.pack_start(self._radio_custom, False, False)
-        self._hbox_custom.pack_start(self._entry_custom, True, True)
-        
-        self.vbox.pack_start(self._label_question)
-        self.vbox.pack_start(self._radio_current)
-        self.vbox.pack_start(self._hbox_custom)
+        self.action_area.pack_end(self._button_init, False, False, 0)
+        
+        self._hbox_custom.pack_start(self._radio_custom, False, False, 0)
+        self._hbox_custom.pack_start(self._entry_custom, True, True, 0)
+        
+        content_area = self.get_content_area()
+        content_area.pack_start(self._label_question, True, True, 0)
+        content_area.pack_start(self._radio_current, True, True, 0)
+        content_area.pack_start(self._hbox_custom, True, True, 0)
         
         # Display the dialog
-        self.vbox.show_all()
+        content_area.show_all()
     
     def _on_custom_toggled(self, widget):
         """ Occurs if the Custom radiobutton is toggled. """
@@ -120,4 +117,4 @@
                 branch = existing_bzrdir.create_branch()
                 existing_bzrdir.create_workingtree()
         
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)

=== modified file 'keyring.py'
--- keyring.py	2010-06-04 12:12:59 +0000
+++ keyring.py	2011-09-08 03:12:25 +0000
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import gobject
+from gi.repository import GObject
 try:
     import gnomekeyring
 except ImportError:
@@ -28,15 +28,12 @@
 class GnomeKeyringCredentialStore(CredentialStore):
 
     def __init__(self):
-        CredentialStore.__init__(self)
-        # Older versions of gobject don't provide get_application_name so we
-        # can't always check.
-        get_app_name = getattr(gobject, 'get_application_name', None)
-        if get_app_name is None or get_app_name() is None:
+        super(GnomeKeyringCredentialStore, self).__init__()
+        if GObject.get_application_name() is None:
             # External applications that load bzrlib may already have set the
             # application name so we don't contradict them (when we can
             # determine it that is).
-            gobject.set_application_name("bzr")
+            GObject.set_application_name("bzr")
 
     def decode_password(self, credentials):
         if gnomekeyring is None:

=== modified file 'lock.py'
--- lock.py	2011-03-14 20:12:19 +0000
+++ lock.py	2011-09-08 03:12:25 +0000
@@ -1,8 +1,8 @@
-import gtk
+from gi.repository import Gtk
 
 
 RESPONSE_BREAK = 0
-RESPONSE_CANCEL = gtk.RESPONSE_CANCEL
+RESPONSE_CANCEL = Gtk.ResponseType.CANCEL
 
 READ = "read"
 WRITE = "write"
@@ -43,19 +43,21 @@
     return True
 
 
-class LockDialog(gtk.Dialog):
+class LockDialog(Gtk.Dialog):
 
     def __init__(self, branch):
-        gtk.Dialog.__init__(self)
+        super(LockDialog, self).__init__()
 
         self.branch = branch
 
         self.set_title('Lock Not Held')
 
-        self.vbox.add(gtk.Label('This operation cannot be completed as ' \
-                                'another application has locked the branch.'))
+        self.get_content_area().add(
+            Gtk.Label(label=(
+                'This operation cannot be completed as '
+                'another application has locked the branch.')))
 
         self.add_button('Break Lock', RESPONSE_BREAK)
-        self.add_button(gtk.STOCK_CANCEL, RESPONSE_CANCEL)
+        self.add_button(Gtk.STOCK_CANCEL, RESPONSE_CANCEL)
 
-        self.vbox.show_all()
+        self.get_content_area().show_all()

=== modified file 'loom.py'
--- loom.py	2011-04-10 18:44:39 +0000
+++ loom.py	2011-09-08 03:12:25 +0000
@@ -14,14 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 
 from bzrlib.plugins.gtk.diff import DiffWidget
 from bzrlib.plugins.gtk.dialog import question_dialog
@@ -32,14 +26,13 @@
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class LoomDialog(gtk.Dialog):
+class LoomDialog(Gtk.Dialog):
     """Simple Loom browse dialog."""
 
     def __init__(self, branch, tree=None, parent=None):
-        gtk.Dialog.__init__(self, title="Threads",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CLOSE,gtk.RESPONSE_OK))
+        super(LoomDialog, self).__init__(
+            title="Threads", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CLOSE,Gtk.ResponseType.OK))
         self.branch = branch
         if tree is not None:
             self.tree = loom_tree.LoomTreeDecorator(tree)
@@ -57,7 +50,7 @@
                 _i18n("Branch is not a loom branch. Upgrade to Loom format?"),
                 parent=self)
                 # Doesn't set a parent for the dialog..
-            if response == gtk.RESPONSE_NO:
+            if response == Gtk.ResponseType.NO:
                 return
             assert self.branch.nick is not None
             loom_branch.loomify(self.branch)
@@ -65,29 +58,29 @@
         return super(LoomDialog, self).run()
 
     def _construct(self):
-        hbox = gtk.HBox()
+        hbox = Gtk.HBox()
 
-        self._threads_scroller = gtk.ScrolledWindow()
-        self._threads_scroller.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        self._threads_view = gtk.TreeView()
+        self._threads_scroller = Gtk.ScrolledWindow()
+        self._threads_scroller.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        self._threads_view = Gtk.TreeView()
         self._threads_scroller.add(self._threads_view)
-        self._threads_scroller.set_shadow_type(gtk.SHADOW_IN)
-        hbox.pack_start(self._threads_scroller)
+        self._threads_scroller.set_shadow_type(Gtk.ShadowType.IN)
+        hbox.pack_start(self._threads_scroller, True, True, 0)
 
-        self._threads_store = gtk.ListStore(
-                gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_PYOBJECT, gobject.TYPE_STRING)
+        self._threads_store = Gtk.ListStore(
+                GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_PYOBJECT, GObject.TYPE_STRING)
         self._threads_view.set_model(self._threads_store)
-        self._threads_view.append_column(gtk.TreeViewColumn("Name", gtk.CellRendererText(), text=0))
+        self._threads_view.append_column(Gtk.TreeViewColumn("Name", Gtk.CellRendererText(), text=0))
         self._threads_view.connect('cursor-changed', self._on_view_thread)
         if self.tree is not None:
             self._threads_view.connect('row-activated', self._on_switch_thread)
 
         self._diff = DiffWidget()
         self._diff.show()
-        hbox.pack_end(self._diff)
+        hbox.pack_end(self._diff, False, False, 0)
 
         hbox.show_all()
-        self.vbox.pack_start(hbox)
+        self.get_content_area().pack_start(hbox, True, True, 0)
 
         # FIXME: Buttons: combine-thread, revert-loom, record
         self.set_default_size(500, 350)

=== modified file 'merge.py'
--- merge.py	2011-04-10 18:44:39 +0000
+++ merge.py	2011-09-08 03:12:25 +0000
@@ -16,13 +16,7 @@
 
 import os
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 from bzrlib.branch import Branch
 import bzrlib.errors as errors
@@ -37,15 +31,14 @@
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class MergeDialog(gtk.Dialog):
+class MergeDialog(Gtk.Dialog):
     """ Display the Merge dialog and perform the needed actions. """
     
     def __init__(self, wt, wtpath, default_branch_path=None, parent=None):
         """ Initialize the Merge dialog. """
-        gtk.Dialog.__init__(self, title="Merge changes",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(MergeDialog, self).__init__(
+            title="Merge changes", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
         self.set_icon_from_file(icon_path("bzr-icon-64.png"))
         # Get arguments
         self.wt = wt
@@ -54,25 +47,25 @@
         self.parent_window = parent
         
         # Create widgets
-        self._hbox = gtk.HBox()
-        self._source = gtk.HBox()
-        self._label_merge_from = gtk.Label(_i18n("Merge from"))
-        self._combo_source = gtk.combo_box_new_text()
+        self._hbox = Gtk.HBox()
+        self._source = Gtk.HBox()
+        self._label_merge_from = Gtk.Label(label=_i18n("Merge from"))
+        self._combo_source = Gtk.ComboBoxText()
         for entry in [_i18n("Folder"),_i18n("Custom Location")]:
             self._combo_source.append_text(entry)
         self._combo_source.connect("changed", self._on_combo_changed)
-        self._button_merge = gtk.Button(_i18n("_Merge"))
-        self._button_merge_icon = gtk.Image()
-        self._button_merge_icon.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON)
+        self._button_merge = Gtk.Button(_i18n("_Merge"))
+        self._button_merge_icon = Gtk.Image()
+        self._button_merge_icon.set_from_stock(Gtk.STOCK_APPLY, Gtk.IconSize.BUTTON)
         self._button_merge.set_image(self._button_merge_icon)
         self._button_merge.connect('clicked', self._on_merge_clicked)
         
         # Add widgets to dialog
-        self.vbox.pack_start(self._hbox, False, False, 0)
+        self.get_content_area().pack_start(self._hbox, False, False, 0)
         self._hbox.add(self._label_merge_from)
         self._hbox.add(self._combo_source)
         self._hbox.set_spacing(5)
-        self.action_area.pack_end(self._button_merge)
+        self.action_area.pack_end(self._button_merge, False, False, 0)
         
         if self.default_branch_path and os.path.isdir(
                             self.default_branch_path.partition('file://')[2]):
@@ -83,37 +76,37 @@
         else:
             # If no default_branch_path give, default to folder source with current folder
             self._combo_source.set_active(0)
-        self.vbox.show_all()
+        self.get_content_area().show_all()
     
     def _on_folder_source(self):
         """ Merge from folder, create a filechooser dialog and button """
-        self._source = gtk.HBox()
-        self._filechooser_dialog = gtk.FileChooserDialog(title="Please select a folder",
+        self._source = Gtk.HBox()
+        self._filechooser_dialog = Gtk.FileChooserDialog(title="Please select a folder",
                                     parent=self.parent_window,
-                                    action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
-                                    buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
-                                             gtk.STOCK_OPEN, gtk.RESPONSE_OK))
-        self._filechooser_dialog.set_default_response(gtk.RESPONSE_OK)
-        self._filechooser = gtk.FileChooserButton(self._filechooser_dialog)
+                                    action=Gtk.FileChooserAction.SELECT_FOLDER,
+                                    buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
+                                             Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
+        self._filechooser_dialog.set_default_response(Gtk.ResponseType.OK)
+        self._filechooser = Gtk.FileChooserButton(self._filechooser_dialog)
         self._filechooser.show()
         directory = getattr(self, 'directory', None)
         if not directory:
             directory = os.path.dirname(self.wt.abspath(self.wtpath))
         self._filechooser_dialog.set_current_folder(directory)
         self._source.pack_start(self._filechooser, True, True, 0)
-        self.vbox.pack_start(self._source, True, True, 5)
+        self.get_content_area().pack_start(self._source, True, True, 5)
         self._source.show()
     
     def _on_custom_source(self):
         """ Merge from a custom source (can be folder, remote, etc), create entry """
-        self._source = gtk.HBox()
-        self._custom_entry = gtk.Entry()
+        self._source = Gtk.HBox()
+        self._custom_entry = Gtk.Entry()
         if self.default_branch_path:
             self._custom_entry.set_text(self.default_branch_path)
         self._custom_entry.connect("activate", self._on_merge_clicked)
         self._custom_entry.show()
         self._source.pack_start(self._custom_entry, True, True, 0)
-        self.vbox.pack_start(self._source, True, True, 5)
+        self.get_content_area().pack_start(self._source, True, True, 5)
         self._source.show()
     
     def _on_combo_changed(self, widget):
@@ -155,4 +148,4 @@
             warning_dialog(_i18n('Conflicts encountered'),
                            _i18n('Please resolve the conflicts manually before committing.'))
         
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)

=== modified file 'mergedirective.py'
--- mergedirective.py	2011-03-14 20:12:19 +0000
+++ mergedirective.py	2011-09-08 03:12:25 +0000
@@ -14,17 +14,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 from bzrlib.plugins.gtk.branchbox import BranchSelectionBox
 
-class CreateMergeDirectiveDialog(gtk.Dialog):
+class CreateMergeDirectiveDialog(Gtk.Dialog):
     def __init__(self, branch, stop_revid=None):
         super(CreateMergeDirectiveDialog, self).__init__()
         self.branch = branch
@@ -42,7 +36,7 @@
         pass
 
 
-class SendMergeDirectiveDialog(gtk.Dialog):
+class SendMergeDirectiveDialog(Gtk.Dialog):
     def __init__(self, branch, parent=None):
         super(SendMergeDirectiveDialog, self).__init__(parent)
         self.branch = branch
@@ -50,31 +44,31 @@
         self._create()
 
     def _create(self):
-        table = gtk.Table(rows=3, columns=2)
-        self.vbox.add(table)
+        table = Gtk.Table(rows=3, columns=2)
+        self.get_content_area().add(table)
 
-        label = gtk.Label()
+        label = Gtk.Label()
         label.set_markup("<b>Branch to Submit:</b>")
-        table.attach(label, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
-
-        label = gtk.Label(str(self.branch))
-        table.attach(label, 1, 2, 0, 1, gtk.FILL, gtk.FILL)
-
-        label = gtk.Label()
+        table.attach(label, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
+
+        label = Gtk.Label(label=str(self.branch))
+        table.attach(label, 1, 2, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
+
+        label = Gtk.Label()
         label.set_markup("<b>Target Branch:</b>")
-        table.attach(label, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
+        table.attach(label, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         self.submit_branch = BranchSelectionBox(self.branch.get_submit_branch())
-        table.attach(self.submit_branch, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
+        table.attach(self.submit_branch, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         # TODO: Display number of revisions to be send whenever 
         # submit branch changes
 
-        label = gtk.Label()
+        label = Gtk.Label()
         label.set_markup("<b>Email To:</b>")
-        table.attach(label, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
+        table.attach(label, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        self.mail_to = gtk.ComboBoxEntry()
+        self.mail_to = Gtk.ComboBox.new_with_entry()
         mail_to = self.branch.get_config().get_user_option('submit_to')
         if mail_to is None:
             submit_branch = self.submit_branch.get_branch()
@@ -83,10 +77,10 @@
                             'child_submit_to')
         if mail_to is not None:
             self.mail_to.get_child().set_text(mail_to)
-        table.attach(self.mail_to, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
+        table.attach(self.mail_to, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, 
-                         gtk.STOCK_OK, gtk.RESPONSE_OK)
+        self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, 
+                         Gtk.STOCK_OK, Gtk.ResponseType.OK)
 
         self.show_all()
 
@@ -110,6 +104,6 @@
 
 
 
-class ApplyMergeDirectiveDialog(gtk.Dialog):
+class ApplyMergeDirectiveDialog(Gtk.Dialog):
     def __init__(self):
         super(ApplyMergeDirectiveDialog, self).__init__()

=== modified file 'missing.py'
--- missing.py	2011-02-18 13:01:03 +0000
+++ missing.py	2011-09-08 03:12:25 +0000
@@ -14,25 +14,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 from bzrlib.missing import find_unmerged
 
 from bzrlib.plugins.gtk.revisionview import RevisionView
 
 
-class MissingWindow(gtk.Dialog):
+class MissingWindow(Gtk.Dialog):
     """Displays revisions present in one branch but missing in 
     another."""
     def __init__(self, local_branch, remote_branch):
         """ Initialize the Status window. """
-        super(MissingWindow, self).__init__(flags=gtk.DIALOG_MODAL)
+        super(MissingWindow, self).__init__(flags=Gtk.DialogFlags.MODAL)
         self.set_title("Missing Revisions")
         self.local_branch = local_branch
         self.remote_branch = remote_branch
@@ -41,21 +35,21 @@
         self._create()
 
     def _create_revisions_frame(self, revisions):
-        extra_revs = gtk.ScrolledWindow()
-        vbox = gtk.VBox()
+        extra_revs = Gtk.ScrolledWindow()
+        vbox = Gtk.VBox()
         for rev in revisions:
             rv = RevisionView()
             rv.set_revision(rev)
-            vbox.pack_start(rv, True, True)
+            vbox.pack_start(rv, True, True, 0)
         extra_revs.add_with_viewport(vbox)
-        extra_revs.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
+        extra_revs.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         return extra_revs
 
     def _create(self):
         self.set_default_size(600, 600)
-        paned = gtk.VPaned()
+        paned = Gtk.VPaned()
 
-        frame = gtk.Frame("You have the following extra revisions:")
+        frame = Gtk.Frame(label="You have the following extra revisions:")
 
         extra_revs = self._create_revisions_frame(
                 self.local_branch.repository.get_revisions(
@@ -67,10 +61,10 @@
                 self.remote_branch.repository.get_revisions(
                     map(lambda (x,y):y, self.remote_extra)))
 
-        frame = gtk.Frame("You are missing following revisions:")
+        frame = Gtk.Frame(label="You are missing following revisions:")
         frame.add(missing_revs)
 
         paned.pack2(frame, resize=False, shrink=True)
 
-        self.vbox.pack_start(paned, True, True)
-        self.vbox.show_all()
+        self.get_content_area().pack_start(paned, True, True, 0)
+        self.get_content_area().show_all()

=== modified file 'nautilus-bzr.py'
--- nautilus-bzr.py	2011-03-14 20:12:19 +0000
+++ nautilus-bzr.py	2011-09-08 03:12:25 +0000
@@ -6,7 +6,7 @@
 #
 # Published under the GNU GPL
 
-import gtk
+from gi.repository import Gtk
 import nautilus
 from bzrlib.branch import Branch
 from bzrlib.bzrdir import BzrDir
@@ -143,7 +143,7 @@
         
         dialog = BranchDialog(vfs_file.get_name())
         response = dialog.run()
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             dialog.hide()
             dialog.destroy()
  
@@ -171,7 +171,7 @@
         from bzrlib.plugins.gtk.commit import CommitDialog
         dialog = CommitDialog(tree, path)
         response = dialog.run()
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             dialog.hide()
             dialog.destroy()
 
@@ -190,7 +190,7 @@
 
         pp = start_viz_window(branch, [branch.last_revision()])
         pp.show()
-        gtk.main()
+        Gtk.main()
 
     def pull_cb(self, menu, vfs_file):
         # We can only cope with local files
@@ -208,7 +208,7 @@
         from bzrlib.plugins.gtk.pull import PullDialog
         dialog = PullDialog(tree, path)
         dialog.display()
-        gtk.main()
+        Gtk.main()
 
     def merge_cb(self, menu, vfs_file):
         # We can only cope with local files

=== modified file 'notify.py'
--- notify.py	2011-02-18 13:01:03 +0000
+++ notify.py	2011-09-08 03:12:25 +0000
@@ -16,13 +16,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Notification area icon and notification for Bazaar."""
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 import bzrlib
 
 
@@ -34,7 +28,7 @@
     return (getattr(bzrlib.plugins, "avahi", None) is not None)
 
 
-class NotifyPopupMenu(gtk.Menu):
+class NotifyPopupMenu(Gtk.Menu):
 
     def __init__(self):
         super(NotifyPopupMenu, self).__init__()
@@ -42,10 +36,10 @@
 
     def create_items(self):
         from bzrlib import errors
-        item = gtk.CheckMenuItem('_Gateway to LAN')
+        item = Gtk.CheckMenuItem.new_with_mnemonic('_Gateway to LAN')
         item.connect('toggled', self.toggle_lan_gateway)
         self.append(item)
-        self.append(gtk.SeparatorMenuItem())
+        self.append(Gtk.SeparatorMenuItem())
         try:
             from bzrlib.plugins.dbus.activity import LanGateway
             self.langateway = LanGateway()
@@ -56,10 +50,11 @@
             # process is already running.
             item.set_sensitive(False)
 
-        item = gtk.CheckMenuItem('Announce _branches on LAN')
+        item = Gtk.CheckMenuItem.new_with_mnemonic(
+            'Announce _branches on LAN')
         item.connect('toggled', self.toggle_announce_branches)
         self.append(item)
-        self.append(gtk.SeparatorMenuItem())
+        self.append(Gtk.SeparatorMenuItem())
         try:
             from bzrlib.plugins.avahi.share import ZeroConfServer
             from bzrlib import urlutils
@@ -67,20 +62,20 @@
         except ImportError:
             item.set_sensitive(False)
 
-        item = gtk.ImageMenuItem(gtk.STOCK_PREFERENCES, None)
+        item = Gtk.ImageMenuItem(Gtk.STOCK_PREFERENCES, None)
         item.connect('activate', self.show_preferences)
         self.append(item)
-        item = gtk.ImageMenuItem(gtk.STOCK_ABOUT, None)
+        item = Gtk.ImageMenuItem(Gtk.STOCK_ABOUT, None)
         item.connect('activate', self.show_about)
         self.append(item)
-        self.append(gtk.SeparatorMenuItem())
-        item = gtk.ImageMenuItem(gtk.STOCK_QUIT, None)
-        item.connect('activate', gtk.main_quit)
+        self.append(Gtk.SeparatorMenuItem())
+        item = Gtk.ImageMenuItem(Gtk.STOCK_QUIT, None)
+        item.connect('activate', Gtk.main_quit)
         self.append(item)
         self.show_all()
 
     def display(self, icon, event_button, event_time):
-        self.popup(None, None, gtk.status_icon_position_menu, 
+        self.popup(None, None, Gtk.status_icon_position_menu, 
                event_button, event_time, icon)
 
     def toggle_lan_gateway(self, item):

=== modified file 'preferences/__init__.py'
--- preferences/__init__.py	2011-03-14 20:12:19 +0000
+++ preferences/__init__.py	2011-09-08 03:12:25 +0000
@@ -14,20 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 from bzrlib.config import GlobalConfig
 from bzrlib.plugins.gtk.preferences.identity import IdentityPage
 from bzrlib.plugins.gtk.preferences.plugins import PluginsPage
 from bzrlib.plugins.gtk.preferences.notifications import NotificationsPage
 
-class PreferencesWindow(gtk.Dialog):
+class PreferencesWindow(Gtk.Dialog):
     """Displays global preferences windows."""
     # Note that we don't allow configuration of aliases or
     # default log formats. This is because doing so wouldn't make
@@ -36,9 +30,8 @@
 
     def __init__(self, config=None):
         """ Initialize the Status window. """
-        super(PreferencesWindow, self).__init__(flags=gtk.DIALOG_MODAL)
+        super(PreferencesWindow, self).__init__(flags=Gtk.DialogFlags.MODAL)
         self.set_title("Bazaar Preferences")
-        self.set_has_separator(False)
         self.config = config
         if self.config is None:
             self.config = GlobalConfig()
@@ -48,16 +41,17 @@
         self.set_default_size(320, 480)
         self.set_border_width(0)
 
-        notebook = gtk.Notebook()
+        notebook = Gtk.Notebook()
         notebook.set_border_width(12)
         for (label, page) in self._create_pages():
-            notebook.append_page(page, gtk.Label(label))
+            notebook.append_page(page, Gtk.Label(label=label))
 
         notebook.set_current_page(0)
-        self.vbox.set_border_width(0)
-        self.vbox.pack_start(notebook, True, True)
-        self.vbox.show_all()
-        self.action_area.set_border_width(12)
+        content_area = self.get_content_area()
+        content_area.set_border_width(0)
+        content_area.pack_start(notebook, True, True, 0)
+        content_area.show_all()
+        self.get_action_area().set_border_width(12)
 
     def _create_pages(self):
         return [("Identity", IdentityPage(self.config)),
@@ -70,7 +64,8 @@
     def close(self, widget=None):
         self.window.destroy()
 
-class BranchPreferencesWindow(gtk.Dialog):
+
+class BranchPreferencesWindow(Gtk.Dialog):
     """Displays global preferences windows."""
     def __init__(self, config=None):
         super(BranchPreferencesWindow, self).__init__(config)

=== modified file 'preferences/identity.py'
--- preferences/identity.py	2011-03-14 20:12:19 +0000
+++ preferences/identity.py	2011-09-08 03:12:25 +0000
@@ -14,78 +14,88 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-
-class IdentityPage(gtk.Table):
+from gi.repository import Gtk
+
+
+class IdentityPage(Gtk.Table):
 
     def __init__(self, config):
         self.config = config
-        gtk.Table.__init__(self, rows=4, columns=2)
+        super(IdentityPage, self).__init__(rows=4, columns=2)
         self.set_border_width(12)
         self.set_row_spacings(6)
         self.set_col_spacings(6)
 
-        align = gtk.Alignment(0.0, 0.5)
-        label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        label = Gtk.Label()
         label.set_markup("E-Mail:")
         align.add(label)
-        self.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
+        self.attach(
+            align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        self.username = gtk.Entry()
+        self.username = Gtk.Entry()
         self.username.set_text(self.config.username())
-        self.attach(self.username, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.attach(
+            self.username, 1, 2, 0, 1,
+            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
+            Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        label = Gtk.Label()
         label.set_markup("GPG signing command:")
         align.add(label)
-        self.attach(align, 0, 1, 1, 2, gtk.FILL, gtk.FILL)
+        self.attach(
+            align, 0, 1, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        self.email = gtk.Entry()
+        self.email = Gtk.Entry()
         self.email.set_text(self.config.gpg_signing_command())
-        self.attach(self.email, 1, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.attach(
+            self.email, 1, 2, 1, 2,
+            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
+            Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.1)
-        label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
+        label = Gtk.Label()
         label.set_markup("Check GPG Signatures:")
         align.add(label)
-        self.attach(align, 0, 1, 2, 3, gtk.FILL, gtk.FILL)
+        self.attach(
+            align, 0, 1, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        sigvals = gtk.VBox()
-        self.check_sigs_if_possible = gtk.RadioButton(None,
-                                                      "_Check if possible")
-        sigvals.pack_start(self.check_sigs_if_possible)
-        self.check_sigs_always = gtk.RadioButton(self.check_sigs_if_possible,
-                                                 "Check _always")
-        sigvals.pack_start(self.check_sigs_always)
-        self.check_sigs_never = gtk.RadioButton(self.check_sigs_if_possible,
-                                                "Check _never")
-        sigvals.pack_start(self.check_sigs_never)
+        sigvals = Gtk.VBox()
+        self.check_sigs_if_possible = Gtk.RadioButton.new_with_label(
+            None, "_Check if possible")
+        sigvals.pack_start(self.check_sigs_if_possible, True, True, 0)
+        self.check_sigs_always = Gtk.RadioButton.new_with_label_from_widget(
+            self.check_sigs_if_possible, "Check _always")
+        sigvals.pack_start(self.check_sigs_always, True, True, 0)
+        self.check_sigs_never = Gtk.RadioButton.new_with_label_from_widget(
+            self.check_sigs_if_possible, "Check _never")
+        sigvals.pack_start(self.check_sigs_never, True, True, 0)
         # FIXME: Set default
-        self.attach(sigvals, 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.attach(
+            sigvals, 1, 2, 2, 3,
+            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
+            Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.1)
-        label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
+        label = Gtk.Label()
         label.set_markup("Create GPG Signatures:")
         align.add(label)
-        self.attach(align, 0, 1, 3, 4, gtk.FILL, gtk.FILL)
+        self.attach(
+            align, 0, 1, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        create_sigs = gtk.VBox()
-        self.create_sigs_when_required = gtk.RadioButton(None,
-                                                         "Sign When _Required")
-        create_sigs.pack_start(self.create_sigs_when_required)
-        self.create_sigs_always = gtk.RadioButton(
+        create_sigs = Gtk.VBox()
+        self.create_sigs_when_required = Gtk.RadioButton.new_with_label(
+            None, "Sign When _Required")
+        create_sigs.pack_start(self.create_sigs_when_required, True, True, 0)
+        self.create_sigs_always = Gtk.RadioButton.new_with_label_from_widget(
             self.create_sigs_when_required, "Sign _Always")
-        create_sigs.pack_start(self.create_sigs_always)
-        self.create_sigs_never = gtk.RadioButton(
+        create_sigs.pack_start(self.create_sigs_always, True, True, 0)
+        self.create_sigs_never = Gtk.RadioButton.new_with_label_from_widget(
             self.create_sigs_when_required, "Sign _Never")
-        create_sigs.pack_start(self.create_sigs_never)
+        create_sigs.pack_start(self.create_sigs_never, True, True, 0)
         # FIXME: Set default
-        self.attach(create_sigs, 1, 2, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.attach(
+            create_sigs, 1, 2, 3, 4,
+            Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL,
+            Gtk.AttachOptions.FILL)

=== modified file 'preferences/notifications.py'
--- preferences/notifications.py	2011-03-14 20:12:19 +0000
+++ preferences/notifications.py	2011-09-08 03:12:25 +0000
@@ -14,13 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import Gtk
 
 import bzrlib.plugins.gtk
 from bzrlib.plugins.gtk.notify import (
@@ -36,49 +30,50 @@
     return (getattr(bzrlib.plugins, "cia", None) is not None)
 
 
-class NotificationsPage(gtk.VBox):
+class NotificationsPage(Gtk.VBox):
 
     def __init__(self, config, homogeneous=False, spacing=6):
         self.config = config
-        gtk.VBox.__init__(self, homogeneous=homogeneous, spacing=spacing)
+        super(NotificationsPage, self).__init__(
+            homogeneous=homogeneous, spacing=spacing)
         self.set_spacing(spacing) # The vertical one
 
-        lan_frame = gtk.Frame("LAN Notifications")
+        lan_frame = Gtk.Frame(label="LAN Notifications")
 
-        lan_vbox = gtk.VBox()
+        lan_vbox = Gtk.VBox()
         lan_frame.add(lan_vbox)
 
-        self.gateway_to_lan = gtk.CheckButton("_Gateway to LAN")
-        lan_vbox.pack_start(self.gateway_to_lan)
+        self.gateway_to_lan = Gtk.CheckButton("_Gateway to LAN")
+        lan_vbox.pack_start(self.gateway_to_lan, False, False, 0)
         self.gateway_to_lan.set_sensitive(has_dbus())
 
-        self.announce_on_lan = gtk.CheckButton("_Announce on LAN")
-        lan_vbox.pack_start(self.announce_on_lan)
+        self.announce_on_lan = Gtk.CheckButton("_Announce on LAN")
+        lan_vbox.pack_start(self.announce_on_lan, False, False, 0)
         self.announce_on_lan.set_sensitive(has_avahi())
 
-        self.pack_start(lan_frame)
-
-        email_frame = gtk.Frame("E-mail notifications")
-
-        email_hbox = gtk.HBox()
-        self.send_email = gtk.CheckButton("Send _E-Mail to")
-        email_hbox.pack_start(self.send_email)
-        self.send_email_to = gtk.Entry()
-        email_hbox.pack_start(self.send_email_to)
+        self.pack_start(lan_frame, False, False, 0)
+
+        email_frame = Gtk.Frame(label="E-mail notifications")
+
+        email_hbox = Gtk.HBox()
+        self.send_email = Gtk.CheckButton("Send _E-Mail to")
+        email_hbox.pack_start(self.send_email, False, False, 0)
+        self.send_email_to = Gtk.Entry()
+        email_hbox.pack_start(self.send_email_to, False, False, 0)
 
         email_frame.add(email_hbox)
         email_frame.set_sensitive(has_email())
 
-        self.pack_start(email_frame)
-
-        cia_frame = gtk.Frame("CIA notifications")
-
-        cia_user_hbox = gtk.HBox()
-        cia_user_hbox.pack_start(gtk.Label("Author name"))
-        self.cia_user = gtk.Entry()
-        cia_user_hbox.pack_start(self.cia_user)
+        self.pack_start(email_frame, False, False, 0)
+
+        cia_frame = Gtk.Frame(label="CIA notifications")
+
+        cia_user_hbox = Gtk.HBox()
+        cia_user_hbox.pack_start(Gtk.Label("Author name"), False, False, 0)
+        self.cia_user = Gtk.Entry()
+        cia_user_hbox.pack_start(self.cia_user, False, False, 0)
 
         cia_frame.add(cia_user_hbox)
         cia_frame.set_sensitive(has_cia())
 
-        self.pack_start(cia_frame)
+        self.pack_start(cia_frame, False, False, 0)

=== modified file 'preferences/plugins.py'
--- preferences/plugins.py	2011-03-14 20:12:19 +0000
+++ preferences/plugins.py	2011-09-08 03:12:25 +0000
@@ -14,31 +14,26 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-
-class PluginsPage(gtk.VPaned):
+from gi.repository import Gtk
+
+
+class PluginsPage(Gtk.VPaned):
 
     def __init__(self):
-        gtk.VPaned.__init__(self)
+        super(PluginsPage, self).__init__()
         self.set_border_width(12)
         self.set_position(216)
 
-        scrolledwindow = gtk.ScrolledWindow()
-        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        scrolledwindow.set_shadow_type(gtk.SHADOW_IN)
-        self.model = gtk.ListStore(str, str)
-        treeview = gtk.TreeView()
+        scrolledwindow = Gtk.ScrolledWindow()
+        scrolledwindow.set_policy(
+            Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        scrolledwindow.set_shadow_type(Gtk.ShadowType.IN)
+        self.model = Gtk.ListStore(str, str)
+        treeview = Gtk.TreeView()
         scrolledwindow.add(treeview)
         self.pack1(scrolledwindow, resize=True, shrink=False)
 
-        self.table = gtk.Table(columns=2)
+        self.table = Gtk.Table(columns=2)
         self.table.set_border_width(12)
         self.table.set_row_spacings(6)
         self.table.set_col_spacings(6)
@@ -46,16 +41,17 @@
         treeview.set_headers_visible(False)
         treeview.set_model(self.model)
         treeview.connect("row-activated", self.row_selected)
+        treeview.connect("cursor-changed", self.row_selected)
 
-        cell = gtk.CellRendererText()
-        column = gtk.TreeViewColumn()
-        column.pack_start(cell, expand=True)
+        cell = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn()
+        column.pack_start(cell, True)
         column.add_attribute(cell, "text", 0)
         treeview.append_column(column)
 
-        cell = gtk.CellRendererText()
-        column = gtk.TreeViewColumn()
-        column.pack_start(cell, expand=True)
+        cell = Gtk.CellRendererText()
+        column = Gtk.TreeViewColumn()
+        column.pack_start(cell, True)
         column.add_attribute(cell, "text", 1)
         treeview.append_column(column)
 
@@ -66,13 +62,16 @@
         for name in plugin_names:
             self.model.append([name, getattr(plugins[name], '__file__', None)])
 
-        scrolledwindow = gtk.ScrolledWindow()
-        scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        scrolledwindow = Gtk.ScrolledWindow()
+        scrolledwindow.set_policy(
+            Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
         scrolledwindow.add_with_viewport(self.table)
         self.pack2(scrolledwindow, resize=False, shrink=True)
         self.show()
 
-    def row_selected(self, tv, path, tvc):
+    def row_selected(self, tv, path=None, tvc=None):
+        if path is None:
+            (path, focus) = tv.get_cursor()
         import bzrlib
         p = bzrlib.plugin.plugins()[self.model[path][0]].module
         from inspect import getdoc
@@ -81,45 +80,43 @@
             self.table.remove(w)
 
         if getattr(p, '__author__', None) is not None:
-            align = gtk.Alignment(0.0, 0.5)
-            label = gtk.Label()
+            align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+            label = Gtk.Label()
             label.set_markup("<b>Author:</b>")
             align.add(label)
-            self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
+            self.table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
             align.show()
             label.show()
 
-            align = gtk.Alignment(0.0, 0.5)
-            author = gtk.Label()
+            align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+            author = Gtk.Label()
             author.set_text(p.__author__)
             author.set_selectable(True)
             align.add(author)
-            self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+            self.table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         if getattr(p, '__version__', None) is not None:
-            align = gtk.Alignment(0.0, 0.5)
-            label = gtk.Label()
+            align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+            label = Gtk.Label()
             label.set_markup("<b>Version:</b>")
             align.add(label)
-            self.table.attach(align, 0, 1, 0, 1, gtk.FILL, gtk.FILL)
+            self.table.attach(align, 0, 1, 0, 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
             align.show()
             label.show()
 
-            align = gtk.Alignment(0.0, 0.5)
-            author = gtk.Label()
+            align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+            author = Gtk.Label()
             author.set_text(p.__version__)
             author.set_selectable(True)
             align.add(author)
-            self.table.attach(align, 1, 2, 0, 1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+            self.table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         if getdoc(p) is not None:
-            align = gtk.Alignment(0.0, 0.5)
-            description = gtk.Label()
+            align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+            description = Gtk.Label()
             description.set_text(getdoc(p))
             description.set_selectable(True)
             align.add(description)
-            self.table.attach(align, 0, 2, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
+            self.table.attach(align, 0, 2, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         self.table.show_all()
-
-

=== modified file 'push.py'
--- push.py	2011-04-10 18:44:39 +0000
+++ push.py	2011-09-08 03:12:25 +0000
@@ -15,13 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
+from gi.repository import GObject
+from gi.repository import Gtk
 
 from errors import show_bzr_error
 
@@ -36,15 +31,15 @@
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class PushDialog(gtk.Dialog):
+class PushDialog(Gtk.Dialog):
     """New implementation of the Push dialog."""
 
     def __init__(self, repository, revid, branch=None, parent=None):
         """Initialize the Push dialog. """
-        gtk.Dialog.__init__(self, title="Push",
-                                  parent=parent,
-                                  flags=0,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(PushDialog, self).__init__(
+            title="Push", parent=parent, flags=0,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
+
 
         # Get arguments
         self.repository = repository
@@ -52,10 +47,10 @@
         self.branch = branch
 
         # Create the widgets
-        self._label_location = gtk.Label(_i18n("Location:"))
-        self._combo = gtk.ComboBoxEntry()
-        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
-        self._hbox_location = gtk.HBox()
+        self._label_location = Gtk.Label(label=_i18n("Location:"))
+        self._combo = Gtk.ComboBox.new_with_entry()
+        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
+        self._hbox_location = Gtk.HBox()
 
         # Set callbacks
         self._button_push.connect('clicked', self._on_push_clicked)
@@ -63,16 +58,18 @@
         # Set properties
         self._label_location.set_alignment(0, 0.5)
         self._hbox_location.set_spacing(3)
-        self.vbox.set_spacing(3)
+        self.get_content_area().set_spacing(3)
 
         # Pack widgets
-        self._hbox_location.pack_start(self._label_location, False, False)
-        self._hbox_location.pack_start(self._combo, True, True)
-        self.vbox.pack_start(self._hbox_location)
-        self.action_area.pack_end(self._button_push)
+        self._hbox_location.pack_start(
+            self._label_location, False, False, 0)
+        self._hbox_location.pack_start(self._combo, True, True, 0)
+        self.get_content_area().pack_start(self._hbox_location, True, True, 0)
+        # XXX sinzui 2011-08-12: maybe False, False, 0
+        self.get_action_area().pack_end(self._button_push, True, True, 0)
 
         # Show the dialog
-        self.vbox.show_all()
+        self.get_content_area().show_all()
 
         # Build location history
         self._history = UrlHistory(self.branch.get_config(), 'push_history')
@@ -80,11 +77,11 @@
 
     def _build_history(self):
         """Build up the location history. """
-        self._combo_model = gtk.ListStore(str)
+        self._combo_model = Gtk.ListStore(str)
         for item in self._history.get_entries():
             self._combo_model.append([ item ])
         self._combo.set_model(self._combo_model)
-        self._combo.set_text_column(0)
+        self._combo.set_entry_text_column(0)
 
         if self.branch is not None:
             location = self.branch.get_push_location()
@@ -102,7 +99,7 @@
         except errors.DivergedBranches:
             response = question_dialog(_i18n('Branches have been diverged'),
                                        _i18n('You cannot push if branches have diverged.\nOverwrite?'))
-            if response == gtk.RESPONSE_YES:
+            if response == Gtk.ResponseType.YES:
                 revs = do_push(self.branch, location=location, overwrite=True)
 
         if self.branch is not None and self.branch.get_push_location() is None:
@@ -112,7 +109,7 @@
         info_dialog(_i18n('Push successful'),
                     _i18n("%d revision(s) pushed.") % revs)
 
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)
 
 
 def do_push(br_from, location, overwrite):
@@ -143,7 +140,7 @@
         except errors.NoSuchFile:
             response = question_dialog(_i18n('Non existing parent directory'),
                          _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
-            if response == gtk.RESPONSE_OK:
+            if response == Gtk.ResponseType.OK:
                 transport.create_prefix()
             else:
                 return

=== modified file 'revbrowser.py'
--- revbrowser.py	2011-04-10 18:44:39 +0000
+++ revbrowser.py	2011-09-08 03:12:25 +0000
@@ -14,32 +14,25 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gobject
-import gtk
+from gi.repository import Gtk
 
 from bzrlib.plugins.gtk.branchview.treeview import TreeView
 from bzrlib.plugins.gtk.i18n import _i18n
 
 
-class RevisionBrowser(gtk.Dialog):
+class RevisionBrowser(Gtk.Dialog):
     """ Revision Browser main window. """
     def __init__(self, branch, parent=None):
-        gtk.Dialog.__init__(self, title="Revision Browser - Olive",
-                                  parent=parent,
-                                  flags=gtk.DIALOG_MODAL,
-                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+        super(RevisionBrowser, self).__init__(
+            title="Revision Browser - Olive", parent=parent,
+            flags=Gtk.DialogFlags.MODAL,
+            buttons=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL))
 
         # Get arguments
         self.branch = branch
 
         # Create the widgets
-        self._button_select = gtk.Button(_i18n("_Select"), use_underline=True)
+        self._button_select = Gtk.Button(_i18n("_Select"), use_underline=True)
         start_revs = [branch.last_revision(),]
         self.treeview = TreeView(branch, start_revs, None)
 
@@ -50,15 +43,15 @@
 
         # Set properties
         self.set_default_size(600, 400)
-        self.vbox.set_spacing(3)
+        self.get_content_area().set_spacing(3)
         self.treeview.set_property('graph-column-visible', False)
         self.treeview.set_property('date-column-visible', True)
         self.treeview.set_property('mainline-only', True)
 
         # Construct the dialog
-        self.action_area.pack_end(self._button_select)
+        self.action_area.pack_end(self._button_select, False, False, 0)
 
-        self.vbox.pack_start(self.treeview, True, True)
+        self.get_content_area().pack_start(self.treeview, True, True, 0)
 
         # Show the dialog
         self.show_all()
@@ -74,4 +67,4 @@
         self.selected_revno = self.treeview.get_property('revision-number')
         self.selected_revid = \
                     self.treeview.get_property('revision').revision_id
-        self.response(gtk.RESPONSE_OK)
+        self.response(Gtk.ResponseType.OK)

=== modified file 'revidbox.py'
--- revidbox.py	2011-03-14 20:12:19 +0000
+++ revidbox.py	2011-09-08 03:12:25 +0000
@@ -15,23 +15,17 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-
-class RevisionSelectionBox(gtk.HBox):
+from gi.repository import Gtk
+
+class RevisionSelectionBox(Gtk.HBox):
 
     def __init__(self, branch):
         super(RevisionSelectionBox, self).__init__()
         self._branch = branch
-        self._entry_revid = gtk.Entry()
-        self._button_revid = gtk.Button('')
-        self._button_revid.set_image(gtk.image_new_from_stock(
-            gtk.STOCK_OPEN, gtk.ICON_SIZE_BUTTON))
+        self._entry_revid = Gtk.Entry()
+        self._button_revid = Gtk.Button('')
+        self._button_revid.set_image(Gtk.Image.new_from_stock(
+            Gtk.STOCK_OPEN, Gtk.IconSize.BUTTON))
         self.pack_start(self._entry_revid, True, True)
         self.pack_start(self._button_revid, False, False)
 
@@ -45,10 +39,10 @@
         # JRV 20070715
         revb = RevisionBrowser(self._branch)
         response = revb.run()
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             revb.hide()
 
-            if response == gtk.RESPONSE_OK:
+            if response == Gtk.ResponseType.OK:
                 if revb.selected_revno is not None:
                     self._entry_revid.set_text(revb.selected_revid)
 

=== modified file 'revisionmenu.py'
--- revisionmenu.py	2011-03-14 20:12:19 +0000
+++ revisionmenu.py	2011-09-08 03:12:25 +0000
@@ -15,24 +15,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Simple popup menu for revisions."""
 
-try:
-    import pygtk
-    pygtk.require("2.0")
-except:
-    pass
-
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 from bzrlib import ui
 from bzrlib.revision import NULL_REVISION
 
-class RevisionMenu(gtk.Menu):
+class RevisionMenu(Gtk.Menu):
 
     __gsignals__ = {
             'tag-added': (
-                gobject.SIGNAL_RUN_FIRST,
-                gobject.TYPE_NONE,
-                (gobject.TYPE_STRING, gobject.TYPE_STRING)
+                GObject.SignalFlags.RUN_FIRST,
+                None,
+                (GObject.TYPE_STRING, GObject.TYPE_STRING)
             )
     }
 
@@ -53,28 +47,29 @@
 
     def create_items(self):
         if len(self.revids) == 1:
-            item = gtk.MenuItem("View _Changes")
+            item = Gtk.MenuItem.new_with_mnemonic("View _Changes")
             item.connect('activate', self.show_diff)
             self.append(item)
 
-            item = gtk.MenuItem("_Push")
+            item = Gtk.MenuItem.new_with_mnemonic("_Push")
             item.connect('activate', self.show_push)
             self.append(item)
 
-            item = gtk.MenuItem("_Tag Revision")
+            item = Gtk.MenuItem.new_with_mnemonic("_Tag Revision")
             item.connect('activate', self.show_tag)
             self.append(item)
 
-            item = gtk.MenuItem("_Merge Directive")
+            item = Gtk.MenuItem.new_with_mnemonic("_Merge Directive")
             item.connect('activate', self.store_merge_directive)
             # FIXME: self.append(item)
 
-            item = gtk.MenuItem("_Send Merge Directive")
+            item = Gtk.MenuItem.new_with_mnemonic("_Send Merge Directive")
             item.connect('activate', self.send_merge_directive)
             self.append(item)
 
             if self.wt:
-                item = gtk.MenuItem("_Revert to this revision")
+                item = Gtk.MenuItem.new_with_mnemonic(
+                    "_Revert to this revision")
                 item.connect('activate', self.revert)
                 self.append(item)
 
@@ -89,7 +84,7 @@
         from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
         from cStringIO import StringIO
         window = SendMergeDirectiveDialog(self.branch, self.revids[0])
-        if window.run() == gtk.RESPONSE_OK:
+        if window.run() == Gtk.ResponseType.OK:
             outf = StringIO()
             outf.writelines(window.get_merge_directive().to_lines())
             mail_client = self.branch.get_config().get_mail_client()
@@ -115,7 +110,7 @@
         dialog = PushDialog(self.repository, self.revids[0], self.branch)
         response = dialog.run()
 
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             dialog.destroy()
 
     def show_tag(self, item):
@@ -123,10 +118,10 @@
         dialog = AddTagDialog(self.repository, self.revids[0], self.branch)
         response = dialog.run()
 
-        if response != gtk.RESPONSE_NONE:
+        if response != Gtk.ResponseType.NONE:
             dialog.hide()
 
-            if response == gtk.RESPONSE_OK:
+            if response == Gtk.ResponseType.OK:
                 self.emit('tag-added', dialog.tagname, dialog._revid)
 
             dialog.destroy()

=== modified file 'revisionview.py'
--- revisionview.py	2011-03-14 20:12:19 +0000
+++ revisionview.py	2011-09-08 03:12:25 +0000
@@ -15,11 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import pygtk
-pygtk.require("2.0")
-import gtk
-import pango
-import gobject
+from gi.repository import Gtk
+from gi.repository import Pango
+from gi.repository import GObject
 import webbrowser
 
 from bzrlib import trace
@@ -53,34 +51,31 @@
             webbrowser._tryorder.insert(0, '%s "%%s"' % cmd)
     webbrowser.open(uri)
 
-if getattr(gtk, 'link_button_set_uri_hook', None) is not None:
-    # Not available before PyGtk-2.10
-    gtk.link_button_set_uri_hook(_open_link)
 
-class BugsTab(gtk.VBox):
+class BugsTab(Gtk.VBox):
 
     def __init__(self):
-        super(BugsTab, self).__init__(False, 6)
+        super(BugsTab, self).__init__(homogeneous=False, spacing=6)
 
-        table = gtk.Table(rows=2, columns=2)
+        table = Gtk.Table(rows=2, columns=2)
 
         table.set_row_spacings(6)
         table.set_col_spacing(0, 16)
 
-        image = gtk.Image()
+        image = Gtk.Image()
         image.set_from_file(icon_path("bug.png"))
-        table.attach(image, 0, 1, 0, 1, gtk.FILL)
+        table.attach(image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.1)
-        self.label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.1, 0, 0)
+        self.label = Gtk.Label()
         align.add(self.label)
-        table.attach(align, 1, 2, 0, 1, gtk.FILL)
+        table.attach(align, 1, 2, 0, 1, Gtk.AttachOptions.FILL)
 
         treeview = self.construct_treeview()
-        table.attach(treeview, 1, 2, 1, 2, gtk.FILL | gtk.EXPAND)
+        table.attach(treeview, 1, 2, 1, 2, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND)
 
         self.set_border_width(6)
-        self.pack_start(table, expand=False)
+        self.pack_start(table, False, True, 0)
 
         self.clear()
         self.show_all()
@@ -108,18 +103,18 @@
                               "%d %s." % (self.num_bugs, label))
 
     def construct_treeview(self):
-        self.bugs = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
-        self.treeview = gtk.TreeView(self.bugs)
+        self.bugs = Gtk.ListStore(GObject.TYPE_STRING, GObject.TYPE_STRING)
+        self.treeview = Gtk.TreeView(model=self.bugs)
         self.treeview.set_headers_visible(False)
 
-        uri_column = gtk.TreeViewColumn('Bug URI', gtk.CellRendererText(), text=0)
+        uri_column = Gtk.TreeViewColumn('Bug URI', Gtk.CellRendererText(), text=0)
         self.treeview.append_column(uri_column)
 
         self.treeview.connect('row-activated', self.on_row_activated)
 
-        win = gtk.ScrolledWindow()
-        win.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
-        win.set_shadow_type(gtk.SHADOW_IN)
+        win = Gtk.ScrolledWindow()
+        win.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
+        win.set_shadow_type(Gtk.ShadowType.IN)
         win.add(self.treeview)
 
         return win
@@ -144,65 +139,65 @@
         _open_link(self, uri)
 
 
-class SignatureTab(gtk.VBox):
+class SignatureTab(Gtk.VBox):
 
     def __init__(self, repository):
         self.key = None
         self.revision = None
         self.repository = repository
 
-        super(SignatureTab, self).__init__(False, 6)
-        signature_box = gtk.Table(rows=3, columns=3)
+        super(SignatureTab, self).__init__(homogeneous=False, spacing=6)
+        signature_box = Gtk.Table(rows=3, columns=3)
         signature_box.set_col_spacing(0, 16)
         signature_box.set_col_spacing(1, 12)
         signature_box.set_row_spacings(6)
 
-        self.signature_image = gtk.Image()
-        signature_box.attach(self.signature_image, 0, 1, 0, 1, gtk.FILL)
+        self.signature_image = Gtk.Image()
+        signature_box.attach(self.signature_image, 0, 1, 0, 1, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.1)
-        self.signature_label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.1, 0.0, 0.0)
+        self.signature_label = Gtk.Label()
         align.add(self.signature_label)
-        signature_box.attach(align, 1, 3, 0, 1, gtk.FILL)
+        signature_box.attach(align, 1, 3, 0, 1, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_key_id_label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_key_id_label = Gtk.Label()
         self.signature_key_id_label.set_markup("<b>Key Id:</b>")
         align.add(self.signature_key_id_label)
-        signature_box.attach(align, 1, 2, 1, 2, gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 1, 2, 1, 2, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_key_id = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_key_id = Gtk.Label()
         self.signature_key_id.set_selectable(True)
         align.add(self.signature_key_id)
-        signature_box.attach(align, 2, 3, 1, 2, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 2, 3, 1, 2, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_fingerprint_label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_fingerprint_label = Gtk.Label()
         self.signature_fingerprint_label.set_markup("<b>Fingerprint:</b>")
         align.add(self.signature_fingerprint_label)
-        signature_box.attach(align, 1, 2, 2, 3, gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 1, 2, 2, 3, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_fingerprint = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_fingerprint = Gtk.Label()
         self.signature_fingerprint.set_selectable(True)
         align.add(self.signature_fingerprint)
-        signature_box.attach(align, 2, 3, 2, 3, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 2, 3, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_trust_label = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_trust_label = Gtk.Label()
         self.signature_trust_label.set_markup("<b>Trust:</b>")
         align.add(self.signature_trust_label)
-        signature_box.attach(align, 1, 2, 3, 4, gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 1, 2, 3, 4, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
-        align = gtk.Alignment(0.0, 0.5)
-        self.signature_trust = gtk.Label()
+        align = Gtk.Alignment.new(0.0, 0.5, 0.0, 0.0)
+        self.signature_trust = Gtk.Label()
         self.signature_trust.set_selectable(True)
         align.add(self.signature_trust)
-        signature_box.attach(align, 2, 3, 3, 4, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        signature_box.attach(align, 2, 3, 3, 4, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
 
         self.set_border_width(6)
-        self.pack_start(signature_box, expand=False)
+        self.pack_start(signature_box, False, True, 0)
         self.show_all()
 
     def set_revision(self, revision):
@@ -292,7 +287,7 @@
         self.signature_trust.set_text('This key is ' + trust_text)
 
 
-class RevisionView(gtk.Notebook):
+class RevisionView(Gtk.Notebook):
     """ Custom widget for commit log details.
 
     A variety of bzr tools may need to implement such a thing. This is a
@@ -301,36 +296,36 @@
 
     __gproperties__ = {
         'branch': (
-            gobject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
             'Branch',
             'The branch holding the revision being displayed',
-            gobject.PARAM_CONSTRUCT_ONLY | gobject.PARAM_WRITABLE
+            GObject.PARAM_CONSTRUCT_ONLY | GObject.PARAM_WRITABLE
         ),
 
         'revision': (
-            gobject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
             'Revision',
             'The revision being displayed',
-            gobject.PARAM_READWRITE
+            GObject.PARAM_READWRITE
         ),
 
         'children': (
-            gobject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
             'Children',
             'Child revisions',
-            gobject.PARAM_READWRITE
+            GObject.PARAM_READWRITE
         ),
 
         'file-id': (
-            gobject.TYPE_PYOBJECT,
+            GObject.TYPE_PYOBJECT,
             'File Id',
             'The file id',
-            gobject.PARAM_READWRITE
+            GObject.PARAM_READWRITE
         )
     }
 
     def __init__(self, branch=None, repository=None):
-        gtk.Notebook.__init__(self)
+        super(RevisionView, self).__init__()
 
         self._revision = None
         self._branch = branch
@@ -338,6 +333,7 @@
             self._repository = branch.repository
         else:
             self._repository = repository
+        self.signature_table = None
 
         self._create_general()
         self._create_relations()
@@ -477,6 +473,8 @@
         self._add_tags()
 
     def _update_signature(self, widget, param):
+        if not has_seahorse:
+            return
         if self.get_current_page() == PAGE_SIGNATURE:
             self.signature_table.set_revision(self._revision)
 
@@ -491,6 +489,8 @@
                                       self.children_table)
 
     def _switch_page_cb(self, notebook, page, page_num):
+        if not has_seahorse:
+            return
         if page_num == PAGE_SIGNATURE:
             self.signature_table.set_revision(self._revision)
 
@@ -530,212 +530,213 @@
         table.resize(max(len(revids), 1), 2)
 
         for idx, revid in enumerate(revids):
-            align = gtk.Alignment(0.0, 0.0, 1, 1)
+            align = Gtk.Alignment.new(0.0, 0.0, 1, 1)
             widgets.append(align)
             table.attach(align, 1, 2, idx, idx + 1,
-                                      gtk.EXPAND | gtk.FILL, gtk.FILL)
+                                      Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL)
             align.show()
 
-            hbox = gtk.HBox(False, spacing=6)
+            hbox = Gtk.HBox(homogeneous=False, spacing=6)
             align.add(hbox)
             hbox.show()
 
-            image = gtk.Image()
+            image = Gtk.Image()
             image.set_from_stock(
-                gtk.STOCK_FIND, gtk.ICON_SIZE_SMALL_TOOLBAR)
+                Gtk.STOCK_FIND, Gtk.IconSize.SMALL_TOOLBAR)
             image.show()
 
             if self._show_callback is not None:
-                button = gtk.Button()
+                button = Gtk.Button()
                 button.add(image)
                 button.connect("clicked", self._show_clicked_cb,
                                self._revision.revision_id, revid)
-                hbox.pack_start(button, expand=False, fill=True)
+                hbox.pack_start(button, False, True, 0)
                 button.show()
 
-            button = gtk.Button()
-            revid_label = gtk.Label(str(revid))
-            revid_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
+            button = Gtk.Button()
+            revid_label = Gtk.Label(label=str(revid))
+            revid_label.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
             revid_label.set_alignment(0.0, 0.5)
             button.add(revid_label)
             button.connect("clicked",
-                    lambda w, r: self.set_revision(self._repository.get_revision(r)), revid)
+                    lambda w, r: self.set_revision(
+                        self._repository.get_revision(r)), revid)
             button.set_use_underline(False)
-            hbox.pack_start(button, expand=True, fill=True)
+            hbox.pack_start(button, True, True, 0)
             button.show_all()
 
     def _create_general(self):
-        vbox = gtk.VBox(False, 6)
+        vbox = Gtk.VBox(homogeneous=False, spacing=6)
         vbox.set_border_width(6)
-        vbox.pack_start(self._create_headers(), expand=False, fill=True)
-        vbox.pack_start(self._create_message_view())
-        self.append_page(vbox, tab_label=gtk.Label("General"))
+        vbox.pack_start(self._create_headers(), False, True, 0)
+        vbox.pack_start(self._create_message_view(), True, True, 0)
+        self.append_page(vbox, Gtk.Label(label="General"))
         vbox.show()
 
     def _create_relations(self):
-        vbox = gtk.VBox(False, 6)
+        vbox = Gtk.VBox(homogeneous=False, spacing=6)
         vbox.set_border_width(6)
-        vbox.pack_start(self._create_parents(), expand=False, fill=True)
-        vbox.pack_start(self._create_children(), expand=False, fill=True)
-        self.append_page(vbox, tab_label=gtk.Label("Relations"))
+        vbox.pack_start(self._create_parents(), False, True, 0)
+        vbox.pack_start(self._create_children(), False, True, 0)
+        self.append_page(vbox, Gtk.Label(label="Relations"))
         vbox.show()