applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use a list instead of a hash table to store the settings modules (closes

Browse source 
2007-08-17  Jens Granseuer  <jensgr@gmx.net>

	* gnome-settings-daemon.c: (initialize_modules), (start_modules),
	(stop_modules), (finalize), (gnome_settings_daemon_init),
	(gnome_settings_daemon_new): use a list instead of a hash table to
	store the settings modules (closes bug #449118)

svn path=/trunk/; revision=8014
This commit is contained in:
Jens Granseuer 2007-08-17 19:02:13 +00:00 • committed by Jens Granseuer
parent 2f48b99c2a
commit e56210e777
2 changed files with 41 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gnome-settings-daemon/ChangeLog
View file

@ -1,3 +1,10 @@
2007-08-17 Jens Granseuer <jensgr@gmx.net>
* gnome-settings-daemon.c: (initialize_modules), (start_modules),
(stop_modules), (finalize), (gnome_settings_daemon_init),
(gnome_settings_daemon_new): use a list instead of a hash table to
store the settings modules (closes bug #449118)
2007-07-12 Jens Granseuer <jensgr@gmx.net> 2007-07-12 Jens Granseuer <jensgr@gmx.net>
* gnome-settings-xsettings.c: * gnome-settings-xsettings.c:

78
gnome-settings-daemon/gnome-settings-daemon.c
View file

@ -25,7 +25,6 @@
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gconf/gconf.h> #include <gconf/gconf.h>
#include <libgnome/gnome-init.h> #include <libgnome/gnome-init.h>
#include <libgnomeui/gnome-ui-init.h> #include <libgnomeui/gnome-ui-init.h>
@ -35,7 +34,7 @@
#include "gnome-settings-module.h" #include "gnome-settings-module.h"
struct _GnomeSettingsDaemonPrivate { struct _GnomeSettingsDaemonPrivate {
GHashTable *loaded_modules; GSList *loaded_modules;
GObject *dbus_service; GObject *dbus_service;
}; };
@ -85,52 +84,48 @@ manager_event_filter (GdkXEvent *xevent,
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
} }
static void
free_modules_list (gpointer data)
{
GList *l = (GList *) data;
while (l) {
g_object_unref (G_OBJECT (l->data));
l = g_list_remove (l, l);
}
}
static void static void
initialize_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel) initialize_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel)
{ {
GList *l, *module_list;
GConfClient *client; GConfClient *client;
GSList *l;
client = gnome_settings_get_config_client (); client = gnome_settings_get_config_client ();
module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel); for (l = daemon->priv->loaded_modules; l != NULL; l = l->next) {
for (l = module_list; l != NULL; l = l->next) { GnomeSettingsModule *module = (GnomeSettingsModule *) l->data;
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))); if (gnome_settings_module_get_runlevel (module) == runlevel &&
!gnome_settings_module_initialize (module, client))
g_warning ("Module %s could not be initialized", G_OBJECT_TYPE_NAME (module));
} }
} }
static void static void
start_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel) start_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel)
{ {
GList *l, *module_list; GSList *l;
module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel); for (l = daemon->priv->loaded_modules; l != NULL; l = l->next) {
for (l = module_list; l != NULL; l = l->next) { GnomeSettingsModule *module = (GnomeSettingsModule *) l->data;
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))); if (gnome_settings_module_get_runlevel (module) == runlevel &&
!gnome_settings_module_start (module))
g_warning ("Module %s could not be started", G_OBJECT_TYPE_NAME (module));
} }
} }
static void static void
stop_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel) stop_modules (GnomeSettingsDaemon *daemon, GnomeSettingsModuleRunlevel runlevel)
{ {
GList *l, *module_list; GSList *l;
module_list = g_hash_table_lookup (daemon->priv->loaded_modules, &runlevel); for (l = daemon->priv->loaded_modules; l != NULL; l = l->next) {
for (l = module_list; l != NULL; l = l->next) GnomeSettingsModule *module = (GnomeSettingsModule *) l->data;
gnome_settings_module_stop (GNOME_SETTINGS_MODULE (l->data));
if (gnome_settings_module_get_runlevel (module) == runlevel)
gnome_settings_module_stop (module);
}
} }
static void static void
@ -153,7 +148,8 @@ finalize (GObject *object)
stop_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_GNOME_SETTINGS); stop_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_GNOME_SETTINGS);
stop_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_XSETTINGS); stop_modules (daemon, GNOME_SETTINGS_MODULE_RUNLEVEL_XSETTINGS);
g_hash_table_destroy (daemon->priv->loaded_modules); g_slist_foreach (daemon->priv->loaded_modules, (GFunc) g_object_unref, NULL);
g_slist_free (daemon->priv->loaded_modules);
daemon->priv->loaded_modules = NULL; daemon->priv->loaded_modules = NULL;
} }
@ -182,7 +178,7 @@ gnome_settings_daemon_init (GnomeSettingsDaemon *settings)
GType *module_types; GType *module_types;
guint n_children; guint n_children;
settings->priv = g_new (GnomeSettingsDaemonPrivate, 1); settings->priv = g_new0 (GnomeSettingsDaemonPrivate, 1);
/* register all internal modules types */ /* register all internal modules types */
if (!gnome_settings_module_accessibility_keyboard_get_type () if (!gnome_settings_module_accessibility_keyboard_get_type ()
@ -202,39 +198,26 @@ gnome_settings_daemon_init (GnomeSettingsDaemon *settings)
|| !gnome_settings_module_xsettings_get_type ()) || !gnome_settings_module_xsettings_get_type ())
return; return;
/* create hash table for loaded modules */
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); module_types = g_type_children (GNOME_SETTINGS_TYPE_MODULE, &n_children);
if (module_types) { if (module_types) {
guint i; guint i;
for (i = 0; i < n_children; i++) { for (i = 0; i < n_children; i++) {
GObject *module; GObject *module;
GnomeSettingsModuleRunlevel runlevel, *ptr_runlevel;
GList *module_list;
module = g_object_new (module_types[i], NULL); module = g_object_new (module_types[i], NULL);
if (!module) if (!module)
continue; continue;
runlevel = gnome_settings_module_get_runlevel (GNOME_SETTINGS_MODULE (module)); settings->priv->loaded_modules =
module_list = g_hash_table_lookup (settings->priv->loaded_modules, &runlevel); g_slist_append (settings->priv->loaded_modules, module);
if (module_list)
module_list = g_list_append (module_list, module);
else {
module_list = g_list_append (NULL, module);
ptr_runlevel = g_new0 (GnomeSettingsModuleRunlevel, 1);
*ptr_runlevel = runlevel;
g_hash_table_insert (settings->priv->loaded_modules, ptr_runlevel, module_list);
}
} }
g_free (module_types); g_free (module_types);
} }
/* create DBus server */ /* create DBus server */
settings->priv->dbus_service = g_object_new (gnome_settings_server_get_type (), NULL); settings->priv->dbus_service = g_object_new (gnome_settings_server_get_type (), NULL);
} }
G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon, G_TYPE_OBJECT) G_DEFINE_TYPE (GnomeSettingsDaemon, gnome_settings_daemon, G_TYPE_OBJECT)
@ -301,7 +284,7 @@ gnome_settings_daemon_new (void)
if (xsettings_manager_check_running ( if (xsettings_manager_check_running (
gdk_x11_display_get_xdisplay (display), gdk_x11_display_get_xdisplay (display),
gdk_screen_get_number (gdk_screen_get_default ()))) { gdk_screen_get_number (gdk_screen_get_default ()))) {
fprintf (stderr, "You can only run one xsettings manager at a time; exiting\n"); g_error ("You can only run one xsettings manager at a time; exiting\n");
return NULL; return NULL;
} }
@ -318,12 +301,11 @@ gnome_settings_daemon_new (void)
gdk_screen_get_number (screen), gdk_screen_get_number (screen),
terminate_cb, &terminated); terminate_cb, &terminated);
if (!managers [i]) { if (!managers [i]) {
fprintf (stderr, "Could not create xsettings manager for screen %d!\n", i); g_error ("Could not create xsettings manager for screen %d!\n", i);
return NULL; return NULL;
} }
} }
g_assert (i == n_screens);
managers [i] = NULL; managers [i] = NULL;
} }