[Pkg-bazaar-commits] ./bzr-gtk/unstable r636: New upstream snapshot.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 636
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Tue 2009-03-10 15:07:00 +0100
message:
  New upstream snapshot.
modified:
  NEWS
  bzr-notify
  debian/changelog
  revisionview.py
    ------------------------------------------------------------
    revno: 621.7.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Mon 2009-01-19 22:28:47 +0100
    message:
      Hide branch nick field rather if there is no branch nick property 
      set on a revision rather than showing an empty field.
    modified:
      revisionview.py
    ------------------------------------------------------------
    revno: 621.1.9
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: trunk
    timestamp: Sat 2009-03-07 21:36:26 +0100
    message:
      Merge tweak to revisionview tab in viz to hide the branch nick when not available (for example in bzr-svn branches)
    modified:
      revisionview.py
    ------------------------------------------------------------
    revno: 621.1.10
    committer: Jasper Groenewegen <colbrac at xs4all.nl>
    branch nick: trunk
    timestamp: Sat 2009-03-07 21:46:25 +0100
    message:
      Merge fix for bzr-notify (import gobject for timeout)
    modified:
      NEWS
      bzr-notify
        ------------------------------------------------------------
        revno: 621.8.1
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr-gtk
        timestamp: Fri 2009-02-27 19:07:13 +0000
        message:
          Import gobject in bzr-notify, as it is used there to set a timeout.
        modified:
          NEWS
          bzr-notify
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-02-27 01:28:30 +0000
+++ b/NEWS	2009-02-27 19:07:13 +0000
@@ -90,6 +90,8 @@
   
   * Handle unreadable .bzr subfolder in Olive. (Jasper Groenewegen, #229044)
 
+  * Import gobject in bzr-notify, as it is used there to set a timeout. (James Westby)
+
  CHANGES
 
   * Moved notify icon code to separate script. (Jelmer Vernooij)

=== modified file 'bzr-notify'
--- a/bzr-notify	2009-02-26 17:28:45 +0000
+++ b/bzr-notify	2009-02-27 19:07:13 +0000
@@ -21,6 +21,7 @@
 import cgi
 import dbus
 import dbus.service
+import gobject
 import pynotify
 from bzrlib.bzrdir import BzrDir
 from bzrlib import errors

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-02-27 17:27:32 +0000
+++ b/debian/changelog	2009-03-10 14:07:00 +0000
@@ -1,3 +1,9 @@
+bzr-gtk (0.95.0+bzr631-1) unstable; urgency=low
+
+  * New upstream snapshot.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Tue, 10 Mar 2009 15:05:39 +0100
+
 bzr-gtk (0.95.0+bzr629-1) experimental; urgency=low
 
   * New usptream snapshot.

=== modified file 'revisionview.py'
--- a/revisionview.py	2008-11-13 06:55:41 +0000
+++ b/revisionview.py	2009-01-19 21:28:47 +0000
@@ -416,9 +416,12 @@
             self.timestamp.set_text(format_date(revision.timestamp,
                                                 revision.timezone))
         try:
-            self.branchnick_label.set_text(revision.properties['branch-nick'])
+            self.branchnick.show()
+            self.branchnick_label.show()
+            self.branchnick.set_text(revision.properties['branch-nick'])
         except KeyError:
-            self.branchnick_label.set_text("")
+            self.branchnick.hide()
+            self.branchnick_label.hide()
 
         self._add_parents_or_children(revision.parent_ids,
                                       self.parents_widgets,
@@ -623,19 +626,19 @@
         self.committer.show()
 
         row += 1
-        label = gtk.Label()
-        label.set_alignment(1.0, 0.5)
-        label.set_markup("<b>Branch nick:</b>")
-        self.table.attach(label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
-        label.show()
-
         self.branchnick_label = gtk.Label()
-        self.branchnick_label.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
-        self.branchnick_label.set_alignment(0.0, 0.5)
-        self.branchnick_label.set_selectable(True)
-        self.table.attach(self.branchnick_label, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.branchnick_label.set_alignment(1.0, 0.5)
+        self.branchnick_label.set_markup("<b>Branch nick:</b>")
+        self.table.attach(self.branchnick_label, 0, 1, row, row+1, gtk.FILL, gtk.FILL)
         self.branchnick_label.show()
 
+        self.branchnick = gtk.Label()
+        self.branchnick.set_ellipsize(pango.ELLIPSIZE_MIDDLE)
+        self.branchnick.set_alignment(0.0, 0.5)
+        self.branchnick.set_selectable(True)
+        self.table.attach(self.branchnick, 1, 2, row, row+1, gtk.EXPAND | gtk.FILL, gtk.FILL)
+        self.branchnick.show()
+
         row += 1
         label = gtk.Label()
         label.set_alignment(1.0, 0.5)