[Xfce4-commits] <xfce4-power-manager:devkit-power> Use desktop file in xfce_sm_clien

[Ali Abdallah]

Updating branch refs/heads/devkit-power
         to a867dcf2324c44bb2ce59c2b391e38ce8fde58df (commit)
       from 1a05f46a8bb24eff0d1af6b55cdf8001b1fea1a6 (commit)

commit a867dcf2324c44bb2ce59c2b391e38ce8fde58df
Author: Ali Abdallah <aliov at xfce.org>
Date:   Sun Nov 29 17:09:55 2009 +0100

    Use desktop file in xfce_sm_clien

 src/Makefile.am    |   35 ++++++++++++++++++-----------------
 src/egg-idletime.c |    8 ++++++++
 src/xfpm-manager.c |    2 +-
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c4305f..46e507e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,33 +39,34 @@ xfce4_power_manager_SOURCES =                   \
 	xfpm-errors.h
 
 xfce4_power_manager_CFLAGS =                    \
-        -I$(top_srcdir)                         \
+	-I$(top_srcdir)                         \
 	-I$(top_srcdir)/common                  \
 	-I$(top_srcdir)/libdbus                 \
-        -DLOCALEDIR=\"$(localedir)\"            \
-        -DG_LOG_DOMAIN=\"xfce4-power-manager\"  \
-        $(GOBJECT_CFLAGS)                       \
-        $(GTHREAD_CFLAGS)                       \
-        $(DBUS_GLIB_CFLAGS)                     \
-        $(LIBXFCE4UI_CFLAGS)                    \
-        $(XFCONF_CFLAGS)                        \
-        $(LIBNOTIFY_CFLAGS)                     \
+	-DLOCALEDIR=\"$(localedir)\"            \
+	-DG_LOG_DOMAIN=\"xfce4-power-manager\"  \
+	-DSYSCONFDIR=\"$(sysconfdir)\"		\
+	$(GOBJECT_CFLAGS)                       \
+	$(GTHREAD_CFLAGS)                       \
+	$(DBUS_GLIB_CFLAGS)                     \
+	$(LIBXFCE4UI_CFLAGS)                    \
+	$(XFCONF_CFLAGS)                        \
+	$(LIBNOTIFY_CFLAGS)                     \
 	$(XRANDR_CFLAGS)			\
 	$(POLKIT_CFLAGS)			\
-        $(DPMS_CFLAGS)                  
+	$(DPMS_CFLAGS)                  
 
 xfce4_power_manager_LDADD =                     \
 	$(top_builddir)/common/libxfpmcommon.la \
 	$(top_builddir)/libdbus/libxfpmdbus.la  \
-        $(GOBJECT_LIBS)                         \
-        $(GTHREAD_LIBS)                         \
-        $(DBUS_GLIB_LIBS)                       \
-        $(LIBXFCE4UI_LIBS)                      \
-        $(XFCONF_LIBS)                          \
-        $(LIBNOTIFY_LIBS)                       \
+	$(GOBJECT_LIBS)                         \
+	$(GTHREAD_LIBS)                         \
+	$(DBUS_GLIB_LIBS)                       \
+	$(LIBXFCE4UI_LIBS)                      \
+	$(XFCONF_LIBS)                          \
+	$(LIBNOTIFY_LIBS)                       \
 	$(XRANDR_LIBS)				\
 	$(POLKIT_LIBS)				\
-        $(DPMS_LIBS)
+	$(DPMS_LIBS)
 
 manpagedir = $(mandir)/man1
 
diff --git a/src/egg-idletime.c b/src/egg-idletime.c
index 3cb8c7e..1d3e579 100644
--- a/src/egg-idletime.c
+++ b/src/egg-idletime.c
@@ -39,6 +39,14 @@ static void     egg_idletime_finalize   (GObject       *object);
 
 #define EGG_IDLETIME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EGG_IDLETIME_TYPE, EggIdletimePrivate))
 
+/*
+ * Undef and use the function instead of the macro
+ * as the macro is buggy.
+ */
+#ifdef XSyncValueAdd
+#undef XSyncValueAdd
+#endif
+
 struct EggIdletimePrivate
 {
 	gint			 sync_event;
diff --git a/src/xfpm-manager.c b/src/xfpm-manager.c
index 84ffda2..ee9f995 100644
--- a/src/xfpm-manager.c
+++ b/src/xfpm-manager.c
@@ -478,7 +478,7 @@ xfpm_manager_new (DBusGConnection *bus, const gchar *client_id)
 						     client_id,
 						     current_dir,
 						     restart_command,
-						     PACKAGE_NAME ".desktop");
+						     SYSCONFDIR "/xdg/autostart/" PACKAGE_NAME ".desktop");
     
     g_free (current_dir);