all: set the primary-toolbar style class on primary toolbars

So themes can override their appearance without hardcoding the widget
hierarchy.

https://bugzilla.gnome.org/show_bug.cgi?id=644121

diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index 8b274a126619accf0b9b09c2eedcbfb1634713da..ecd00dfc1bdf9e19a01780daf3d3b36faecd53d4 100644 (file)
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -110,6 +110,9 @@
         <child>
           <object class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
+            <style>
+               <class name="primary-toolbar"/>
+            </style>
             <child>
               <object class="GtkToolButton" id="hangup">
                 <property name="visible">True</property>

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index f09cbd5ffeb772c6445a1773a8538715fe599b76..97cda470c8f29bbc9a41ebee0f92e8409d6a8e45 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -1407,6 +1407,8 @@ am_prepared_cb (GObject *am,
   gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), TRUE);
   gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar),
       GTK_ICON_SIZE_SMALL_TOOLBAR);
+  gtk_style_context_add_class (gtk_widget_get_style_context (toolbar),
+                              GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
   gtk_widget_show (toolbar);
 
   gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);

diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui
index 3c015392d39881c3c5e6522e59a858dfcef55a8d..0cfd6bee471205f409436ab4b3228d75a673c71a 100644 (file)
--- a/src/empathy-main-window.ui
+++ b/src/empathy-main-window.ui
@@ -297,6 +297,9 @@
           <object class="GtkToolbar" id="presence_toolbar">
             <property name="visible">True</property>
             <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+            <style>
+              <class name="primary-toolbar"/>
+            </style>
           </object>
           <packing>
             <property name="expand">False</property>