Mon Aug 20 10:50:24 UTC 2007

Author: hadess

Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16098

Modified Files:
	control-center.spec 
Added Files:
	gnome-control-center-2.19.90-no-warnings.patch 
Removed Files:
	background-idle.patch control-center-2.17.5-default-apps.patch 
	control-center-2.17.91-passwd.patch 
	control-center-2.18.0-ellipsize-sound-devices.patch 
	control-center-2.18.0-gecos.patch 
	control-center-2.19.1-gnome-bg.patch 
	control-center-2.19.3-gecos.patch 
	control-center-2.19.3-makefile-format.patch 
	control-center-tooltips.patch 
	control-center-trunk-set-face-perms-4.patch 
	default-apps-edit.patch loaded-modules.patch 
Log Message:
* Mon Aug 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.90-4
- Kill some shell warnings (#239439)
- Remove outdated, unapplied patches


gnome-control-center-2.19.90-no-warnings.patch:

--- NEW FILE gnome-control-center-2.19.90-no-warnings.patch ---
Index: libslab-utils.c
===================================================================
--- libslab-utils.c	(revision 314)
+++ libslab-utils.c	(working copy)
@@ -248,47 +248,46 @@
 	value  = gconf_client_get (client, key, & error);
 
 	if (error || ! value)
-		libslab_handle_g_error (& error, "%s: error getting %s", G_STRFUNC, key);
-	else {
-		switch (value->type) {
-			case GCONF_VALUE_STRING:
-				retval = (gpointer) g_strdup (gconf_value_get_string (value));
-				break;
+		return retval;
 
-			case GCONF_VALUE_INT:
-				retval = GINT_TO_POINTER (gconf_value_get_int (value));
-				break;
+	switch (value->type) {
+	case GCONF_VALUE_STRING:
+		retval = (gpointer) g_strdup (gconf_value_get_string (value));
+		break;
 
-			case GCONF_VALUE_BOOL:
-				retval = GINT_TO_POINTER (gconf_value_get_bool (value));
-				break;
+	case GCONF_VALUE_INT:
+		retval = GINT_TO_POINTER (gconf_value_get_int (value));
+		break;
 
-			case GCONF_VALUE_LIST:
-				list = NULL;
-				slist = gconf_value_get_list (value);
+	case GCONF_VALUE_BOOL:
+		retval = GINT_TO_POINTER (gconf_value_get_bool (value));
+		break;
 
-				for (node = slist; node; node = node->next) {
-					value_i = (GConfValue *) node->data;
+	case GCONF_VALUE_LIST:
+		list = NULL;
+		slist = gconf_value_get_list (value);
 
-					if (value_i->type == GCONF_VALUE_STRING)
-						list = g_list_append (
-							list, g_strdup (
-								gconf_value_get_string (value_i)));
-					else if (value_i->type == GCONF_VALUE_INT)
-						list = g_list_append (
-							list, GINT_TO_POINTER (
-								gconf_value_get_int (value_i)));
-					else
-						;
-				}
+		for (node = slist; node; node = node->next) {
+			value_i = (GConfValue *) node->data;
 
-				retval = (gpointer) list;
+			if (value_i->type == GCONF_VALUE_STRING)
+				list = g_list_append (
+				    list, g_strdup (
+					gconf_value_get_string (value_i)));
+			else if (value_i->type == GCONF_VALUE_INT)
+				list = g_list_append (
+				    list, GINT_TO_POINTER (
+					gconf_value_get_int (value_i)));
+			else
+				;
+		}
 
-				break;
+		retval = (gpointer) list;
 
-			default:
-				break;
-		}
+		break;
+
+	default:
+		break;
 	}
 
 	g_object_unref (client);
Index: bookmark-agent.c
===================================================================
--- bookmark-agent.c	(revision 314)
+++ bookmark-agent.c	(working copy)
@@ -752,6 +752,8 @@
 
 	gint i;
 
+	if (!priv->store_path)
+		return;
 
 	if (! (priv->store_path && g_bookmark_file_load_from_file (priv->store, priv->store_path, & error))) {
 		g_bookmark_file_free (priv->store);


Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -r1.297 -r1.298
--- control-center.spec	17 Aug 2007 16:25:59 -0000	1.297
+++ control-center.spec	20 Aug 2007 10:49:50 -0000	1.298
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.19.90
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL+
 Group: User Interface/Desktops
@@ -53,6 +53,10 @@
 # FIXME: figure out how this applies to the new appearance capplet
 Patch14: gnome-bg.patch
 
+# Fix some useless warnings in libslab
+# http://bugzilla.gnome.org/show_bug.cgi?id=439398
+Patch15: gnome-control-center-2.19.90-no-warnings.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=430889
 # disable for now, upstream plans conflicting changes
 #Patch16: control-center-2.18.0-be-more-async.patch
@@ -188,6 +192,9 @@
 #%patch12 -p1 -b .start-at-helper
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .gnome-bg
+pushd libslab
+%patch15 -p0 -b .warnings
+popd
 #%patch16 -p1 -b .be-more-async
 
 # vendor configuration patches
@@ -380,6 +387,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Mon Aug 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.90-4
+- Kill some shell warnings (#239439)
+- Remove outdated, unapplied patches
+
 * Fri Aug 17 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-3
 - Improve tooltips for slide shows
 


--- background-idle.patch DELETED ---


--- control-center-2.17.5-default-apps.patch DELETED ---


--- control-center-2.17.91-passwd.patch DELETED ---


--- control-center-2.18.0-ellipsize-sound-devices.patch DELETED ---


--- control-center-2.18.0-gecos.patch DELETED ---


--- control-center-2.19.1-gnome-bg.patch DELETED ---


--- control-center-2.19.3-gecos.patch DELETED ---


--- control-center-2.19.3-makefile-format.patch DELETED ---


--- control-center-tooltips.patch DELETED ---


--- control-center-trunk-set-face-perms-4.patch DELETED ---


--- default-apps-edit.patch DELETED ---


--- loaded-modules.patch DELETED ---


