2005-05-22 Sebastien Bacher <seb128@debian.org> * ChangeLog capplets/about-me/e-image-chooser.c capplets/accessibility/at-properties/at-startup-session.h capplets/accessibility/keyboard/accessibility-keyboard.c capplets/background/gnome-wp-info.c capplets/common/gconf-property-editor.c capplets/common/gnome-theme-apply.c capplets/default-applications/gnome-default-applications-properties.c capplets/keybindings/gnome-keybinding-properties.c capplets/keyboard/gnome-keyboard-properties.c capplets/mouse/gnome-mouse-properties.c capplets/network/gnome-network-preferences.c capplets/sound/sound-properties-capplet.c capplets/theme-switcher/gnome-theme-details.c capplets/theme-switcher/gnome-theme-manager.c capplets/ui-properties/gnome-ui-properties.c capplets/windows/gnome-window-properties.c gnome-settings-daemon/factory.c gnome-settings-daemon/gnome-settings-accessibility-keyboard.c gnome-settings-daemon/gnome-settings-background.c gnome-settings-daemon/gnome-settings-daemon.c gnome-settings-daemon/gnome-settings-daemon.h gnome-settings-daemon/gnome-settings-font.c gnome-settings-daemon/gnome-settings-keybindings.c gnome-settings-daemon/gnome-settings-keybindings.h gnome-settings-daemon/gnome-settings-keyboard-xkb.c gnome-settings-daemon/gnome-settings-keyboard.c gnome-settings-daemon/gnome-settings-locate-pointer.h gnome-settings-daemon/gnome-settings-mouse.c gnome-settings-daemon/gnome-settings-multimedia-keys.c gnome-settings-daemon/gnome-settings-screensaver.c gnome-settings-daemon/gnome-settings-sound.c gnome-settings-daemon/gnome-settings-xmodmap.c gnome-settings-daemon/gnome-settings-xrdb.c gnome-settings-daemon/gnome-settings-xsettings.c libbackground/applier.c libbackground/applier.h libbackground/preferences.c libsounds/sound-properties.c libsounds/sound-view.h libwindow-settings/gnome-wm-manager.c libwindow-settings/metacity-window-manager.c typing-break/drw-break-window.c typing-break/drw-utils.h typing-break/drwright.c vfs-methods/fontilus/font-view.c vfs-methods/themus/themus-theme-applier.c: Cleanup of gconf and a few other things, patch from Kjartan Maraas <kmaraas@gnome.org> (Closes: #301945).
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
#include <config.h>
|
|
|
|
#include "gnome-settings-daemon.h"
|
|
|
|
#include <bonobo.h>
|
|
#include <bonobo/bonobo-object.h>
|
|
#include <bonobo/bonobo-generic-factory.h>
|
|
|
|
#include <gconf/gconf.h>
|
|
|
|
#include <libgnome/gnome-init.h>
|
|
#include <libgnomeui/gnome-ui-init.h>
|
|
#include <libgnomeui/gnome-client.h>
|
|
|
|
static BonoboObject *services_server = NULL;
|
|
|
|
int main (int argc, char *argv [])
|
|
{
|
|
GnomeClient *session;
|
|
Bonobo_RegistrationResult ret;
|
|
gchar *restart_argv[] = { "gnome-settings-daemon", NULL, NULL };
|
|
|
|
restart_argv[1] = *argv;
|
|
|
|
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
|
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
|
textdomain (GETTEXT_PACKAGE);
|
|
|
|
gnome_program_init ("gnome-settings-daemon", VERSION,
|
|
LIBGNOMEUI_MODULE,
|
|
argc, argv,
|
|
GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
|
|
NULL);
|
|
|
|
if (!bonobo_init (&argc, argv)) {
|
|
g_error (_("Could not initialize Bonobo"));
|
|
}
|
|
|
|
gconf_init (argc, argv, NULL); /* exits w/ message on failure */
|
|
|
|
/* start the settings daemon */
|
|
services_server = BONOBO_OBJECT (gnome_settings_daemon_new ());
|
|
|
|
ret = bonobo_activation_active_server_register ("OAFIID:GNOME_SettingsDaemon",
|
|
BONOBO_OBJREF (services_server));
|
|
if (ret != Bonobo_ACTIVATION_REG_SUCCESS) {
|
|
g_warning ("Encountered problems registering the settings daemon with bonobo-activation. "
|
|
"Clients may not detect that the settings daemon is already running.");
|
|
}
|
|
|
|
session = gnome_master_client ();
|
|
gnome_client_set_restart_command (session, 2, restart_argv);
|
|
gnome_client_set_restart_style (session, GNOME_RESTART_IMMEDIATELY);
|
|
gnome_client_set_priority (session, 5);
|
|
g_signal_connect (session, "die",
|
|
G_CALLBACK (gtk_main_quit), NULL);
|
|
|
|
gtk_main();
|
|
|
|
return -1;
|
|
}
|