From 9ef404045608cba0e8f04f820e37b87e9b44db97 Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Mon, 6 Feb 2012 20:03:55 +0100
Subject: [PATCH] ui: Fix minor issues with toolbar

---
 data/rygel-preferences.ui            | 5 +++--
 src/ui/rygel-preferences-dialog.vala | 4 ++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/data/rygel-preferences.ui b/data/rygel-preferences.ui
index 3a2aaac..244f3b9 100644
--- a/data/rygel-preferences.ui
+++ b/data/rygel-preferences.ui
@@ -98,6 +98,8 @@
                   <object class="GtkToolbar" id="toolbar1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="toolbar_style">icons</property>
+                    <property name="icon_size">1</property>
                     <child>
                       <object class="GtkToolButton" id="add-button">
                         <property name="use_action_appearance">False</property>
@@ -115,13 +117,12 @@
                     </child>
                     <child>
                       <object class="GtkToolButton" id="remove-button">
-                        <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="tooltip_text" translatable="yes">Remove a directory from the list of shared directories</property>
                         <property name="use_action_appearance">False</property>
                         <property name="label" translatable="yes">Remove shared directory</property>
-                        <property name="icon_name">list-add-symbolic</property>
+                        <property name="icon_name">list-remove-symbolic</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala
index 85aa9fb..de01eae 100644
--- a/src/ui/rygel-preferences-dialog.vala
+++ b/src/ui/rygel-preferences-dialog.vala
@@ -40,6 +40,10 @@ public class Rygel.PreferencesDialog : GLib.Object {
         this.builder = new Builder ();
 
         this.builder.add_from_file (UI_FILE);
+        var toolbar = builder.get_object ("toolbar1") as Widget;
+        var style_context = toolbar.get_style_context ();
+        style_context.set_junction_sides (JunctionSides.TOP);
+        style_context.add_class (STYLE_CLASS_INLINE_TOOLBAR);
 
         this.dialog = (Dialog) this.builder.get_object (DIALOG);
         assert (this.dialog != null);
-- 
2.7.4