rpms/gnome-screensaver/devel fix-gtkbuilder-conversion.patch, NONE, 1.1 gnome-screensaver.spec, 1.223, 1.224

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25597

Modified Files:
	gnome-screensaver.spec 
Added Files:
	fix-gtkbuilder-conversion.patch 
Log Message:


fix-gtkbuilder-conversion.patch:
 data/lock-dialog-default.ui |   18 ------------------
 src/gs-lock-plug.c          |    4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

--- NEW FILE fix-gtkbuilder-conversion.patch ---
--- gnome-screensaver-2.27.0/data/lock-dialog-default.ui	2009-08-24 00:27:51.169693536 -0400
+++ hacked/data/lock-dialog-default.ui	2009-08-24 00:26:35.149714591 -0400
@@ -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>
--- gnome-screensaver-2.27.0/src/gs-lock-plug.c	2009-08-24 00:27:51.178703972 -0400
+++ hacked/src/gs-lock-plug.c	2009-08-24 00:15:20.646571022 -0400
@@ -1658,8 +1658,8 @@
 
         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;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- gnome-screensaver.spec	18 Aug 2009 19:49:14 -0000	1.223
+++ gnome-screensaver.spec	24 Aug 2009 04:38:42 -0000	1.224
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.27.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.27/%{name}-%{version}.tar.bz2
@@ -33,6 +33,8 @@ Patch9: use-gtkbuilder.patch
 Patch10: button-images.patch
 # from upstream
 Patch11: gnome-screensaver-2.27.0-gamma.patch
+# from upstream
+Patch12: fix-gtkbuilder-conversion.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -89,6 +91,7 @@ simple, sane, secure defaults and be wel
 %patch9 -p1 -b .use-gtkbuilder
 %patch10 -p1 -b .button-images
 %patch11 -p1 -b .gamma
+%patch12 -p1 -b .fix-gtkbuilder-conversion
 
 libtoolize --force --copy
 
@@ -165,6 +168,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Mon Aug 24 2009 Matthias Clasen <mclasen at redhat.com> 2.27.0-10
+- Fix GtkBuilder conversion
+
 * Tue Aug 18 2009 Adam Jackson <ajax at redhat.com> 2.27.0-9
 - gnome-screensaver-2.27.0-gamma.patch: Backport patch to fix gamma fadeout
   (#508513)