[Pkg-bazaar-commits] ./bzr-gtk/unstable r410: Merged with mainline.

[Daniel Schierbeck]

------------------------------------------------------------
revno: 410
committer: Daniel Schierbeck <daniel.schierbeck at gmail.com>
branch nick: menubar
timestamp: Thu 2007-11-29 00:26:02 +0100
message:
  Merged with mainline.
modified:
  NEWS
  olive.glade
    ------------------------------------------------------------
    revno: 330.6.5
    author: Kiddo <nekohayo at gmail.com>
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2007-11-28 19:00:03 +0100
    message:
      Make toolbars follow GNOME standards.
    modified:
      NEWS
      olive.glade
    ------------------------------------------------------------
    revno: 330.6.6
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Wed 2007-11-28 19:06:57 +0100
    message:
      Merge ability to view first revision.
    modified:
      revisionmenu.py
      viz/treeview.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-11-10 17:10:08 +0000
+++ b/NEWS	2007-11-28 18:00:03 +0000
@@ -1,5 +1,9 @@
 0.93.0  UNRELEASED
 
+ BUG FIXES
+
+  * Make toolbars in Olive follow GNOME standards. (#137074)
+
 0.92.1  2007-11-10
 
  BUG FIXES

=== modified file 'olive.glade'
--- a/olive.glade	2007-08-23 11:13:37 +0000
+++ b/olive.glade	2007-11-28 18:00:03 +0000
@@ -378,7 +378,6 @@
         <child>
           <widget class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
-            <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
             <child>
               <widget class="GtkToolButton" id="toolbutton_refresh">
                 <property name="visible">True</property>
@@ -427,6 +426,7 @@
             <child>
               <widget class="GtkToolButton" id="toolbutton_commit">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="label">Commit</property>
                 <property name="use_underline">True</property>
                 <property name="icon">icons/commit.png</property>
@@ -448,6 +448,7 @@
             <child>
               <widget class="GtkToolButton" id="toolbutton_pull">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="label">Pull</property>
                 <property name="use_underline">True</property>
                 <property name="icon">icons/pull.png</property>
@@ -460,6 +461,7 @@
             <child>
               <widget class="GtkToolButton" id="toolbutton_push">
                 <property name="visible">True</property>
+                <property name="is_important">True</property>
                 <property name="label">Push</property>
                 <property name="use_underline">True</property>
                 <property name="icon">icons/push.png</property>