gpointing-device-settings r145 - trunk/src

[hiikezoe svn gnome org]

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

Log:
added gpds-gconf.h.

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

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Mar  7 05:52:49 2009
@@ -3,6 +3,7 @@
 libgpds_public_headers = 		\
 	gpointing-device-settings.h	\
 	gpds-module-impl.h		\
+        gpds-gconf.h                    \
 	gpds-ui.h			\
 	gpds-xinput.h                   \
 	gpds-xinput-pointer-info.h      \

Copied: trunk/src/gpds-gconf.h (from r144, /trunk/src/gpointing-device-settings.h)
==============================================================================
--- /trunk/src/gpointing-device-settings.h	(original)
+++ trunk/src/gpds-gconf.h	Sat Mar  7 05:52:49 2009
@@ -17,13 +17,18 @@
  *
  */
 
-#ifndef __GPOINTING_DEVICE_SETTINGS_H__
-#define __GPOINTING_DEVICE_SETTINGS_H__
+#ifndef __GPDS_GCONF_H__
+#define __GPDS_GCONF_H__
 
-#include <gpds-ui.h>
-#include <gpds-module-impl.h>
+#include <glib.h>
 
-#endif /* __GPOINTING_DEVICE_SETTINGS_H__ */
+G_BEGIN_DECLS
+
+#define GPDS_GCONF_DIR "/desktop/gnome/peripherals"
+
+G_END_DECLS
+
+#endif /* __GPDS_GCONF_H__ */
 /*
 vi:ts=4:nowrap:ai:expandtab:sw=4
 */

Modified: trunk/src/gpds-ui.c
==============================================================================
--- trunk/src/gpds-ui.c	(original)
+++ trunk/src/gpds-ui.c	Sat Mar  7 05:52:49 2009
@@ -28,6 +28,7 @@
 #include <gconf/gconf-client.h>
 #include "gpds-module.h"
 #include "gpds-xinput.h"
+#include "gpds-gconf.h"
 
 static GList *uis = NULL;
 
@@ -53,8 +54,6 @@
     return gpds_module_collect_names(uis);
 }
 
-#define GPDS_GCONF_DIR                   "/desktop/gnome/peripherals"
-
 typedef struct _GpdsUIPriv GpdsUIPriv;
 struct _GpdsUIPriv
 {

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