[gpointing-device-settings] Use gnome-settings-plugin.h in gnome-settings-daemon.
- From: Hiroyuki Ikezoe <hiikezoe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gpointing-device-settings] Use gnome-settings-plugin.h in gnome-settings-daemon.
- Date: Fri, 29 Jan 2010 10:30:25 +0000 (UTC)
commit aa98443b670a070455050af65def6030b46f7d05
Author: Hiroyuki Ikezoe <poincare ikezoe net>
Date: Fri Jan 29 19:29:45 2010 +0900
Use gnome-settings-plugin.h in gnome-settings-daemon.
configure.ac | 6 +-
.../gnome-settings-plugin.h | 179 --------------------
.../gsd-pointing-device-plugin.c | 3 +-
3 files changed, 4 insertions(+), 184 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b3b9203..fbe1ce0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,9 +71,9 @@ AM_PATH_GTK_2_0($GTK_REQUIRED)
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
-dnl PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon >= 2.24.0)
-dnl AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS)
-dnl AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS)
+PKG_CHECK_MODULES(GNOME_SETTINGS_DAEMON, gnome-settings-daemon >= 2.28.0)
+AC_SUBST(GNOME_SETTINGS_DAEMON_CFLAGS)
+AC_SUBST(GNOME_SETTINGS_DAEMON_LIBS)
GCONF_REQUIRED=2.24.0
AC_SUBST(GCONF_REQUIRED)
diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
index b596f8d..db4dd8e 100644
--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
@@ -21,8 +21,7 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
-/* #include <gnome-settings-daemon/gnome-settings-plugin.h> */
-#include "gnome-settings-plugin.h"
+#include <gnome-settings-daemon/gnome-settings-plugin.h>
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]