Rev 555: Merge trunk. in http://people.ubuntu.com/~robertc/baz2.0/plugins/gtk/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/gtk/trunk

------------------------------------------------------------
revno: 555
revision-id: robertc at robertcollins.net-20080719115854-elqgnbgs2hyinkx3
parent: colbrac at xs4all.nl-20080718182539-h65s9vgvq2zrxhbs
parent: jelmer at samba.org-20080718201945-85lowjdgx1d9ds82
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Sat 2008-07-19 21:58:54 +1000
message:
  Merge trunk.
modified:
  about.py                       about.py-20070715145104-2ihlkw9xgrwj7i3d-1
  bzr-notify                     bzrnotify-20080627170430-4b539wovvj4cgljp-1
  notify.py                      notify.py-20070713203101-vymtmaj9t9b95z99-1
    ------------------------------------------------------------
    revno: 553.1.3
    revision-id: jelmer at samba.org-20080718201945-85lowjdgx1d9ds82
    parent: jelmer at samba.org-20080718201254-phkice8vdvr2svvm
    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                      notify.py-20070713203101-vymtmaj9t9b95z99-1
    ------------------------------------------------------------
    revno: 553.1.2
    revision-id: jelmer at samba.org-20080718201254-phkice8vdvr2svvm
    parent: jelmer at samba.org-20080718200112-zh96tadh9o103vru
    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                       about.py-20070715145104-2ihlkw9xgrwj7i3d-1
    ------------------------------------------------------------
    revno: 553.1.1
    revision-id: jelmer at samba.org-20080718200112-zh96tadh9o103vru
    parent: jelmer at samba.org-20080718151921-lzf632mlqhups3io
    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                     bzrnotify-20080627170430-4b539wovvj4cgljp-1
=== 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()