From 024ad269ad89d950f7fbb29ee7019a1c159aac0b Mon Sep 17 00:00:00 2001
From: Seth Nickell <snickell@stanford.edu>
Date: Mon, 11 Mar 2002 01:52:13 +0000
Subject: [PATCH] Activate the settings daemon if its not already running.

2002-03-10  Seth Nickell  <snickell@stanford.edu>

	* main.c: (main):
	* sound-properties-capplet.c: (main):

	Activate the settings daemon if its not already running.
---
 capplets/sound/ChangeLog                  | 7 +++++++
 capplets/sound/main.c                     | 4 ++++
 capplets/sound/sound-properties-capplet.c | 4 ++++
 3 files changed, 15 insertions(+)

diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index f0295dce9..b446c53f5 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-10  Seth Nickell  <snickell@stanford.edu>
+
+	* main.c: (main):
+	* sound-properties-capplet.c: (main):
+
+	Activate the settings daemon if its not already running.
+	
 2002-03-07  Richard Hestilow  <hestilow@ximian.com>
 	
 	* sound-properties-capplet.c (main): Okay, so I'm an idiot.
diff --git a/capplets/sound/main.c b/capplets/sound/main.c
index 03b2d91f4..d26548914 100644
--- a/capplets/sound/main.c
+++ b/capplets/sound/main.c
@@ -25,6 +25,8 @@
 #  include <config.h>
 #endif
 
+#include "activate-settings-daemon.h"
+
 #include <gtk/gtk.h>
 #include <gnome.h>
 #include <libgnomeui/gnome-window-icon.h>
@@ -211,6 +213,8 @@ main (int argc, char **argv)
 				  VERSION, argc, argv, NULL,
 				  0, NULL);
 
+	activate_settings_daemon ();
+
 	if (res < 0) {
 		g_error ("Could not initialize the capplet.");
 	}
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index ab06bc171..69ca819ad 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -39,6 +39,8 @@
 #include <stdlib.h>
 #include <sys/types.h>
 
+#include "activate-settings-daemon.h"
+
 /* Capplet-specific prototypes */
 
 static SoundProperties *props = NULL;
@@ -147,6 +149,8 @@ main (int argc, char **argv)
 			    GNOME_PARAM_POPT_TABLE, cap_options,
 			    NULL);
 
+	activate_settings_daemon ();
+	
 	client = gconf_client_get_default ();
 	gconf_client_add_dir (client, "/desktop/gnome/sound", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);