Add some SVN patches to fix gnome-settings-daemon's initialization. With this

gnome-screensaver should start, and g-s-d should provide a working theme
and icons.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9073 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 116 insertions, 0 deletions

diff --git a/sysutils/gnome-control-center/files/patch-svn_fix_gsd b/sysutils/gnome-control-center/files/patch-svn_fix_gsd
new file mode 100644
index 000000000..e2609a272
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-svn_fix_gsd
@@ -0,0 +1,116 @@
+--- gnome-settings-daemon/gnome-settings-screensaver.c.orig	2007-06-25 11:56:47.000000000 -0400
++++ gnome-settings-daemon/gnome-settings-screensaver.c	2007-06-25 11:57:10.000000000 -0400
+@@ -173,7 +173,7 @@ gnome_settings_module_screensaver_start 
+ 		return FALSE;
+ 	args[2] = NULL;
+ 
+-	if (g_spawn_async (g_get_home_dir (), args, NULL, 0, NULL, NULL, &module_ss->screensaver_pid, &gerr))
++	if (g_spawn_async (g_get_home_dir (), args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &module_ss->screensaver_pid, &gerr))
+ 		return TRUE;
+ 
+ 	show_error = gconf_client_get_bool (gnome_settings_module_get_config_client (module),
+--- gnome-settings-daemon/gnome-settings-daemon.c	2007/06/18 20:50:39	7747
++++ gnome-settings-daemon/gnome-settings-daemon.c	2007/06/20 11:07:32	7753
+@@ -62,23 +62,6 @@
+ XSettingsManager **managers = NULL;
+ 
+ static void
+-debug_warning (const char *msg, ...)
+-{
+-	va_list args;
+-	gchar *str;
+-	GtkWidget *dialog;
+-
+-	va_start (args, msg);
+-	str = g_strdup_vprintf (msg, args);
+-	va_end (args);
+-
+-	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, str);
+-	gnome_settings_delayed_show_dialog (dialog);
+-
+-	g_free (str);
+-}
+-
+-static void
+ terminate_cb (void *data)
+ {
+ 	gboolean *terminated = data;
+@@ -125,9 +108,9 @@
+ 	client = gnome_settings_get_config_client ();
+ 
+ 	module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel);
+-	for (l = module_list; l != NULL; l = l->next) {
+-		
+-		gnome_settings_module_initialize (GNOME_SETTINGS_MODULE (l->data), client);
++	for (l = module_list; l != NULL; l = l->next) {		
++		if (!gnome_settings_module_initialize (GNOME_SETTINGS_MODULE (l->data), client))
++			g_warning ("Module %s could not be initialized", G_OBJECT_TYPE_NAME (G_OBJECT (l->data)));
+ 	}
+ }
+ 
+@@ -137,8 +120,10 @@
+ 	GList *l, *module_list;
+ 
+ 	module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel);
+-	for (l = module_list; l != NULL; l = l->next)
+-		gnome_settings_module_start (GNOME_SETTINGS_MODULE (l->data));
++	for (l = module_list; l != NULL; l = l->next) {
++		if (!gnome_settings_module_start (GNOME_SETTINGS_MODULE (l->data)))
++			g_warning ("Module %s could not be started", G_OBJECT_TYPE_NAME (G_OBJECT (l->data)));
++	}
+ }
+ 
+ static void
+@@ -215,7 +200,7 @@
+ 		return;
+ 
+ 	/* create hash table for loaded modules */
+-	settings->priv->loaded_modules = g_hash_table_new_full (g_int_hash, g_int_equal, NULL, free_modules_list);
++	settings->priv->loaded_modules = g_hash_table_new_full (g_int_hash, g_int_equal, g_free, free_modules_list);
+ 
+ 	module_types = g_type_children (GNOME_SETTINGS_TYPE_MODULE, &n_children);
+ 	if (module_types) {
+@@ -223,7 +208,7 @@
+ 
+ 		for (i = 0; i < n_children; i++) {
+ 			GObject *module;
+-			GnomeSettingsModuleRunlevel runlevel;
++			GnomeSettingsModuleRunlevel runlevel, *ptr_runlevel;
+ 			GList *module_list;
+ 
+ 			module = g_object_new (module_types[i], NULL);
+@@ -236,7 +221,9 @@
+ 				module_list = g_list_append (module_list, module);
+ 			else {
+ 				module_list = g_list_append (NULL, module);
+-				g_hash_table_insert (settings->priv->loaded_modules, &runlevel, module_list);
++				ptr_runlevel = g_new0 (GnomeSettingsModuleRunlevel, 1);
++				*ptr_runlevel = runlevel;
++				g_hash_table_insert (settings->priv->loaded_modules, ptr_runlevel, module_list);
+ 			}
+ 		}
+ 
+--- gnome-settings-daemon/gnome-settings-module.c	2007/04/23 16:26:37	7485
++++ gnome-settings-daemon/gnome-settings-module.c	2007/06/20 11:07:32	7753
+@@ -134,7 +134,9 @@
+ {
+ 	g_return_val_if_fail (GNOME_SETTINGS_IS_MODULE (module), FALSE);
+ 	g_return_val_if_fail (module->priv->status == GNOME_SETTINGS_MODULE_STATUS_INITIALIZED, FALSE);
+-	g_return_val_if_fail (CLASS (module)->start != NULL, FALSE);
++
++	if (!CLASS (module)->start)
++		return TRUE;
+ 
+ 	if (CLASS (module)->start (module)) {
+ 		module->priv->status = GNOME_SETTINGS_MODULE_STATUS_STARTED;
+@@ -149,7 +151,9 @@
+ {
+ 	g_return_val_if_fail (GNOME_SETTINGS_IS_MODULE (module), FALSE);
+ 	g_return_val_if_fail (module->priv->status == GNOME_SETTINGS_MODULE_STATUS_STARTED, FALSE);
+-	g_return_val_if_fail (CLASS (module)->stop != NULL, FALSE);
++	
++	if (!CLASS (module)->stop)
++		return TRUE;
+ 
+ 	if (CLASS (module)->stop (module)) {
+ 		module->priv->status = GNOME_SETTINGS_MODULE_STATUS_STOPPED;