gpointing-device-settings r52 - trunk/modules

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sat Feb 28 05:21:56 2009
New Revision: 52
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=52&view=rev

Log:
check gconf directory check.

Modified:
   trunk/modules/gpds-touchpad-gconf.h
   trunk/modules/gpds-touchpad-ui.c

Modified: trunk/modules/gpds-touchpad-gconf.h
==============================================================================
--- trunk/modules/gpds-touchpad-gconf.h	(original)
+++ trunk/modules/gpds-touchpad-gconf.h	Sat Feb 28 05:21:56 2009
@@ -20,25 +20,27 @@
 #ifndef __GPDS_TOUCHPAD_GCONF_H__
 #define __GPDS_TOUCHPAD_GCONF_H__
 
-#define GPDS_TOUCHPAD_SENSITIVITY_KEY             "/desktop/gnome/peripherals/touchpad/sensitivity"
-#define GPDS_TOUCHPAD_OFF_KEY                     "/desktop/gnome/peripherals/touchpad/off"
-#define GPDS_TOUCHPAD_MAX_TAP_TIME_KEY            "/desktop/gnome/peripherals/touchpad/max_tap_time"
-#define GPDS_TOUCHPAD_HORIZONTAL_SCROLL_DELTA_KEY "/desktop/gnome/peripherals/touchpad/horiz_scroll_delta"
-#define GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_KEY    "/desktop/gnome/peripherals/touchpad/horizontal_scrolling"
-#define GPDS_TOUCHPAD_VERTICAL_SCROLL_DELTA_KEY   "/desktop/gnome/peripherals/touchpad/vert_scroll_delta"
-#define GPDS_TOUCHPAD_VERTICAL_SCROLLING_KEY      "/desktop/gnome/peripherals/touchpad/vertical_scrolling"
-#define GPDS_TOUCHPAD_EDGEMOTIONUSEALWAYS_KEY     "/desktop/gnome/peripherals/touchpad/edge_motion_use_always"
-#define GPDS_TOUCHPAD_COASTENABLE_KEY             "/desktop/gnome/peripherals/touchpad/coast_enable"
-#define GPDS_TOUCHPAD_CIRCULAR_SCROLLING_KEY      "/desktop/gnome/peripherals/touchpad/circular_scrolling"
-#define GPDS_TOUCHPAD_CIRCSCROLLDELTA_KEY         "/desktop/gnome/peripherals/touchpad/circ_scroll_delta"
-#define GPDS_TOUCHPAD_CIRCSCROLLTRIGGER_KEY       "/desktop/gnome/peripherals/touchpad/circ_scroll_trigger"
-#define GPDS_TOUCHPAD_FASTTAPS_KEY                "/desktop/gnome/peripherals/touchpad/fast_taps"
-#define GPDS_TOUCHPAD_BUTTONFORTAP_KEY            "/desktop/gnome/peripherals/touchpad/button_for_tap"
-#define GPDS_TOUCHPAD_ABSCOORDX_KEY               "/desktop/gnome/peripherals/touchpad/abs_coord_x"
-#define GPDS_TOUCHPAD_ABSCOORDY_KEY               "/desktop/gnome/peripherals/touchpad/abs_coord_y"
-#define GPDS_TOUCHPAD_MINSPEED_KEY                "/desktop/gnome/peripherals/touchpad/min_speed"
-#define GPDS_TOUCHPAD_MAXSPEED_KEY                "/desktop/gnome/peripherals/touchpad/max_speed"
-#define GPDS_TOUCHPAD_ACCELFACTOR_KEY             "/desktop/gnome/peripherals/touchpad/accel_factor"
+#define GPDS_TOUCHPAD_GCONF_DIR                   "/desktop/gnome/peripherals/touchpad"
+
+#define GPDS_TOUCHPAD_SENSITIVITY_KEY             GPDS_TOUCHPAD_GCONF_DIR "/sensitivity"
+#define GPDS_TOUCHPAD_OFF_KEY                     GPDS_TOUCHPAD_GCONF_DIR "/off"
+#define GPDS_TOUCHPAD_MAX_TAP_TIME_KEY            GPDS_TOUCHPAD_GCONF_DIR "/max_tap_time"
+#define GPDS_TOUCHPAD_HORIZONTAL_SCROLL_DELTA_KEY GPDS_TOUCHPAD_GCONF_DIR "/horiz_scroll_delta"
+#define GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_KEY    GPDS_TOUCHPAD_GCONF_DIR "/horizontal_scrolling"
+#define GPDS_TOUCHPAD_VERTICAL_SCROLL_DELTA_KEY   GPDS_TOUCHPAD_GCONF_DIR "/vert_scroll_delta"
+#define GPDS_TOUCHPAD_VERTICAL_SCROLLING_KEY      GPDS_TOUCHPAD_GCONF_DIR "/vertical_scrolling"
+#define GPDS_TOUCHPAD_EDGEMOTIONUSEALWAYS_KEY     GPDS_TOUCHPAD_GCONF_DIR "/edge_motion_use_always"
+#define GPDS_TOUCHPAD_COASTENABLE_KEY             GPDS_TOUCHPAD_GCONF_DIR "/coast_enable"
+#define GPDS_TOUCHPAD_CIRCULAR_SCROLLING_KEY      GPDS_TOUCHPAD_GCONF_DIR "/circular_scrolling"
+#define GPDS_TOUCHPAD_CIRCSCROLLDELTA_KEY         GPDS_TOUCHPAD_GCONF_DIR "/circ_scroll_delta"
+#define GPDS_TOUCHPAD_CIRCSCROLLTRIGGER_KEY       GPDS_TOUCHPAD_GCONF_DIR "/circ_scroll_trigger"
+#define GPDS_TOUCHPAD_FASTTAPS_KEY                GPDS_TOUCHPAD_GCONF_DIR "/fast_taps"
+#define GPDS_TOUCHPAD_BUTTONFORTAP_KEY            GPDS_TOUCHPAD_GCONF_DIR "/button_for_tap"
+#define GPDS_TOUCHPAD_ABSCOORDX_KEY               GPDS_TOUCHPAD_GCONF_DIR "/abs_coord_x"
+#define GPDS_TOUCHPAD_ABSCOORDY_KEY               GPDS_TOUCHPAD_GCONF_DIR "/abs_coord_y"
+#define GPDS_TOUCHPAD_MINSPEED_KEY                GPDS_TOUCHPAD_GCONF_DIR "/min_speed"
+#define GPDS_TOUCHPAD_MAXSPEED_KEY                GPDS_TOUCHPAD_GCONF_DIR "/max_speed"
+#define GPDS_TOUCHPAD_ACCELFACTOR_KEY             GPDS_TOUCHPAD_GCONF_DIR "/accel_factor"
 
 #endif /* __GPDS_TOUCHPAD_GCONF_H__ */
 /*

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Sat Feb 28 05:21:56 2009
@@ -477,21 +477,23 @@
                                       const gchar *object_name)
 {
     GObject *object;
-    GError *error = NULL;
     gint *values;
     gulong n_values;
     gint value;
+    gboolean dir_exists;
 
     if (!get_integer_property(ui->xinput, property_name,
                               &values, &n_values)) {
         return;
     }
 
-    value = gconf_client_get_int(ui->gconf, gconf_key_name, &error);
+    dir_exists = gconf_client_dir_exists(ui->gconf, GPDS_TOUCHPAD_GCONF_DIR, NULL);
+    if (dir_exists)
+        value = gconf_client_get_int(ui->gconf, gconf_key_name, NULL);
+    else
+        value = values[0];
     object = gtk_builder_get_object(builder, object_name);
-    gtk_range_set_value(GTK_RANGE(object), error ? values[0] : value);
-    if (error)
-        g_clear_error(&error);
+    gtk_range_set_value(GTK_RANGE(object), value);
     g_free(values);
 }
 
@@ -503,22 +505,22 @@
                                       const gchar *object_name)
 {
     GObject *object;
-    GError *error = NULL;
     gint *values;
     gulong n_values;
-    gboolean enable;
+    gboolean enable, dir_exists;
 
     if (!get_integer_property(ui->xinput, property_name,
                               &values, &n_values)) {
         return;
     }
 
-    enable = gconf_client_get_bool(ui->gconf, gconf_key_name, &error);
+    dir_exists = gconf_client_dir_exists(ui->gconf, GPDS_TOUCHPAD_GCONF_DIR, NULL);
+    if (dir_exists)
+        enable = gconf_client_get_bool(ui->gconf, gconf_key_name, NULL);
+    else
+        enable = (values[0] == 1);
     object = gtk_builder_get_object(builder, object_name);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object),
-                                 error ? values[0] == 1 ? TRUE : FALSE : enable);
-    if (error)
-        g_clear_error(&error);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object), enable);
     g_free(values);
 }
 
@@ -527,10 +529,9 @@
                                           GtkBuilder *builder)
 {
     GObject *object;
-    GError *error = NULL;
     gint *values;
     gulong n_values;
-    gboolean enable;
+    gboolean enable, dir_exists;
 
     if (!get_integer_property(ui->xinput, EDGE_SCROLLING,
                               &values, &n_values)) {
@@ -542,19 +543,20 @@
         return;
     }
 
-    enable = gconf_client_get_bool(ui->gconf, GPDS_TOUCHPAD_VERTICAL_SCROLLING_KEY, &error);
+    dir_exists = gconf_client_dir_exists(ui->gconf, GPDS_TOUCHPAD_GCONF_DIR, NULL);
+    if (dir_exists)
+        enable = gconf_client_get_bool(ui->gconf, GPDS_TOUCHPAD_VERTICAL_SCROLLING_KEY, NULL);
+    else
+        enable = (values[0] == 1);
     object = gtk_builder_get_object(builder, "vertical_scroll_check");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object),
-                                 error ? values[0] == 1 ? TRUE : FALSE : enable);
-    if (error)
-        g_clear_error(&error);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object), enable);
 
-    enable = gconf_client_get_bool(ui->gconf, GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_KEY, &error);
+    if (dir_exists)
+        enable = gconf_client_get_bool(ui->gconf, GPDS_TOUCHPAD_HORIZONTAL_SCROLLING_KEY, NULL);
+    else
+        enable = (values[0] == 1);
     object = gtk_builder_get_object(builder, "horizontal_scroll_check");
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object),
-                                 error ? values[1] == 1 ? TRUE : FALSE : enable);
-    if (error)
-        g_clear_error(&error);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(object), enable);
 
     g_free(values);
 }