[Pkg-bazaar-commits] ./bzr-gtk/unstable r155: Fix a couple of smaller bugs.
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:45:40 UTC 2009
------------------------------------------------------------
revno: 155
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sat 2007-02-03 16:24:48 +0100
message:
Fix a couple of smaller bugs.
modified:
olive-gtk
olive/__init__.py
olive/mkdir.py
-------------- next part --------------
=== modified file 'olive-gtk'
--- a/olive-gtk 2007-02-03 10:25:09 +0000
+++ b/olive-gtk 2007-02-03 15:24:48 +0000
@@ -78,8 +78,6 @@
print >>sys.stderr, "Can't find bzrlib location"
sys.exit(1)
-
-from olive import OliveGtk
from bzrlib.plugin import load_plugins
load_plugins()
@@ -87,5 +85,6 @@
import ui
bzrlib.ui.ui_factory = ui.GtkUIFactory()
+from olive import OliveGtk
app = OliveGtk()
gtk.main()
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py 2007-02-03 15:04:56 +0000
+++ b/olive/__init__.py 2007-02-03 15:24:48 +0000
@@ -52,11 +52,8 @@
def __init__(self):
self.toplevel = gtk.glade.XML(GLADEFILENAME, 'window_main', 'olive-gtk')
-
self.window = self.toplevel.get_widget('window_main')
-
self.pref = Preferences()
-
self.path = None
# Initialize the statusbar
@@ -258,6 +255,7 @@
merge = MergeDialog(self.wt, self.wtpath)
merge.display()
+ @show_bzr_error
def on_menuitem_branch_missing_revisions_activate(self, widget):
""" Branch/Missing revisions menu handler. """
local_branch = self.wt.branch
=== modified file 'olive/mkdir.py'
--- a/olive/mkdir.py 2007-02-03 14:18:57 +0000
+++ b/olive/mkdir.py 2007-02-03 15:24:48 +0000
@@ -30,6 +30,8 @@
from bzrlib.plugins.gtk.dialog import error_dialog, warning_dialog
from guifiles import GLADEFILENAME
+from bzrlib.plugins.gtk.errors import show_bzr_error
+
class OliveMkdir:
""" Display the Make directory dialog and perform the needed actions. """
More information about the Pkg-bazaar-commits
mailing list