gnome-settings-daemon r232 - in trunk: . gnome-settings-daemon plugins/a11y-keyboard plugins/background plugins/clipboard plugins/dummy plugins/font plugins/keybindings plugins/keyboard plugins/media-keys plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings



Author: mccann
Date: Mon Mar 24 22:11:26 2008
New Revision: 232
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=232&view=rev

Log:
2008-03-24  William Jon McCann  <jmccann redhat com>

	* gnome-settings-daemon/Makefile.am:
	* plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c:
	(set_server_from_gconf), (gsd_a11y_keyboard_manager_start):
	* plugins/background/Makefile.am:
	* plugins/background/gsd-background-manager.c: (apply_prefs),
	(gsd_background_manager_start):
	* plugins/clipboard/gsd-clipboard-manager.c:
	(gsd_clipboard_manager_start):
	* plugins/dummy/gsd-dummy-manager.c: (gsd_dummy_manager_start):
	* plugins/font/gsd-font-manager.c: (load_xcursor_theme),
	(load_cursor), (gsd_font_manager_start):
	* plugins/keybindings/gsd-keybindings-manager.c:
	(gsd_keybindings_manager_start):
	* plugins/keyboard/gsd-keyboard-manager.c:
	(gsd_keyboard_manager_start):
	* plugins/media-keys/Makefile.am:
	* plugins/media-keys/gsd-media-keys-manager.c: (init_kbd),
	(gsd_media_keys_manager_start):
	* plugins/mouse/gsd-mouse-manager.c: (gsd_mouse_manager_start):
	* plugins/screensaver/gsd-screensaver-manager.c:
	(gsd_screensaver_manager_start):
	* plugins/sound/gsd-sound-manager.c: (start_gnome_sound),
	(reload_foreach_cb), (apply_settings), (gsd_sound_manager_start):
	* plugins/typing-break/gsd-typing-break-manager.c:
	(setup_typing_break), (gsd_typing_break_manager_start):
	* plugins/xrandr/gsd-xrandr-manager.c: (apply_settings):
	* plugins/xrdb/gsd-xrdb-manager.c: (apply_settings),
	(gsd_xrdb_manager_start):
	* plugins/xsettings/gsd-xsettings-manager.c:
	(xft_settings_set_xsettings), (xft_settings_set_xresources),
	(update_xft_settings), (gnome_xsettings_manager_start):
	Add profiling points to plugins.



Modified:
   trunk/ChangeLog
   trunk/gnome-settings-daemon/Makefile.am
   trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
   trunk/plugins/background/Makefile.am
   trunk/plugins/background/gsd-background-manager.c
   trunk/plugins/clipboard/gsd-clipboard-manager.c
   trunk/plugins/dummy/gsd-dummy-manager.c
   trunk/plugins/font/gsd-font-manager.c
   trunk/plugins/keybindings/gsd-keybindings-manager.c
   trunk/plugins/keyboard/gsd-keyboard-manager.c
   trunk/plugins/media-keys/Makefile.am
   trunk/plugins/media-keys/gsd-media-keys-manager.c
   trunk/plugins/mouse/gsd-mouse-manager.c
   trunk/plugins/screensaver/gsd-screensaver-manager.c
   trunk/plugins/sound/gsd-sound-manager.c
   trunk/plugins/typing-break/gsd-typing-break-manager.c
   trunk/plugins/xrandr/gsd-xrandr-manager.c
   trunk/plugins/xrdb/gsd-xrdb-manager.c
   trunk/plugins/xsettings/gsd-xsettings-manager.c

Modified: trunk/gnome-settings-daemon/Makefile.am
==============================================================================
--- trunk/gnome-settings-daemon/Makefile.am	(original)
+++ trunk/gnome-settings-daemon/Makefile.am	Mon Mar 24 22:11:26 2008
@@ -10,6 +10,30 @@
 	$(SETTINGS_DAEMON_CFLAGS)				\
 	$(NULL)
 
+noinst_LTLIBRARIES = 			\
+	libgsd-profile.la		\
+	$(NULL)
+
+libgsd_profile_la_SOURCES =		\
+	gnome-settings-profile.c	\
+	gnome-settings-profile.h	\
+	$(NULL)
+
+libgsd_profile_la_CPPFLAGS = 		\
+	$(DISABLE_DEPRECATED_CFLAGS)	\
+	$(NULL)
+
+libgsd_profile_la_CFLAGS =		\
+	$(SIMPLE_GREETER_CFLAGS)	\
+	$(NULL)
+
+libgsd_profile_la_LIBADD =		\
+	$(NULL)
+
+libgsd_profile_la_LDFLAGS = 	\
+	-export-dynamic 	\
+	$(NULL)
+
 gsddir = $(libexecdir)
 
 gsd_PROGRAMS = \
@@ -39,8 +63,6 @@
 	gnome-settings-plugin-info.h	\
 	gnome-settings-module.c		\
 	gnome-settings-module.h		\
-	gnome-settings-profile.c	\
-	gnome-settings-profile.h	\
 	$(NULL)
 
 gnome_settings_daemon_CPPFLAGS = \
@@ -53,6 +75,7 @@
 	$(AM_LDFLAGS)
 
 gnome_settings_daemon_LDADD = 		\
+	libgsd-profile.la		\
 	$(SETTINGS_DAEMON_LIBS)
 
 EXTRA_DIST = 				\

Modified: trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
==============================================================================
--- trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	(original)
+++ trunk/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c	Mon Mar 24 22:11:26 2008
@@ -43,6 +43,7 @@
 
 #include <libgnomeui/gnome-help.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-a11y-keyboard-manager.h"
 
 #define CONFIG_ROOT "/desktop/gnome/accessibility/keyboard"
@@ -207,6 +208,8 @@
         XkbDescRec      *desc;
         gboolean         enable_accessX;
 
+        gnome_settings_profile_start (NULL);
+
         desc = get_xkb_desc_rec (manager);
         if (!desc) {
                 d ("No XKB present\n");
@@ -335,6 +338,8 @@
 
         XSync (GDK_DISPLAY (), FALSE);
         gdk_error_trap_pop ();
+
+        gnome_settings_profile_end (NULL);
 }
 
 static gboolean
@@ -727,9 +732,12 @@
 {
         guint        event_mask;
         GConfClient *client;
+        gboolean     ret;
 
-        g_debug ("Starting a11y_keyboard manager");
+        ret = FALSE;
 
+        g_debug ("Starting a11y_keyboard manager");
+        gnome_settings_profile_start (NULL);
         register_config_callback (manager,
                                   CONFIG_ROOT,
                                   (GConfClientNotifyFunc)keyboard_callback);
@@ -743,7 +751,7 @@
                 g_set_error (error, GSD_KBD_A11Y_ERROR,
                              GSD_KBD_A11Y_ERROR_NOT_AVAILABLE,
                              "XKB functionality is disabled.");
-                return FALSE;
+                goto out;
         }
 
         client = gconf_client_get_default ();
@@ -763,8 +771,10 @@
         gdk_window_add_filter (NULL,
                                (GdkFilterFunc)cb_xkb_event_filter,
                                manager);
-
-        return TRUE;
+        ret = TRUE;
+ out:
+        gnome_settings_profile_end (NULL);
+        return ret;
 }
 
 void

Modified: trunk/plugins/background/Makefile.am
==============================================================================
--- trunk/plugins/background/Makefile.am	(original)
+++ trunk/plugins/background/Makefile.am	Mon Mar 24 22:11:26 2008
@@ -25,6 +25,7 @@
 	$(AM_CFLAGS)
 
 test_background_LDADD =		\
+	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la	\
 	$(top_builddir)/plugins/background/libbackground/libbackground.la \
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)

Modified: trunk/plugins/background/gsd-background-manager.c
==============================================================================
--- trunk/plugins/background/gsd-background-manager.c	(original)
+++ trunk/plugins/background/gsd-background-manager.c	Mon Mar 24 22:11:26 2008
@@ -41,6 +41,7 @@
 #include <libgnomeui/gnome-bg.h>
 #include <X11/Xatom.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-background-manager.h"
 
 #include "preferences.h"
@@ -156,6 +157,8 @@
 static gboolean
 apply_prefs (GsdBackgroundManager *manager)
 {
+        gnome_settings_profile_start (NULL);
+
         if (! nautilus_is_running ()) {
                 GdkDisplay      *display;
                 int              n_screens;
@@ -236,6 +239,8 @@
                 }
         }
 
+        gnome_settings_profile_end (NULL);
+
         return FALSE;
 }
 
@@ -275,6 +280,7 @@
         gboolean nautilus_show_desktop;
 
         g_debug ("Starting background manager");
+        gnome_settings_profile_start (NULL);
 
         manager->priv->prefs = BG_PREFERENCES (bg_preferences_new ());
         manager->priv->bg = gnome_bg_new ();
@@ -300,13 +306,16 @@
 	 * don't waste time setting the background only to have
 	 * nautilus overwrite it.
 	 */
-	nautilus_show_desktop = gconf_client_get_bool (client,
+        nautilus_show_desktop = gconf_client_get_bool (client,
                                                        "/apps/nautilus/preferences/show_desktop",
                                                        NULL);
         g_object_unref (client);
 
-        if (!nautilus_show_desktop)
+        if (!nautilus_show_desktop) {
                 apply_prefs (manager);
+        }
+
+        gnome_settings_profile_end (NULL);
 
         return TRUE;
 }
@@ -317,21 +326,21 @@
         g_debug ("Stopping background manager");
 
         if (manager->priv->prefs != NULL) {
-        	g_object_unref (manager->priv->prefs);
-        	manager->priv->prefs = NULL;
+                g_object_unref (manager->priv->prefs);
+                manager->priv->prefs = NULL;
         }
 
         if (manager->priv->bg != NULL) {
-        	g_object_unref (manager->priv->bg);
-        	manager->priv->bg = NULL;
+                g_object_unref (manager->priv->bg);
+                manager->priv->bg = NULL;
         }
 }
 
 static void
 gsd_background_manager_set_property (GObject        *object,
-                               guint           prop_id,
-                               const GValue   *value,
-                               GParamSpec     *pspec)
+                                     guint           prop_id,
+                                     const GValue   *value,
+                                     GParamSpec     *pspec)
 {
         GsdBackgroundManager *self;
 
@@ -346,9 +355,9 @@
 
 static void
 gsd_background_manager_get_property (GObject        *object,
-                               guint           prop_id,
-                               GValue         *value,
-                               GParamSpec     *pspec)
+                                     guint           prop_id,
+                                     GValue         *value,
+                                     GParamSpec     *pspec)
 {
         GsdBackgroundManager *self;
 
@@ -363,8 +372,8 @@
 
 static GObject *
 gsd_background_manager_constructor (GType                  type,
-                              guint                  n_construct_properties,
-                              GObjectConstructParam *construct_properties)
+                                    guint                  n_construct_properties,
+                                    GObjectConstructParam *construct_properties)
 {
         GsdBackgroundManager      *background_manager;
         GsdBackgroundManagerClass *klass;

Modified: trunk/plugins/clipboard/gsd-clipboard-manager.c
==============================================================================
--- trunk/plugins/clipboard/gsd-clipboard-manager.c	(original)
+++ trunk/plugins/clipboard/gsd-clipboard-manager.c	Mon Mar 24 22:11:26 2008
@@ -44,6 +44,7 @@
 #include "xutils.h"
 #include "list.h"
 
+#include "gnome-settings-profile.h"
 #include "gsd-clipboard-manager.h"
 
 #define GSD_CLIPBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_CLIPBOARD_MANAGER, GsdClipboardManagerPrivate))
@@ -864,14 +865,15 @@
         XClientMessageEvent xev;
 
         g_debug ("Starting clipboard manager");
+        gnome_settings_profile_start (NULL);
 
         init_atoms (manager->priv->display);
 
         /* check if there is a clipboard manager running */
         if (XGetSelectionOwner (manager->priv->display, XA_CLIPBOARD_MANAGER)) {
-        	g_set_error (error, GSD_CLIPBOARD_ERROR,
-        	             GSD_CLIPBOARD_ERROR_RUNNING,
-        	             "Clipboard manager is already running.");
+                g_set_error (error, GSD_CLIPBOARD_ERROR,
+                             GSD_CLIPBOARD_ERROR_RUNNING,
+                             "Clipboard manager is already running.");
                 return FALSE;
         }
 
@@ -928,12 +930,14 @@
                                             NULL);
                 /* FIXME: manager->priv->terminate (manager->priv->cb_data); */
 
-        	g_set_error (error, GSD_CLIPBOARD_ERROR,
-        	             GSD_CLIPBOARD_ERROR_FAILED,
-        	             "Failed to claim selection.");
+                g_set_error (error, GSD_CLIPBOARD_ERROR,
+                             GSD_CLIPBOARD_ERROR_FAILED,
+                             "Failed to claim selection.");
                 return FALSE;
         }
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/dummy/gsd-dummy-manager.c
==============================================================================
--- trunk/plugins/dummy/gsd-dummy-manager.c	(original)
+++ trunk/plugins/dummy/gsd-dummy-manager.c	Mon Mar 24 22:11:26 2008
@@ -36,6 +36,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-dummy-manager.h"
 
 #define GSD_DUMMY_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_DUMMY_MANAGER, GsdDummyManagerPrivate))
@@ -62,7 +63,8 @@
                                GError               **error)
 {
         g_debug ("Starting dummy manager");
-
+        gnome_settings_profile_start (NULL);
+        gnome_settings_profile_end (NULL);
         return TRUE;
 }
 

Modified: trunk/plugins/font/gsd-font-manager.c
==============================================================================
--- trunk/plugins/font/gsd-font-manager.c	(original)
+++ trunk/plugins/font/gsd-font-manager.c	Mon Mar 24 22:11:26 2008
@@ -41,6 +41,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-font-manager.h"
 #include "delayed-dialog.h"
 
@@ -151,6 +152,8 @@
         GString    *add_string;
         const char *command;
 
+        gnome_settings_profile_start (NULL);
+
         command = "xrdb -nocpp -merge";
 
         add_string = g_string_new (NULL);
@@ -178,6 +181,8 @@
 
         g_free (cursor_theme);
         g_string_free (add_string, TRUE);
+
+        gnome_settings_profile_end (NULL);
 }
 
 static void
@@ -195,6 +200,8 @@
         int            i;
         char          *mkfontdir_cmd;
 
+        gnome_settings_profile_start (NULL);
+
         /* setting up the dir */
         font_dir_name = g_build_path (G_DIR_SEPARATOR_S, g_get_home_dir (), ".gnome2/share/fonts", NULL);
         if (! g_file_test (font_dir_name, G_FILE_TEST_EXISTS)) {
@@ -317,6 +324,8 @@
 
         XFreeFontPath (font_path);
 
+        gnome_settings_profile_end (NULL);
+
         g_free (new_font_path);
         g_free (font_dir_name);
         g_free (dir_name);
@@ -329,6 +338,7 @@
         GConfClient *client;
 
         g_debug ("Starting font manager");
+        gnome_settings_profile_start (NULL);
 
         client = gconf_client_get_default ();
 
@@ -337,6 +347,8 @@
 
         g_object_unref (client);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/keybindings/gsd-keybindings-manager.c
==============================================================================
--- trunk/plugins/keybindings/gsd-keybindings-manager.c	(original)
+++ trunk/plugins/keybindings/gsd-keybindings-manager.c	Mon Mar 24 22:11:26 2008
@@ -38,6 +38,7 @@
 #include <X11/keysym.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-keybindings-manager.h"
 
 #include "eggaccelerators.h"
@@ -562,12 +563,16 @@
         GConfClient *client;
         GSList      *list;
         GSList      *li;
-        GdkDisplay  *dpy = gdk_display_get_default ();
+        GdkDisplay  *dpy;
         GdkScreen   *screen;
-        int          screen_num = gdk_display_get_n_screens (dpy);
+        int          screen_num;
         int          i;
 
         g_debug ("Starting keybindings manager");
+        gnome_settings_profile_start (NULL);
+
+        dpy = gdk_display_get_default ();
+        screen_num = gdk_display_get_n_screens (dpy);
 
         register_config_callback (manager,
                                   GCONF_BINDING_DIR,
@@ -595,6 +600,8 @@
 
         binding_register_keys (manager);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/keyboard/gsd-keyboard-manager.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-manager.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-manager.c	Mon Mar 24 22:11:26 2008
@@ -45,6 +45,7 @@
 #include <X11/keysym.h>
 #endif
 
+#include "gnome-settings-profile.h"
 #include "gsd-keyboard-manager.h"
 
 #include "gsd-keyboard-xkb.h"
@@ -410,6 +411,8 @@
 {
         GConfClient *client;
 
+        gnome_settings_profile_start (NULL);
+
         client = gconf_client_get_default ();
         g_debug ("Starting keyboard manager");
         /* Essential - xkb initialization should happen before */
@@ -426,6 +429,8 @@
 
         g_object_unref (client);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Mon Mar 24 22:11:26 2008
@@ -113,6 +113,7 @@
 	$(AM_CFLAGS)
 
 test_media_keys_LDADD = \
+	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la	\
 	$(top_builddir)/plugins/media-keys/actions/libacme.la	\
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\

Modified: trunk/plugins/media-keys/gsd-media-keys-manager.c
==============================================================================
--- trunk/plugins/media-keys/gsd-media-keys-manager.c	(original)
+++ trunk/plugins/media-keys/gsd-media-keys-manager.c	Mon Mar 24 22:11:26 2008
@@ -42,6 +42,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-marshal.h"
 #include "gsd-media-keys-manager.h"
 #include "gsd-media-keys-manager-glue.h"
@@ -421,6 +422,8 @@
 {
         int i;
 
+        gnome_settings_profile_start (NULL);
+
         for (i = 0; i < HANDLED_KEYS; i++) {
                 char *tmp;
                 Key  *key;
@@ -464,6 +467,8 @@
 
                 grab_key (manager, key, TRUE);
         }
+
+        gnome_settings_profile_end (NULL);
 }
 
 static void
@@ -997,7 +1002,7 @@
         GSList *l;
 
         g_debug ("Starting media_keys manager");
-
+        gnome_settings_profile_start (NULL);
         manager->priv->conf_client = gconf_client_get_default ();
 
         gconf_client_add_dir (manager->priv->conf_client,
@@ -1021,6 +1026,8 @@
                                        manager);
         }
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/mouse/gsd-mouse-manager.c
==============================================================================
--- trunk/plugins/mouse/gsd-mouse-manager.c	(original)
+++ trunk/plugins/mouse/gsd-mouse-manager.c	Mon Mar 24 22:11:26 2008
@@ -45,6 +45,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-mouse-manager.h"
 
 #include "gsd-locate-pointer.h"
@@ -651,6 +652,7 @@
         GConfClient *client;
 
         g_debug ("Starting mouse manager");
+        gnome_settings_profile_start (NULL);
 
         client = gconf_client_get_default ();
 
@@ -664,6 +666,8 @@
 
         g_object_unref (client);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/screensaver/gsd-screensaver-manager.c
==============================================================================
--- trunk/plugins/screensaver/gsd-screensaver-manager.c	(original)
+++ trunk/plugins/screensaver/gsd-screensaver-manager.c	Mon Mar 24 22:11:26 2008
@@ -37,6 +37,7 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-screensaver-manager.h"
 
 #define START_SCREENSAVER_KEY   "/apps/gnome_settings_daemon/screensaver/start_screensaver"
@@ -86,6 +87,7 @@
         GConfClient *client;
 
         g_debug ("Starting screensaver manager");
+        gnome_settings_profile_start (NULL);
 
         /*
 	 * with gnome-screensaver, all settings are loaded internally
@@ -181,6 +183,8 @@
         g_propagate_error (error, gerr);
         g_object_unref (client);
 
+        gnome_settings_profile_end (NULL);
+
         return FALSE;
 }
 

Modified: trunk/plugins/sound/gsd-sound-manager.c
==============================================================================
--- trunk/plugins/sound/gsd-sound-manager.c	(original)
+++ trunk/plugins/sound/gsd-sound-manager.c	Mon Mar 24 22:11:26 2008
@@ -48,6 +48,7 @@
 #include "libsounds/sound-properties.h"
 
 #include "gsd-sound-manager.h"
+#include "gnome-settings-profile.h"
 
 #define GSD_SOUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_SOUND_MANAGER, GsdSoundManagerPrivate))
 
@@ -99,6 +100,11 @@
         GError  *error;
         gboolean res;
         time_t   starttime;
+        gboolean ret;
+
+        ret = FALSE;
+
+        gnome_settings_profile_start (NULL);
 
         error = NULL;
         res = g_spawn_async (NULL,
@@ -112,7 +118,7 @@
         if (! res) {
                 g_printerr ("Could not start esd: %s\n", error->message);
                 g_error_free (error);
-                return FALSE;
+                goto out;
         }
 
         manager->priv->child_watch_id = g_child_watch_add (manager->priv->pid,
@@ -128,7 +134,12 @@
                 gnome_sound_init (NULL);
         }
 
-        return gnome_sound_connection_get () >= 0;
+        ret = gnome_sound_connection_get () >= 0;
+
+ out:
+        gnome_settings_profile_end (NULL);
+
+        return ret;
 }
 
 static int
@@ -211,6 +222,8 @@
 
         closure = data;
 
+        gnome_settings_profile_start (NULL);
+
         key = sound_event_compose_key (event);
 
 #ifdef HAVE_ESD
@@ -218,24 +231,28 @@
          * esd allows multiple samples with the same name,
          * putting memory to waste. */
         sid = esd_sample_getid (gnome_sound_connection_get (), key);
-        if (sid >= 0)
+        if (sid >= 0) {
                 esd_sample_free (gnome_sound_connection_get (), sid);
+        }
 #endif
         /* We only disable sounds for system events.  Other events, like sounds
          * in games, should be preserved.  The games should have their own
          * configuration for sound anyway.
          */
         if ((strcmp (event->category, "gnome-2") == 0
-             || strcmp (event->category, "gtk-events-2") == 0))
+             || strcmp (event->category, "gtk-events-2") == 0)) {
                 do_load = closure->enable_system_sounds;
-        else
+        } else {
                 do_load = TRUE;
+        }
 
-        if (!do_load)
+        if (!do_load) {
                 goto out;
+        }
 
-        if (!event->file || !strcmp (event->file, ""))
+        if (!event->file || !strcmp (event->file, "")) {
                 goto out;
+        }
 
         if (event->file[0] == '/') {
                 file = g_strdup (event->file);
@@ -245,18 +262,22 @@
                                                   event->file, TRUE, NULL);
         }
 
-        if (!file)
+        if (!file) {
                 goto out;
+        }
 
         sid = gnome_sound_sample_load (key, file);
 
-        if (sid < 0)
+        if (sid < 0) {
                 g_warning (_("Couldn't load sound file %s as sample %s"),
                            file, key);
+        }
 
         g_free (file);
 
  out:
+        gnome_settings_profile_end (NULL);
+
         g_free (key);
 }
 
@@ -271,6 +292,8 @@
         gboolean        event_sounds;
         struct reload_foreach_closure closure;
 
+        gnome_settings_profile_start (NULL);
+
         client = gconf_client_get_default ();
 
         enable_sound = gconf_client_get_bool (client, "/desktop/gnome/sound/enable_esd", NULL);
@@ -283,7 +306,7 @@
         if (enable_sound) {
                 if (gnome_sound_connection_get () < 0) {
                         if (!start_gnome_sound (manager)) {
-                                return;
+                                goto out;
                         }
                 }
 #ifdef HAVE_ESD
@@ -311,6 +334,9 @@
                 sound_properties_foreach (props, reload_foreach_cb, &closure);
                 gtk_object_destroy (GTK_OBJECT (props));
         }
+ out:
+        gnome_settings_profile_end (NULL);
+
 }
 
 static void
@@ -343,11 +369,15 @@
 {
         g_debug ("Starting sound manager");
 
+        gnome_settings_profile_start (NULL);
+
         register_config_callback (manager,
                                   "/desktop/gnome/sound",
                                   (GConfClientNotifyFunc)sound_callback);
         apply_settings (manager);
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/typing-break/gsd-typing-break-manager.c
==============================================================================
--- trunk/plugins/typing-break/gsd-typing-break-manager.c	(original)
+++ trunk/plugins/typing-break/gsd-typing-break-manager.c	Mon Mar 24 22:11:26 2008
@@ -37,6 +37,7 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-typing-break-manager.h"
 
 #define GSD_TYPING_BREAK_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_TYPING_BREAK_MANAGER, GsdTypingBreakManagerPrivate))
@@ -99,6 +100,8 @@
 setup_typing_break (GsdTypingBreakManager *manager,
                     gboolean               enabled)
 {
+        gnome_settings_profile_start (NULL);
+
         if (! enabled) {
                 if (manager->priv->typing_monitor_pid != 0) {
                         manager->priv->typing_monitor_idle_id = g_timeout_add_seconds (3, (GSourceFunc) typing_break_timeout, manager);
@@ -140,6 +143,8 @@
                                                                    (GChildWatchFunc)child_watch,
                                                                    manager);
         }
+
+        gnome_settings_profile_end (NULL);
 }
 
 static void
@@ -171,6 +176,8 @@
         gboolean     enabled;
 
         g_debug ("Starting typing_break manager");
+        gnome_settings_profile_start (NULL);
+
         register_config_callback (manager,
                                   "/desktop/gnome/typing_break",
                                   (GConfClientNotifyFunc)typing_break_callback);
@@ -184,6 +191,8 @@
                                                                  manager);
         }
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Mon Mar 24 22:11:26 2008
@@ -41,6 +41,7 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 
+#include "gnome-settings-profile.h"
 #include "gsd-xrandr-manager.h"
 
 static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
@@ -195,18 +196,20 @@
         int          i;
         int          residx;
 
+        gnome_settings_profile_start (NULL);
+
         display = gdk_display_get_default ();
         xdisplay = gdk_x11_display_get_xdisplay (display);
 
         /* Check if XRandR is supported on the display */
         if (!XRRQueryExtension (xdisplay, &event_base, &error_base)
             || XRRQueryVersion (xdisplay, &major, &minor) == 0) {
-                return;
+                goto out;
         }
 
         if (major != 1 || minor < 1) {
                 g_message ("Display has unsupported version of XRandR (%d.%d), not setting resolution.", major, minor);
-                return;
+                goto out;
         }
 
         client = gconf_client_get_default ();
@@ -291,6 +294,8 @@
         if (client != NULL) {
                 g_object_unref (client);
         }
+ out:
+        gnome_settings_profile_end (NULL);
 
 #endif /* HAVE_RANDR */
 }

Modified: trunk/plugins/xrdb/gsd-xrdb-manager.c
==============================================================================
--- trunk/plugins/xrdb/gsd-xrdb-manager.c	(original)
+++ trunk/plugins/xrdb/gsd-xrdb-manager.c	Mon Mar 24 22:11:26 2008
@@ -37,6 +37,7 @@
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-xrdb-manager.h"
 
 #define GSD_XRDB_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_XRDB_MANAGER, GsdXrdbManagerPrivate))
@@ -433,6 +434,8 @@
         GSList     *p;
         GError     *error;
 
+        gnome_settings_profile_start (NULL);
+
         command = "xrdb -merge";
 
         string = g_string_sized_new (256);
@@ -474,6 +477,8 @@
         spawn_with_input (command, string->str);
         g_string_free (string, TRUE);
 
+        gnome_settings_profile_end (NULL);
+
         return;
 }
 
@@ -491,6 +496,8 @@
 {
         static gboolean initialized = FALSE;
 
+        gnome_settings_profile_start (NULL);
+
         if (! initialized) {
                 GtkSettings *settings;
                 /* the initialization is done here otherwise
@@ -507,6 +514,8 @@
                 initialized = TRUE;
         }
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 

Modified: trunk/plugins/xsettings/gsd-xsettings-manager.c
==============================================================================
--- trunk/plugins/xsettings/gsd-xsettings-manager.c	(original)
+++ trunk/plugins/xsettings/gsd-xsettings-manager.c	Mon Mar 24 22:11:26 2008
@@ -37,6 +37,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include "gnome-settings-profile.h"
 #include "gsd-xsettings-manager.h"
 #include "xsettings-manager.h"
 
@@ -355,6 +356,9 @@
                             GnomeXftSettings      *settings)
 {
         int i;
+
+        gnome_settings_profile_start (NULL);
+
         for (i = 0; manager->priv->managers [i]; i++) {
                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/Antialias", settings->antialias);
                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/Hinting", settings->hinting);
@@ -362,6 +366,7 @@
                 xsettings_manager_set_int (manager->priv->managers [i], "Xft/DPI", settings->dpi);
                 xsettings_manager_set_string (manager->priv->managers [i], "Xft/RGBA", settings->rgba);
         }
+        gnome_settings_profile_end (NULL);
 }
 
 static gboolean
@@ -451,6 +456,8 @@
         GString    *add_string;
         char        dpibuf[G_ASCII_DTOSTR_BUF_SIZE];
 
+        gnome_settings_profile_start (NULL);
+
         command = "xrdb -nocpp -merge";
 
         add_string = g_string_new (NULL);
@@ -474,6 +481,8 @@
         spawn_with_input (command, add_string->str);
 
         g_string_free (add_string, TRUE);
+
+        gnome_settings_profile_end (NULL);
 }
 
 /* We mirror the Xft properties both through XSETTINGS and through
@@ -485,9 +494,13 @@
 {
         GnomeXftSettings settings;
 
+        gnome_settings_profile_start (NULL);
+
         xft_settings_get (client, &settings);
         xft_settings_set_xsettings (manager, &settings);
         xft_settings_set_xresources (&settings);
+
+        gnome_settings_profile_end (NULL);
 }
 
 static void
@@ -564,6 +577,7 @@
         int          i;
 
         g_debug ("Starting xsettings manager");
+        gnome_settings_profile_start (NULL);
 
         client = gconf_client_get_default ();
 
@@ -604,6 +618,8 @@
                 xsettings_manager_notify (manager->priv->managers [i]);
         }
 
+        gnome_settings_profile_end (NULL);
+
         return TRUE;
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]