gpointing-device-settings r137 - in trunk: src test

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Mar  6 14:48:18 2009
New Revision: 137
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=137&view=rev

Log:
added gpds_xinput_pointer_info_get_name and gpds_xinput_pointer_info_get_type_name.

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

Modified: trunk/src/gpds-xinput-pointer-info.c
==============================================================================
--- trunk/src/gpds-xinput-pointer-info.c	(original)
+++ trunk/src/gpds-xinput-pointer-info.c	Fri Mar  6 14:48:18 2009
@@ -71,6 +71,18 @@
     return device_names;
 }
 
+const gchar *
+gpds_xinput_pointer_info_get_name (GpdsXInputPointerInfo *info)
+{
+    return info->name;
+}
+
+const gchar *
+gpds_xinput_pointer_info_get_type_name (GpdsXInputPointerInfo *info)
+{
+    return info->type_name;
+}
+
 /*
 vi:ts=4:nowrap:ai:expandtab:sw=4
 */

Modified: trunk/src/gpds-xinput-pointer-info.h
==============================================================================
--- trunk/src/gpds-xinput-pointer-info.h	(original)
+++ trunk/src/gpds-xinput-pointer-info.h	Fri Mar  6 14:48:18 2009
@@ -34,6 +34,10 @@
 GpdsXInputPointerInfo *gpds_xinput_pointer_info_new     (const gchar *name,
                                                          const gchar *type_name);
 void                   gpds_xinput_pointer_info_free    (GpdsXInputPointerInfo *info);
+const gchar           *gpds_xinput_pointer_info_get_name
+                                                        (GpdsXInputPointerInfo *info);
+const gchar           *gpds_xinput_pointer_info_get_type_name
+                                                        (GpdsXInputPointerInfo *info);
 GList                 *gpds_xinput_utils_collect_pointer_infos
                                                         (void);
 

Modified: trunk/test/test-xinput-pointer-info.c
==============================================================================
--- trunk/test/test-xinput-pointer-info.c	(original)
+++ trunk/test/test-xinput-pointer-info.c	Fri Mar  6 14:48:18 2009
@@ -4,13 +4,17 @@
 #include <gdk/gdkx.h>
 
 void test_collect (void);
+void test_name (void);
+void test_type_name (void);
 
 static GList *pointer_infos;
 static GList *expected_pointer_infos;
+static GpdsXInputPointerInfo *pointer_info;
 
 void
 setup (void)
 {
+    pointer_info = NULL;
     pointer_infos = NULL;
     expected_pointer_infos = NULL;
 }
@@ -18,6 +22,10 @@
 void
 teardown (void)
 {
+    if (pointer_info) {
+        gpds_xinput_pointer_info_free(pointer_info);
+        pointer_info = NULL;
+    }
     if (pointer_infos) {
         g_list_foreach(pointer_infos, (GFunc)gpds_xinput_pointer_info_free, NULL);
         g_list_free(pointer_infos);
@@ -25,6 +33,29 @@
 }
 
 static void
+test_new (void)
+{
+    pointer_info = gpds_xinput_pointer_info_new("Name", "TypeName");
+    cut_assert(pointer_info);
+}
+
+void
+test_name (void)
+{
+    cut_trace(test_new());
+
+    cut_assert_equal_string("Name", gpds_xinput_pointer_info_get_name(pointer_info));
+}
+
+void
+test_type_name (void)
+{
+    cut_trace(test_new());
+
+    cut_assert_equal_string("TypeName", gpds_xinput_pointer_info_get_type_name(pointer_info));
+}
+
+static void
 gpds_xinput_pointer_info_inspect (GString *string,
                                   gconstpointer data,
                                   gpointer user_data)