From 5573e4bcf4f98b8a3c8573ae1a43929827fc1233 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Jul 24 2008 15:28:33 +0000
Subject: - Remove some obsolete patches


---

diff --git a/background-location.patch b/background-location.patch
deleted file mode 100644
index 30e7e18..0000000
--- a/background-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.background-location gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.background-location	2007-11-17 23:39:06.000000000 -0500
-+++ gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c	2007-11-17 23:39:39.000000000 -0500
-@@ -1114,6 +1114,8 @@ desktop_init (AppearanceData *data,
-                      NULL));
- 
-   gtk_file_chooser_set_select_multiple (data->wp_filesel, TRUE);
-+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (data->wp_filesel),
-+                                       "/usr/share/backgrounds");
-   gtk_file_chooser_set_use_preview_label (data->wp_filesel, FALSE);
- 
-   pictures = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
diff --git a/control-center.spec b/control-center.spec
index 8db07d1..cf6da54 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.23.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -355,6 +355,9 @@ fi
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Jul 24 2008 - Bastien Nocera <bnocera@redhat.com> - 2.23.4-5
+- Remove some obsolete patches
+
 * Mon Jul 14 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4-4
 - Drop some obsolete patches
 - Fix an issue with the notification-theme support (#455329)
diff --git a/gnome-control-center-2.19.90-no-warnings.patch b/gnome-control-center-2.19.90-no-warnings.patch
deleted file mode 100644
index 1521de1..0000000
--- a/gnome-control-center-2.19.90-no-warnings.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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);