gnome-settings-daemon r352 - in trunk: . gnome-settings-daemon

[jensg svn gnome org]

Author: jensg
Date: Tue May 27 21:25:15 2008
New Revision: 352
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=352&view=rev

Log:
2008-05-27  Jens Granseuer  <jensgr gmx net>

	* gnome-settings-daemon/gnome-settings-manager.c: (_unload_plugin),
	(_unload_all): stop all plugins on shutdown


Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/gnome-settings-manager.c

Modified: trunk/gnome-settings-daemon/gnome-settings-manager.c
==============================================================================
--- trunk/gnome-settings-daemon/gnome-settings-manager.c	(original)
+++ trunk/gnome-settings-daemon/gnome-settings-manager.c	Tue May 27 21:25:15 2008
@@ -273,9 +273,18 @@
 }
 
 static void
+_unload_plugin (GnomeSettingsPluginInfo *info, gpointer user_data)
+{
+        if (gnome_settings_plugin_info_get_enabled (info)) {
+                gnome_settings_plugin_info_deactivate (info);
+        }
+        g_object_unref (info);
+}
+
+static void
 _unload_all (GnomeSettingsManager *manager)
 {
-         g_slist_foreach (manager->priv->plugins, (GFunc) g_object_unref, NULL);
+         g_slist_foreach (manager->priv->plugins, (GFunc) _unload_plugin, NULL);
          g_slist_free (manager->priv->plugins);
          manager->priv->plugins = NULL;
 }