rpms/gnome-screensaver/devel popsquares-error-handling.patch, NONE, 1.1 gnome-screensaver.spec, 1.233, 1.234

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-screensaver.spec 
Added Files:
	popsquares-error-handling.patch 
Log Message:
Fix cmdline error handling in popsquares


popsquares-error-handling.patch:
 popsquares.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE popsquares-error-handling.patch ---
diff -up gnome-screensaver-2.28.0/savers/popsquares.c.error-handling gnome-screensaver-2.28.0/savers/popsquares.c
--- gnome-screensaver-2.28.0/savers/popsquares.c.error-handling	2009-12-11 13:23:31.587245522 -0500
+++ gnome-screensaver-2.28.0/savers/popsquares.c	2009-12-11 13:33:07.221003198 -0500
@@ -45,7 +45,12 @@ main (int argc, char **argv)
 
         error = NULL;
 
-        gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error);
+        if (!gtk_init_with_args (&argc, &argv, NULL, NULL, NULL, &error)) {
+		g_printerr (_("%s. See --help for usage information.\n"),
+			    error->message);
+		g_error_free (error);
+	        exit (1);
+	}
 
         window = gs_theme_window_new ();
         g_signal_connect (G_OBJECT (window), "delete-event",


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -p -r1.233 -r1.234
--- gnome-screensaver.spec	3 Dec 2009 14:33:30 -0000	1.233
+++ gnome-screensaver.spec	11 Dec 2009 18:59:45 -0000	1.234
@@ -36,6 +36,9 @@ Patch12: remove-session-inhibits.patch
 # from upstream
 Patch13: 0001-Add-an-API-to-show-a-message-on-the-locked-screen.patch
 
+# fixed upstream
+Patch14: popsquares-error-handling.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
 BuildRequires: gtk2-devel => %{gtk2_version}
@@ -91,6 +94,7 @@ simple, sane, secure defaults and be wel
 %patch11 -p1 -b .ask-to-die
 %patch12 -p1 -b .remove-session-inhibits
 %patch13 -p1 -b .message-api
+%patch14 -p1 -b .error-handling
 
 autoreconf -f -i
 
@@ -161,6 +165,9 @@ fi
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri Dec 11 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-9
+- Properly handle cmdline parsing errors in popsquares (#546656)
+
 * Thu Dec  3 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-8
 - Drop an unwanted dependency