[Pkg-bazaar-commits] ./bzr-gtk/unstable r555: Merge small fixes to imports and license path finding

[Jasper Groenewegen]

------------------------------------------------------------
revno: 555
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Sun 2008-07-20 10:39:03 +0200
message:
  Merge small fixes to imports and license path finding
modified:
  about.py
  bzr-notify
  notify.py
    ------------------------------------------------------------
    revno: 553.1.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-07-18 22:01:12 +0200
    message:
      Fix notify import.
    modified:
      bzr-notify
    ------------------------------------------------------------
    revno: 553.1.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-07-18 22:12:54 +0200
    message:
      Fix license path finding.
    modified:
      about.py
    ------------------------------------------------------------
    revno: 553.1.3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Fri 2008-07-18 22:19:45 +0200
    message:
      Use absolute imports.
    modified:
      notify.py
-------------- next part --------------
=== modified file 'about.py'
--- a/about.py	2008-07-04 08:05:17 +0000
+++ b/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'
--- a/bzr-notify	2008-06-27 17:10:27 +0000
+++ b/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'
--- a/notify.py	2007-07-15 15:13:34 +0000
+++ b/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()