gpointing-device-settings r64 - trunk/modules

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sun Mar  1 01:34:22 2009
New Revision: 64
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=64&view=rev

Log:
Also move GPDS_TRACK_POINT_DEVICE_NAME.

Modified:
   trunk/modules/gpds-trackpoint-definitions.h
   trunk/modules/gpds-trackpoint-ui.c

Modified: trunk/modules/gpds-trackpoint-definitions.h
==============================================================================
--- trunk/modules/gpds-trackpoint-definitions.h	(original)
+++ trunk/modules/gpds-trackpoint-definitions.h	Sun Mar  1 01:34:22 2009
@@ -20,6 +20,8 @@
 #ifndef __GPDS_TRACK_POINT_GCONF_H__
 #define __GPDS_TRACK_POINT_GCONF_H__
 
+#define GPDS_TRACK_POINT_DEVICE_NAME "TPPS/2 IBM TrackPoint"
+
 #define GPDS_TRACK_POINT_MIDDLE_BUTTON_EMULATION "Middle Button Emulation"
 #define GPDS_TRACK_POINT_MIDDLE_BUTTON_TIMEOUT   "Middle Button Timeout"
 #define GPDS_TRACK_POINT_WHEEL_EMULATION         "Wheel Emulation"

Modified: trunk/modules/gpds-trackpoint-ui.c
==============================================================================
--- trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-trackpoint-ui.c	Sun Mar  1 01:34:22 2009
@@ -29,8 +29,6 @@
 
 #include "gpds-trackpoint-definitions.h"
 
-#define DEVICE_NAME "TPPS/2 IBM TrackPoint"
-
 #define GPDS_TYPE_TRACK_POINT_UI            (gpds_track_point_ui_get_type())
 #define GPDS_TRACK_POINT_UI(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GPDS_TYPE_TRACK_POINT_UI, GpdsTrackPointUI))
 #define GPDS_TRACK_POINT_UI_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GPDS_TYPE_TRACK_POINT_UI, GpdsTrackPointUIClass))
@@ -490,7 +488,7 @@
 static gboolean
 is_available (GpdsUI *ui, GError **error)
 {
-    if (!gpds_xinput_exist_device(DEVICE_NAME)) {
+    if (!gpds_xinput_exist_device(GPDS_TRACK_POINT_DEVICE_NAME)) {
         g_set_error(error,
                     GPDS_XINPUT_ERROR,
                     GPDS_XINPUT_ERROR_NO_DEVICE,
@@ -524,7 +522,7 @@
         return FALSE;
     }
 
-    GPDS_TRACK_POINT_UI(ui)->xinput = gpds_xinput_new(DEVICE_NAME);
+    GPDS_TRACK_POINT_UI(ui)->xinput = gpds_xinput_new(GPDS_TRACK_POINT_DEVICE_NAME);
 
     setup_current_values(ui, builder);
     setup_signals(ui, builder);