Fix some absolute imports, show errors in notify using a graphical
dialog.
Cheers,
Jelmer
--
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: ../upstream
# testament_sha1: b8bc96336e95377fe8e4baf4043c90f754bc8580
# timestamp: 2008-07-18 22:42:39 +0200
# base_revision_id: [EMAIL PROTECTED]
#
# Begin patch
=== modified file 'about.py'
--- about.py 2008-07-04 08:05:17 +0000
+++ about.py 2008-07-18 20:12:54 +0000
@@ -33,7 +33,7 @@
def read_license():
license_paths = [data_path("COPYING"), "/usr/share/common-licenses/GPL-2"]
for license_file in license_paths:
- if os.path.exists(license_file):
+ if license_file is not None and os.path.exists(license_file):
return file(license_file).read()
# Fall back to just license name if we can't find the file
return "GPLv2 or later"
=== modified file 'bzr-notify'
--- bzr-notify 2008-06-27 17:10:27 +0000
+++ bzr-notify 2008-07-18 20:01:12 +0000
@@ -11,7 +11,7 @@
from bzrlib.plugins.gtk import open_display, icon_path
-from notify import NotifyPopupMenu
+from bzrlib.plugins.gtk.notify import NotifyPopupMenu
gtk = open_display()
menu = NotifyPopupMenu()
icon = gtk.status_icon_new_from_file(icon_path("bzr-icon-64.png"))
=== modified file 'notify.py'
--- notify.py 2007-07-15 15:13:34 +0000
+++ notify.py 2008-07-18 20:19:45 +0000
@@ -74,12 +74,12 @@
self.zeroconfserver.close()
def show_about(self, item):
- from about import AboutDialog
+ from bzrlib.plugins.gtk.about import AboutDialog
dialog = AboutDialog()
dialog.run()
def show_preferences(self, item):
- from preferences import PreferencesWindow
+ from bzrlib.plugins.gtk.preferences import PreferencesWindow
prefs = PreferencesWindow()
prefs.run()
# Begin bundle
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
66KQ
--
bzr-gtk mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.canonical.com/mailman/listinfo/bzr-gtk
