[Xfce4-commits] r27184 - in xfconf/trunk: . xfsettingsd

[Stephan Arts]

Author: stephan
Date: 2008-06-29 19:03:57 +0000 (Sun, 29 Jun 2008)
New Revision: 27184

Removed:
   xfconf/trunk/xfsettingsd/accessx.c
   xfconf/trunk/xfsettingsd/accessx.h
Modified:
   xfconf/trunk/configure.ac.in
   xfconf/trunk/xfsettingsd/Makefile.am
   xfconf/trunk/xfsettingsd/main.c
Log:
Remove libnotify dependency and accessx-stuff
(was moved to xfce4-settings-helper)


Modified: xfconf/trunk/configure.ac.in
===================================================================
--- xfconf/trunk/configure.ac.in	2008-06-29 18:52:08 UTC (rev 27183)
+++ xfconf/trunk/configure.ac.in	2008-06-29 19:03:57 UTC (rev 27184)
@@ -93,7 +93,6 @@
 
 if test "x$build_xfsettingsd" = "xyes" -o "x$build_xfconf_gtk" = "xyes"; then
     XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
-    XDT_CHECK_PACKAGE([LIBNOTIFY], [libnotify], [0.1.3])
 fi
 
 dnl ********************************

Modified: xfconf/trunk/xfsettingsd/Makefile.am
===================================================================
--- xfconf/trunk/xfsettingsd/Makefile.am	2008-06-29 18:52:08 UTC (rev 27183)
+++ xfconf/trunk/xfsettingsd/Makefile.am	2008-06-29 19:03:57 UTC (rev 27184)
@@ -4,8 +4,7 @@
 
 xfsettingsd_SOURCES = \
 	main.c \
-	registry.c registry.h \
-	accessx.c accessx.h
+	registry.c registry.h
 
 xfsettingsd_CFLAGS = \
 	$(GTK_CFLAGS) \

Deleted: xfconf/trunk/xfsettingsd/accessx.c

Deleted: xfconf/trunk/xfsettingsd/accessx.h

Modified: xfconf/trunk/xfsettingsd/main.c
===================================================================
--- xfconf/trunk/xfsettingsd/main.c	2008-06-29 18:52:08 UTC (rev 27183)
+++ xfconf/trunk/xfsettingsd/main.c	2008-06-29 19:03:57 UTC (rev 27184)
@@ -33,9 +33,7 @@
 
 #include <libxfce4util/libxfce4util.h>
 #include <xfconf/xfconf.h>
-#include <libnotify/notify.h>
 
-#include "accessx.h"
 #include "registry.h"
 
 #define XF_DEBUG(str) \
@@ -122,7 +120,7 @@
     GdkDisplay *gdpy;
     gint n_screens, screen;
     gboolean keep_running = FALSE;
-    XfconfChannel *xsettings_channel, *accessx_channel;
+    XfconfChannel *xsettings_channel;
 
     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
 
@@ -150,7 +148,6 @@
     }
 
     xsettings_channel = xfconf_channel_new("xsettings");
-    accessx_channel = xfconf_channel_new("accessx");
 
     gdpy = gdk_display_get_default();
     n_screens = gdk_display_get_n_screens(gdpy);
@@ -198,10 +195,6 @@
         return 1;
     }
 
-    notify_init("xfsettingsd");
-
-    accessx_notification_init(accessx_channel);
-
     if(!debug) /* If not in debug mode, fork to background */
     {
         if(!fork())