mousetweaks r202 - in trunk: . src

[gerdk svn gnome org]

Author: gerdk
Date: Sun Jul  6 11:48:07 2008
New Revision: 202
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=202&view=rev

Log:
2008-07-06 Gerd Kohlberger <gerdk svn gnome org>

	* src/mt-main.c: (accessibility_enabled): Avoid getting launched by
	g-s-d again when we disable our gconf keys.
	* src/dwell-click-applet.c: Remove an unused var and some cleanup.



Modified:
   trunk/ChangeLog
   trunk/src/dwell-click-applet.c
   trunk/src/mt-main.c

Modified: trunk/src/dwell-click-applet.c
==============================================================================
--- trunk/src/dwell-click-applet.c	(original)
+++ trunk/src/dwell-click-applet.c	Sun Jul  6 11:48:07 2008
@@ -102,11 +102,10 @@
 enable_dwell_changed (GtkToggleButton *button, gpointer data)
 {
     DwellData *dd = data;
-    gboolean dwell, ctw;
+    gboolean dwell;
 
-    ctw = gconf_client_get_bool (dd->client, OPT_CTW, NULL);
-    if (ctw)
-	gconf_client_set_bool (dd->client, OPT_CTW, FALSE, NULL);
+    /* disable click-type window if it's active */
+    gconf_client_set_bool (dd->client, OPT_CTW, FALSE, NULL);
 
     dwell = gtk_toggle_button_get_active (button);
     gconf_client_set_bool (dd->client, OPT_DWELL, dwell, NULL);
@@ -145,8 +144,6 @@
 	return FALSE;
 
     if (event->type == GDK_ENTER_NOTIFY) {
-	gdouble delay;
-
 	if (!dd->tid) {
 	    dd->delay = gconf_client_get_float (dd->client, OPT_DWELL_T, &error);
 	    if (error) {
@@ -550,8 +547,8 @@
 
     if (g_str_equal (key, OPT_MODE)) {
 	update_sensitivity (dd);
-    } else if (g_str_equal (key, OPT_DWELL) &&
-	       value->type == GCONF_VALUE_BOOL) {
+    }
+    else if (g_str_equal (key, OPT_DWELL) && value->type == GCONF_VALUE_BOOL) {
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dd->enable),
 				      gconf_value_get_bool (value));
 	update_sensitivity (dd);

Modified: trunk/src/mt-main.c
==============================================================================
--- trunk/src/mt-main.c	(original)
+++ trunk/src/mt-main.c	Sun Jul  6 11:48:07 2008
@@ -547,8 +547,10 @@
 	}
 	else {
 	    /* reset the selected option again */
-	    gconf_client_set_bool (mt->client, OPT_DELAY, FALSE, NULL);
-	    gconf_client_set_bool (mt->client, OPT_DWELL, FALSE, NULL);
+	    if (gconf_client_get_bool (mt->client, OPT_DELAY, NULL))
+		gconf_client_set_bool (mt->client, OPT_DELAY, FALSE, NULL);
+	    if (gconf_client_get_bool (mt->client, OPT_DWELL, NULL))
+		gconf_client_set_bool (mt->client, OPT_DWELL, FALSE, NULL);
 	}
 	return FALSE;
     }