[Xfce4-commits] [xfce/xfce4-power-manager] 02/03: Undefine XFCE_PLUGIN when building the systray

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit d1765ea1355f1d81292514566f50b509e9ee3a5a
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Mar 29 08:48:00 2015 +0300

    Undefine XFCE_PLUGIN when building the systray
---
 panel-plugins/power-manager-plugin/power-manager-button.c |    4 ++--
 src/Makefile.am                                           |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 1f3b9e2..949f61c 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -939,8 +939,8 @@ power_manager_button_size_changed_cb (XfcePanelPlugin *plugin, gint size, PowerM
     gint xthickness;
     gint ythickness;
 
-    g_return_val_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
-    g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
+    g_return_if_fail (POWER_MANAGER_IS_BUTTON (button), FALSE);
+    g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin), FALSE);
     g_return_if_fail (size > 0);
 
     size /= xfce_panel_plugin_get_nrows (plugin);
diff --git a/src/Makefile.am b/src/Makefile.am
index 59fd59d..f4c4a97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ xfce4_power_manager_CFLAGS =                    \
 	-DSBINDIR=\"$(sbindir)\"                \
 	-DUPOWER_ENABLE_DEPRECATED              \
 	-DXFPM_SUSPEND_HELPER_CMD=\"$(prefix)/bin/xfce4-pm-helper\" \
+	-UXFCE_PLUGIN                           \
 	-DXFPM_SYSTRAY							\
 	$(GOBJECT_CFLAGS)                       \
 	$(GTHREAD_CFLAGS)                       \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.