gpointing-device-settings r165 - trunk/src

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Sat Mar  7 12:19:52 2009
New Revision: 165
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=165&view=rev

Log:
added gpds-utils.h and gpds_get_ui_file_directory().

Added:
   trunk/src/gpds-utils.c
      - copied, changed from r164, /trunk/src/gpointing-device-settings.h
   trunk/src/gpds-utils.h
      - copied, changed from r164, /trunk/src/gpointing-device-settings.h
Modified:
   trunk/src/Makefile.am
   trunk/src/gpointing-device-settings.h

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Mar  7 12:19:52 2009
@@ -4,6 +4,7 @@
 	gpointing-device-settings.h	\
 	gpds-module-impl.h		\
         gpds-gconf.h                    \
+	gpds-utils.h			\
 	gpds-ui.h			\
 	gpds-xinput.h                   \
 	gpds-xinput-pointer-info.h      \
@@ -14,6 +15,7 @@
 	gpds-module.c			\
 	gpds-module.h			\
 	gpds-ui.c			\
+	gpds-utils.c			\
 	gpds-xinput.c                   \
 	gpds-xinput-pointer-info.c      \
 	gpds-xinput-utils.c

Copied: trunk/src/gpds-utils.c (from r164, /trunk/src/gpointing-device-settings.h)
==============================================================================
--- /trunk/src/gpointing-device-settings.h	(original)
+++ trunk/src/gpds-utils.c	Sat Mar  7 12:19:52 2009
@@ -17,14 +17,21 @@
  *
  */
 
-#ifndef __GPOINTING_DEVICE_SETTINGS_H__
-#define __GPOINTING_DEVICE_SETTINGS_H__
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
 
-#include <gpds-ui.h>
-#include <gpds-module-impl.h>
-#include <gpds-gconf.h>
+#include "gpds-utils.h"
+
+const gchar *
+gpds_get_ui_file_directory (void)
+{
+    const gchar *dir;
+
+    dir = g_getenv("GPDS_UI_DIR");
+    return dir ? dir : GPDS_UIDIR;
+}
 
-#endif /* __GPOINTING_DEVICE_SETTINGS_H__ */
 /*
 vi:ts=4:nowrap:ai:expandtab:sw=4
 */

Copied: trunk/src/gpds-utils.h (from r164, /trunk/src/gpointing-device-settings.h)
==============================================================================
--- /trunk/src/gpointing-device-settings.h	(original)
+++ trunk/src/gpds-utils.h	Sat Mar  7 12:19:52 2009
@@ -17,14 +17,20 @@
  *
  */
 
-#ifndef __GPOINTING_DEVICE_SETTINGS_H__
-#define __GPOINTING_DEVICE_SETTINGS_H__
+#ifndef __GPDS_UTILS_H__
+#define __GPDS_UTILS_H__
 
-#include <gpds-ui.h>
-#include <gpds-module-impl.h>
-#include <gpds-gconf.h>
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+const gchar *gpds_get_ui_file_directory (void);
+
+G_END_DECLS
+
+#endif /* __GPDS_UTILS_H__ */
 
-#endif /* __GPOINTING_DEVICE_SETTINGS_H__ */
 /*
 vi:ts=4:nowrap:ai:expandtab:sw=4
 */
+

Modified: trunk/src/gpointing-device-settings.h
==============================================================================
--- trunk/src/gpointing-device-settings.h	(original)
+++ trunk/src/gpointing-device-settings.h	Sat Mar  7 12:19:52 2009
@@ -23,6 +23,7 @@
 #include <gpds-ui.h>
 #include <gpds-module-impl.h>
 #include <gpds-gconf.h>
+#include <gpds-utils.h>
 
 #endif /* __GPOINTING_DEVICE_SETTINGS_H__ */
 /*