[gnome-settings-daemon/reusable-osd-window] Set window properties on init(), not in new()



commit 12a35a8f3e5c7f04c3ff1e0ea219f11d352017d4
Author: Federico Mena Quintero <federico novell com>
Date:   Mon Jan 4 12:02:21 2010 -0600

    Set window properties on init(), not in new()
    
    This is so that subclasses will also inherit those properties.
    
    Signed-off-by: Federico Mena Quintero <federico novell com>

 plugins/common/gsd-osd-window.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/plugins/common/gsd-osd-window.c b/plugins/common/gsd-osd-window.c
index 46df10b..cbe9911 100644
--- a/plugins/common/gsd-osd-window.c
+++ b/plugins/common/gsd-osd-window.c
@@ -467,20 +467,18 @@ gsd_osd_window_init (GsdOsdWindow *window)
         } else {
 		gtk_container_set_border_width (GTK_CONTAINER (window), 12);
         }
+
+        g_object_set (window,
+                      "type", GTK_WINDOW_POPUP,
+                      "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
+                      "skip-taskbar-hint", TRUE,
+                      "skip-pager-hint", TRUE,
+                      "focus-on-map", FALSE,
+                      NULL);
 }
 
 GtkWidget *
 gsd_osd_window_new (void)
 {
-        GObject *object;
-
-        object = g_object_new (GSD_TYPE_OSD_WINDOW,
-                               "type", GTK_WINDOW_POPUP,
-                               "type-hint", GDK_WINDOW_TYPE_HINT_NOTIFICATION,
-                               "skip-taskbar-hint", TRUE,
-                               "skip-pager-hint", TRUE,
-                               "focus-on-map", FALSE,
-                               NULL);
-
-        return GTK_WIDGET (object);
+        return g_object_new (GSD_TYPE_OSD_WINDOW, NULL);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]