return NULL when there is an error, not exit(), so that we do proper
2007-04-02 Rodrigo Moya <rodrigo@gnome-db.org> * gnome-settings-daemon.c (gnome_settings_daemon_new): return NULL when there is an error, not exit(), so that we do proper cleanup. Remove code to register GConf callbacks, that is done in utils.c. (gnome_settings_daemon_get_conf_client, gnome_settings_daemon_register_callback, gnome_settings_daemon_spawn_with_input, gnome_settings_daemon_get_invisible, gnome_settings_daemon_delayed_show_dialog): removed from the GnomeSettingsDaemon interface. * utils.c (gnome_settings_get_config_client, gnome_settings_get_invisible, gnome_settings_register_config_callback, gnome_settings_spawn_with_input, gnome_settings_delayed_show_dialog): moved from GnomeSettingsDaemon interface. * factory.c (main): check return value from gnome_settings_daemon(). * *.c: adapted to changes in function names. * Makefile.am: put source files in alphabetical order. svn path=/trunk/; revision=7434
This commit is contained in:
parent
23e6f1e2a7
commit
e16cbd24dc
20 changed files with 233 additions and 430 deletions
|
@ -125,7 +125,7 @@ gnome_settings_default_editor_init (GConfClient *client)
|
|||
{
|
||||
sync_changes = gconf_client_get_bool (client, SYNC_CHANGES_KEY, NULL);
|
||||
|
||||
gnome_settings_daemon_register_callback (SYNC_CHANGES_KEY, sync_changes_cb);
|
||||
gnome_settings_register_config_callback (SYNC_CHANGES_KEY, sync_changes_cb);
|
||||
|
||||
g_signal_connect (gnome_vfs_mime_monitor_get (), "data_changed",
|
||||
G_CALLBACK (vfs_change_cb), client);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue