/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to nautilus-bzr.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-02 11:11:06 UTC
  • mfrom: (734.1.55 gtk3)
  • Revision ID: jelmer@samba.org-20111102111106-7l0vso8eg24dpf87
Merge gtk3 support from Curtis.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nautilus-bzr.py
6
6
#
7
7
# Published under the GNU GPL
8
8
 
9
 
import gtk
 
9
from gi.repository import Gtk
10
10
import nautilus
11
11
from bzrlib.branch import Branch
12
12
from bzrlib.bzrdir import BzrDir
143
143
        
144
144
        dialog = BranchDialog(vfs_file.get_name())
145
145
        response = dialog.run()
146
 
        if response != gtk.RESPONSE_NONE:
 
146
        if response != Gtk.ResponseType.NONE:
147
147
            dialog.hide()
148
148
            dialog.destroy()
149
149
 
171
171
        from bzrlib.plugins.gtk.commit import CommitDialog
172
172
        dialog = CommitDialog(tree, path)
173
173
        response = dialog.run()
174
 
        if response != gtk.RESPONSE_NONE:
 
174
        if response != Gtk.ResponseType.NONE:
175
175
            dialog.hide()
176
176
            dialog.destroy()
177
177
 
190
190
 
191
191
        pp = start_viz_window(branch, [branch.last_revision()])
192
192
        pp.show()
193
 
        gtk.main()
 
193
        Gtk.main()
194
194
 
195
195
    def pull_cb(self, menu, vfs_file):
196
196
        # We can only cope with local files
208
208
        from bzrlib.plugins.gtk.pull import PullDialog
209
209
        dialog = PullDialog(tree, path)
210
210
        dialog.display()
211
 
        gtk.main()
 
211
        Gtk.main()
212
212
 
213
213
    def merge_cb(self, menu, vfs_file):
214
214
        # We can only cope with local files