[Xfce4-commits] <xfce4-xkb-plugin:4.10_panel_support> Add #ifdefs around calls to new 4.10 panel APIs

[Igor Slepchin]

Updating branch refs/heads/4.10_panel_support
         to 7ed289e10304c9edb26040320f636f65e7c88622 (commit)
       from e03521b269bfb29005cebce3e61e4ffe187adceb (commit)

commit 7ed289e10304c9edb26040320f636f65e7c88622
Author: Igor Slepchin <igor.slepchin at gmail.com>
Date:   Mon Mar 25 18:29:27 2013 -0400

    Add #ifdefs around calls to new 4.10 panel APIs

 panel-plugin/xfce4-xkb-plugin.c |    6 +++++-
 panel-plugin/xfce4-xkb-plugin.h |    7 +++++++
 panel-plugin/xkb-callbacks.c    |    2 ++
 3 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/panel-plugin/xfce4-xkb-plugin.c b/panel-plugin/xfce4-xkb-plugin.c
index 073fba7..e1c8439 100644
--- a/panel-plugin/xfce4-xkb-plugin.c
+++ b/panel-plugin/xfce4-xkb-plugin.c
@@ -90,7 +90,9 @@ xfce_xkb_construct (XfcePanelPlugin *plugin)
     t_xkb *xkb = xkb_new (plugin);
     xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
 
+#ifdef HAS_PANEL_49
     xfce_panel_plugin_set_small (plugin, TRUE);
+#endif
 
     g_signal_connect (plugin, "orientation-changed",
             G_CALLBACK (xfce_xkb_orientation_changed), xkb);
@@ -338,10 +340,12 @@ xkb_load_default (t_xkb *xkb)
 static gboolean
 xkb_calculate_sizes (t_xkb *xkb, GtkOrientation orientation, gint panel_size)
 {
-    guint nrows;
+    guint nrows = 1;
 
+#ifdef HAS_PANEL_49
     nrows       = xfce_panel_plugin_get_nrows (xkb->plugin);
     panel_size /= nrows;
+#endif
     TRACE ("calculate_sizes(%p: %d,%d)", xkb, panel_size, nrows);
 
     switch (orientation)
diff --git a/panel-plugin/xfce4-xkb-plugin.h b/panel-plugin/xfce4-xkb-plugin.h
index ef9b995..fe0f9b1 100644
--- a/panel-plugin/xfce4-xkb-plugin.h
+++ b/panel-plugin/xfce4-xkb-plugin.h
@@ -36,6 +36,13 @@
 #include <gtk/gtk.h>
 #include <glib.h>
 
+/* check for new Xfce 4.10 panel features */
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
 typedef enum
 {
     DISPLAY_TYPE_IMAGE = 0,
diff --git a/panel-plugin/xkb-callbacks.c b/panel-plugin/xkb-callbacks.c
index e8f6d6e..e0c7b87 100644
--- a/panel-plugin/xkb-callbacks.c
+++ b/panel-plugin/xkb-callbacks.c
@@ -115,7 +115,9 @@ xkb_plugin_layout_image_exposed (GtkWidget *widget,
     vsize = MIN (xkb->vsize, (int) (xkb->hsize * 0.75));
 
     panel_size   = xfce_panel_plugin_get_size (xkb->plugin);
+#ifdef HAS_PANEL_49
     panel_size  /= xfce_panel_plugin_get_nrows (xkb->plugin);
+#endif
 
     style = gtk_widget_get_style (GTK_WIDGET (xkb->btn));
     fgcolor = style->fg[xkb->button_state];