[gnome-settings-daemon/reusable-osd-window] Remove a superfluous GtkFrame in acme.ui

[Federico Mena Quintero <federico src gnome org>]

commit 7496a60be38775635aa9a036b1f8f82572d6398e
Author: Federico Mena Quintero <federico novell com>
Date:   Tue Jan 5 12:30:29 2010 -0600

    Remove a superfluous GtkFrame in acme.ui
    
    The frame now gets drawn by the toplevel GsdOsdWindow.  The main widget
    in acme.ui is now 'acme_box' instead of 'acme_frame'.
    
    Also, make the frame drawn by GsdOsdWindow use GTK_SHADOW_OUT, for consistency
    with the old acme_frame.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 plugins/common/gsd-osd-window.c            |    2 +-
 plugins/media-keys/acme.ui                 |   44 +++++++++++----------------
 plugins/media-keys/gsd-media-keys-window.c |   15 ++++-----
 3 files changed, 26 insertions(+), 35 deletions(-)
---
diff --git a/plugins/common/gsd-osd-window.c b/plugins/common/gsd-osd-window.c
index c0c01aa..8a212d6 100644
--- a/plugins/common/gsd-osd-window.c
+++ b/plugins/common/gsd-osd-window.c
@@ -320,7 +320,7 @@ expose_when_not_composited (GtkWidget *widget, GdkEventExpose *event)
 	gtk_paint_shadow (gtk_widget_get_style (widget),
 			  gtk_widget_get_window (widget),
 			  gtk_widget_get_state (widget),
-			  GTK_SHADOW_IN,
+			  GTK_SHADOW_OUT,
 			  &event->area,
 			  widget,
 			  NULL, /* NULL detail -> themes should use the GsdOsdWindow widget name, probably */
diff --git a/plugins/media-keys/acme.ui b/plugins/media-keys/acme.ui
index 3222ecb..e0457ed 100644
--- a/plugins/media-keys/acme.ui
+++ b/plugins/media-keys/acme.ui
@@ -4,36 +4,28 @@
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="dialog">
     <child>
-      <object class="GtkFrame" id="acme_frame">
+      <object class="GtkVBox" id="acme_box">
         <property name="visible">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">out</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkVBox" id="acme_vbox">
+          <object class="GtkImage" id="acme_image">
             <property name="visible">True</property>
-            <property name="border_width">12</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkImage" id="acme_image">
-                <property name="visible">True</property>
-                <property name="icon_name">audio-volume-high</property>
-                <property name="icon-size">6</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkProgressBar" id="acme_volume_progressbar">
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
+            <property name="icon_name">audio-volume-high</property>
+            <property name="icon-size">6</property>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkProgressBar" id="acme_volume_progressbar">
+            <property name="visible">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/media-keys/gsd-media-keys-window.c b/plugins/media-keys/gsd-media-keys-window.c
index db678a2..4b736e9 100644
--- a/plugins/media-keys/gsd-media-keys-window.c
+++ b/plugins/media-keys/gsd-media-keys-window.c
@@ -696,8 +696,8 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
 
         if (!gsd_osd_window_is_composited (GSD_OSD_WINDOW (window))) {
                 GtkBuilder *builder;
-                const gchar *objects[] = {"acme_frame", NULL};
-                GtkWidget *frame;
+                const gchar *objects[] = {"acme_box", NULL};
+                GtkWidget *box;
 
                 builder = gtk_builder_new ();
                 gtk_builder_add_objects_from_file (builder,
@@ -707,16 +707,15 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
 
                 window->priv->image = GTK_IMAGE (gtk_builder_get_object (builder, "acme_image"));
                 window->priv->progress = GTK_WIDGET (gtk_builder_get_object (builder, "acme_volume_progressbar"));
-                frame = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                            "acme_frame"));
+                box = GTK_WIDGET (gtk_builder_get_object (builder, "acme_box"));
 
-                if (frame != NULL) {
-                        gtk_container_add (GTK_CONTAINER (window), frame);
-                        gtk_widget_show_all (frame);
+                if (box != NULL) {
+                        gtk_container_add (GTK_CONTAINER (window), box);
+                        gtk_widget_show_all (box);
                 }
 
                 /* The builder needs to stay alive until the window
-                   takes ownership of the frame (and its children)  */
+                   takes ownership of the box (and its children)  */
                 g_object_unref (builder);
         }
 }