[gnome-screensaver] Fix the GtkBuilder conversion



commit 18701b12472a19677aa95b8d1062583b2186cfe8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Aug 24 00:33:16 2009 -0400

    Fix the GtkBuilder conversion
    
    It was passing the wrong filename to GtkBuilder.

 data/lock-dialog-default.ui |   18 ------------------
 src/gs-lock-plug.c          |    4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/data/lock-dialog-default.ui b/data/lock-dialog-default.ui
index 6b90c29..5dfa8a2 100644
--- a/data/lock-dialog-default.ui
+++ b/data/lock-dialog-default.ui
@@ -1,22 +1,6 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
-  <object class="GtkWindow" id="window1">
-    <property name="visible">True</property>
-    <property name="title" translatable="yes">window1</property>
-    <property name="type">GTK_WINDOW_TOPLEVEL</property>
-    <property name="window_position">GTK_WIN_POS_NONE</property>
-    <property name="modal">False</property>
-    <property name="resizable">True</property>
-    <property name="destroy_with_parent">False</property>
-    <property name="decorated">True</property>
-    <property name="skip_taskbar_hint">False</property>
-    <property name="skip_pager_hint">False</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-    <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-    <property name="focus_on_map">True</property>
-    <property name="urgency_hint">False</property>
-    <child>
       <object class="GtkFrame" id="lock-dialog">
         <property name="visible">True</property>
         <property name="label_xalign">0</property>
@@ -518,6 +502,4 @@
           <placeholder/>
         </child>
       </object>
-    </child>
-  </object>
 </interface>
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index dbdec42..34e534f 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1673,8 +1673,8 @@ load_theme (GSLockPlug *plug)
 
         builder = gtk_builder_new();
 
-        if (!gtk_builder_add_from_file (builder,filename ,&error)) {
-                g_warning ("Couldn't load builder file: %s", error->message);
+        if (!gtk_builder_add_from_file (builder,gtkbuilder,&error)) {
+                g_warning ("Couldn't load builder file '%s': %s", gtkbuilder, error->message);
                 g_error_free(error);
                 g_free (gtkbuilder);
                 return FALSE;



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