gpointing-device-settings r174 - trunk/src

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sun Mar  8 05:29:32 2009
New Revision: 174
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=174&view=rev

Log:
Use GDK function to handle Atom and its name.

Modified:
   trunk/src/gpds-xinput-pointer-info.c
   trunk/src/gpds-xinput-utils.c
   trunk/src/gpds-xinput.c

Modified: trunk/src/gpds-xinput-pointer-info.c
==============================================================================
--- trunk/src/gpds-xinput-pointer-info.c	(original)
+++ trunk/src/gpds-xinput-pointer-info.c	Sun Mar  8 05:29:32 2009
@@ -61,7 +61,7 @@
         if (device_infos[i].use != IsXExtensionPointer)
             continue;
         info = gpds_xinput_pointer_info_new(device_infos[i].name,
-                                            XGetAtomName(GDK_DISPLAY(), device_infos[i].type));
+                                            gdk_x11_get_xatom_name(device_infos[i].type));
 
         device_names = g_list_append(device_names, info);
     }

Modified: trunk/src/gpds-xinput-utils.c
==============================================================================
--- trunk/src/gpds-xinput-utils.c	(original)
+++ trunk/src/gpds-xinput-utils.c	Sun Mar  8 05:29:32 2009
@@ -89,7 +89,7 @@
 {
     Atom float_atom;
 
-    float_atom = XInternAtom(GDK_DISPLAY(), "FLOAT", False);
+    float_atom = gdk_x11_get_xatom_by_name("FLOAT");
     if (float_atom == 0) {
         g_set_error(error,
                     GPDS_XINPUT_UTILS_ERROR,

Modified: trunk/src/gpds-xinput.c
==============================================================================
--- trunk/src/gpds-xinput.c	(original)
+++ trunk/src/gpds-xinput.c	Sun Mar  8 05:29:32 2009
@@ -197,7 +197,7 @@
     if (!device)
         return FALSE;
 
-    property_atom = XInternAtom(GDK_DISPLAY(), property_name, False);
+    property_atom = gdk_x11_get_xatom_by_name(property_name);
 
     switch (format_type) {
     case 8:
@@ -255,7 +255,7 @@
     for (i = 0; i < n_properties; i++) {
         gchar *name;
 
-        name = XGetAtomName(GDK_DISPLAY(), properties[i]);
+        name = gdk_x11_get_xatom_name(properties[i]);
         if (!strcmp(name, property_name)) {
             found_atom = properties[i];
             XFree(name);
@@ -372,7 +372,7 @@
     if (float_atom == 0)
         return FALSE;
 
-    property_atom = XInternAtom(GDK_DISPLAY(), property_name, False);
+    property_atom = gdk_x11_get_xatom_by_name(property_name);
 
     property_data = g_new(gfloat, n_properties);
     for (i = 0; i < n_properties; i++)