gpointing-device-settings r24 - in trunk: . data modules

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Thu Feb 26 07:28:26 2009
New Revision: 24
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=24&view=rev

Log:
ui_filedir -> uidir.

Modified:
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/modules/gpds-touchpad-ui.c
   trunk/modules/gpds-trackpoint-ui.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Feb 26 07:28:26 2009
@@ -94,8 +94,8 @@
 AC_SUBST(gpds_moduledir)
 gpds_datadir="\${datadir}/\$(PACKAGE)"
 AC_SUBST(gpds_datadir)
-gpds_ui_filedir="\${datadir}/\$(PACKAGE)/ui"
-AC_SUBST(gpds_ui_filedir)
+gpds_uidir="\${datadir}/\$(PACKAGE)/ui"
+AC_SUBST(gpds_uidir)
 gpds_help_datadir="\${datadir}"
 AC_SUBST(gpds_help_datadir)
 
@@ -121,7 +121,7 @@
 GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED"
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
-GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UI_FILEDIR=\\\"\"\$(gpds_ui_filedir)\"\\\""
+GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""
 GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_HELP_DATADIR=\\\"\"\$(gpds_help_datadir)\"\\\""
 AC_SUBST(GPDS_CFLAGS)
 

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Feb 26 07:28:26 2009
@@ -1,6 +1,5 @@
-uidir   = $(datadir)/$(PACKAGE)/ui
-ui_DATA = 		\
+gpds_ui_DATA = 		\
 	trackpoint.ui	\
 	touchpad.ui
 
-EXTRA_DIST = $(ui_DATA)
+EXTRA_DIST = $(gpds_ui_DATA)

Modified: trunk/modules/gpds-touchpad-ui.c
==============================================================================
--- trunk/modules/gpds-touchpad-ui.c	(original)
+++ trunk/modules/gpds-touchpad-ui.c	Thu Feb 26 07:28:26 2009
@@ -81,8 +81,8 @@
 {
     const gchar *dir;
 
-    dir = g_getenv("GPDS_UI_FILE_DIR");
-    return dir ? dir : GPDS_UI_FILEDIR;
+    dir = g_getenv("GPDS_UI_DIR");
+    return dir ? dir : GPDS_UIDIR;
 }
 
 static void

Modified: trunk/modules/gpds-trackpoint-ui.c
==============================================================================
--- trunk/modules/gpds-trackpoint-ui.c	(original)
+++ trunk/modules/gpds-trackpoint-ui.c	Thu Feb 26 07:28:26 2009
@@ -90,8 +90,8 @@
 {
     const gchar *dir;
 
-    dir = g_getenv("GPDS_UI_FILE_DIR");
-    return dir ? dir : GPDS_UI_FILEDIR;
+    dir = g_getenv("GPDS_UI_DIR");
+    return dir ? dir : GPDS_UIDIR;
 }
 
 static void