[Xfce4-commits] <xfce4-places-plugin:master> Compatibility with panel v.4.9+

[Andrzej]

Updating branch refs/heads/master
         to ef5ccdc621cba29467f607ec4fdfddb13b675551 (commit)
       from 606dfab1ae932ec30ab8fb72a8cb1d004f7f50d6 (commit)

commit ef5ccdc621cba29467f607ec4fdfddb13b675551
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Mon Apr 2 03:49:45 2012 +0900

    Compatibility with panel v.4.9+

 panel-plugin/button.c |   41 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/panel-plugin/button.c b/panel-plugin/button.c
index 5bb3f0e..bf0e3e9 100644
--- a/panel-plugin/button.c
+++ b/panel-plugin/button.c
@@ -60,6 +60,12 @@
 
 #define BOX_SPACING 4
 
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
 enum
 {
     PROP_0,
@@ -73,8 +79,14 @@ places_button_dispose(GObject*);
 static void
 places_button_resize(PlacesButton*);
 
+#ifdef HAS_PANEL_49
+static void
+places_button_mode_changed(XfcePanelPlugin*, XfcePanelPluginMode, PlacesButton*);
+
+#else
 static void
 places_button_orientation_changed(XfcePanelPlugin*, GtkOrientation, PlacesButton*);
+#endif
 
 static gboolean
 places_button_size_changed(XfcePanelPlugin*, gint size, PlacesButton*);
@@ -256,8 +268,13 @@ places_button_construct(PlacesButton *self, XfcePanelPlugin *plugin)
 
     places_button_resize(self);
 
+#ifdef HAS_PANEL_49
+    g_signal_connect(G_OBJECT(plugin), "mode-changed",
+                     G_CALLBACK(places_button_mode_changed), self);
+#else
     g_signal_connect(G_OBJECT(plugin), "orientation-changed",
                      G_CALLBACK(places_button_orientation_changed), self);
+#endif
     g_signal_connect(G_OBJECT(plugin), "size-changed",
                      G_CALLBACK(places_button_size_changed), self);
 
@@ -421,7 +438,20 @@ places_button_resize(PlacesButton *self)
     button_height = 2 + 2 * ((GtkWidget*) self)->style->ythickness;
     
     /* image */
+#ifdef HAS_PANEL_49
+    image_size = new_size / xfce_panel_plugin_get_nrows(self->plugin)
+                 - MAX(button_width, button_height);
+    if (show_label) {
+        xfce_panel_plugin_set_small(self->plugin, FALSE);
+        gtk_label_set_angle (GTK_LABEL (self->label),
+            (xfce_panel_plugin_get_mode(self->plugin) == GTK_ORIENTATION_VERTICAL) ? -90 : 0);
+    } else {
+        xfce_panel_plugin_set_small(self->plugin, TRUE);
+        new_size /= xfce_panel_plugin_get_nrows(self->plugin);
+    }
+#else
     image_size = new_size - MAX(button_width, button_height);
+#endif
     /* TODO: could check if anything changed
      * (though it's hard to know if the icon theme changed) */
     places_button_resize_image(self,
@@ -478,6 +508,16 @@ places_button_resize(PlacesButton *self)
     gtk_widget_set_size_request((GtkWidget*) self, total_width, total_height);
 }
 
+#ifdef HAS_PANEL_49
+static void
+places_button_mode_changed(XfcePanelPlugin *plugin, XfcePanelPluginMode mode, PlacesButton *self)
+{
+    DBG("orientation changed");
+    xfce_hvbox_set_orientation(XFCE_HVBOX(self->box), xfce_panel_plugin_get_orientation (plugin));
+    places_button_resize(self);
+}
+
+#else
 static void
 places_button_orientation_changed(XfcePanelPlugin *plugin, GtkOrientation orientation, PlacesButton *self)
 {
@@ -485,6 +525,7 @@ places_button_orientation_changed(XfcePanelPlugin *plugin, GtkOrientation orient
     xfce_hvbox_set_orientation(XFCE_HVBOX(self->box), orientation);
     places_button_resize(self);
 }
+#endif
 
 static gboolean
 places_button_size_changed(XfcePanelPlugin *plugin, gint size, PlacesButton *self)