[Xfce4-commits] <xfce4-diskperf-plugin:master> Better panel version detection, cherrypicked from #8625

[Landry Breuil]

Updating branch refs/heads/master
         to bbaa78380268c5113a61745664d2b012ae353ecd (commit)
       from 614be858629a24cd730679e38fc795f9456fb817 (commit)

commit bbaa78380268c5113a61745664d2b012ae353ecd
Author: Landry Breuil <landry at xfce.org>
Date:   Tue Apr 3 14:58:55 2012 +0200

    Better panel version detection, cherrypicked from #8625

 panel-plugin/main.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index f2df208..7ff3126 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -39,6 +39,11 @@
 #include <errno.h>
 #include <sys/stat.h>
 
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
 
 #define PLUGIN_NAME	"DiskPerf"
 #define BORDER          8
@@ -1061,7 +1066,7 @@ static gboolean diskperf_set_size (XfcePanelPlugin *plugin, int p_size,
     return TRUE;
 }				/* diskperf_set_size() */
 
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#ifdef HAS_PANEL_49
 	/**************************************************************/
 
 static void diskperf_set_mode (XfcePanelPlugin *plugin,
@@ -1132,7 +1137,7 @@ static void diskperf_construct (XfcePanelPlugin *plugin)
     g_signal_connect (plugin, "size-changed", G_CALLBACK (diskperf_set_size), 
                       diskperf);
 
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#ifdef HAS_PANEL_49
     g_signal_connect (plugin, "mode-changed",
                       G_CALLBACK (diskperf_set_mode), diskperf);
 #else