diff options
| author | Jens Granseuer <jensgr@gmx.net> | 2008-04-18 19:06:32 +0000 |
|---|---|---|
| committer | Jens Granseuer <jensg@src.gnome.org> | 2008-04-18 19:06:32 +0000 |
| commit | 74bbfd339ad9f069ba1c65b0d14b7a0a3be53f3e (patch) | |
| tree | 46fc6eb888776866f8e461a5030cd972a074adfb /plugins | |
| parent | 7839baa7c686868f1ebd2aa66f93e27fd1141d70 (diff) | |
| download | gnome-settings-daemon-74bbfd339ad9f069ba1c65b0d14b7a0a3be53f3e.tar.gz | |
when we can't launch the daemon reset the GConf keys before showing the
2008-04-18 Jens Granseuer <jensgr@gmx.net>
* plugins/mouse/gsd-mouse-manager.c: (set_mousetweaks_daemon): when we
can't launch the daemon reset the GConf keys before showing the error
dialog. If we wait until after the dialog is closed, the user can
still toggle the settings while it's open
svn path=/trunk/; revision=308
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mouse/gsd-mouse-manager.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c index c0918344..b77207d5 100644 --- a/plugins/mouse/gsd-mouse-manager.c +++ b/plugins/mouse/gsd-mouse-manager.c @@ -554,6 +554,17 @@ set_mousetweaks_daemon (GsdMouseManager *manager, GtkWidget *dialog; GConfClient *client; + client = gconf_client_get_default (); + if (dwell_enable) + gconf_client_set_bool (client, + KEY_DWELL_ENABLE, + FALSE, NULL); + else if (delay_enable) + gconf_client_set_bool (client, + KEY_DELAY_ENABLE, + FALSE, NULL); + g_object_unref (client); + dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, @@ -567,17 +578,6 @@ set_mousetweaks_daemon (GsdMouseManager *manager, "gnome-dev-mouse-optical"); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - - client = gconf_client_get_default (); - if (dwell_enable) - gconf_client_set_bool (client, - KEY_DWELL_ENABLE, - FALSE, NULL); - else if (delay_enable) - gconf_client_set_bool (client, - KEY_DELAY_ENABLE, - FALSE, NULL); - g_object_unref (client); } g_error_free (error); } |