Updating branch refs/heads/master
to 50f47c7d5797cbd81dc68fd41a1bd328db2e5255 (commit)
from 9be0ab867b0f085191503f83492db2f9cbfb1761 (commit)
commit 50f47c7d5797cbd81dc68fd41a1bd328db2e5255
Author: Landry Breuil <lan...@xfce.org>
Date: Mon Jul 2 15:58:17 2012 +0200
Fix FTBFS with panel 4.8.
While here simplifiy 4.9 mode-changed callback codepath.
panel-plugin/cpu.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c
index b997840..b1030c2 100644
--- a/panel-plugin/cpu.c
+++ b/panel-plugin/cpu.c
@@ -281,18 +281,17 @@ static void set_bars_size( CPUGraph *base, gint size,
GtkOrientation orientation
#ifdef HAS_PANEL_49
static void mode_cb( XfcePanelPlugin * plugin, XfcePanelPluginMode mode,
CPUGraph *base )
{
- GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation
(plugin);
- GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
- GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+ GtkOrientation orientation = (mode ==
XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
+ GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
- xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ), panel_orientation
);
+ xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ),
xfce_panel_plugin_get_orientation (plugin));
#else
static void orientation_cb( XfcePanelPlugin * plugin, GtkOrientation
orientation, CPUGraph *base )
{
xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ), orientation );
#endif
if( base->has_bars )
- set_bars_orientation( base, panel_orientation );
+ set_bars_orientation( base, orientation );
size_cb( plugin, xfce_panel_plugin_get_size( base->plugin ), base);
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
