[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 250/473: Fix incorrect fetching of panel orientation in Xfce 4.10. Closes #37.

[noreply at xfce.org]

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

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit ba49a0fd07e9ceb383a2d931b769a112d9cc881c
Author: Graeme Gott <graeme at gottcode.org>
Date:   Wed Nov 20 08:18:45 2013 -0500

    Fix incorrect fetching of panel orientation in Xfce 4.10. Closes #37.
---
 panel-plugin/plugin.cpp |   22 +++++++++++++++-------
 panel-plugin/plugin.h   |    2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/panel-plugin/plugin.cpp b/panel-plugin/plugin.cpp
index 0845ab2..37e95b4 100644
--- a/panel-plugin/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -105,7 +105,7 @@ Plugin::Plugin(XfcePanelPlugin* plugin) :
 	// Connect plugin signals to functions
 	g_signal_connect(plugin, "free-data", G_CALLBACK(whiskermenu_free), this);
 	g_signal_connect(plugin, "configure-plugin", G_CALLBACK(Plugin::configure_slot), this);
-#if (LIBXFCE4PANEL_CHECK_VERSION(4,10,0))
+#if (LIBXFCE4PANEL_CHECK_VERSION(4,9,0))
 	g_signal_connect(plugin, "mode-changed", G_CALLBACK(Plugin::mode_changed_slot), this);
 #else
 	g_signal_connect(plugin, "orientation-changed", G_CALLBACK(Plugin::orientation_changed_slot), this);
@@ -113,9 +113,15 @@ Plugin::Plugin(XfcePanelPlugin* plugin) :
 	g_signal_connect(plugin, "remote-event", G_CALLBACK(Plugin::remote_event_slot), this);
 	g_signal_connect_swapped(plugin, "save", G_CALLBACK(Plugin::save_slot), this);
 	g_signal_connect(plugin, "size-changed", G_CALLBACK(Plugin::size_changed_slot), this);
-	xfce_panel_plugin_menu_show_configure(plugin);
 
+	xfce_panel_plugin_menu_show_configure(plugin);
 	xfce_panel_plugin_menu_insert_item(plugin, GTK_MENU_ITEM(wm_settings->command_menueditor->get_menuitem()));
+
+#if (LIBXFCE4PANEL_CHECK_VERSION(4,9,0))
+	mode_changed_slot(m_plugin, xfce_panel_plugin_get_mode(m_plugin), this);
+#else
+	orientation_changed_slot(m_plugin, xfce_panel_plugin_get_orientation(m_plugin), this);
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -316,13 +322,15 @@ void Plugin::save()
 
 bool Plugin::size_changed(int size)
 {
-#if (LIBXFCE4PANEL_CHECK_VERSION(4,10,0))
+#if (LIBXFCE4PANEL_CHECK_VERSION(4,9,0))
 	gint row_size = size / xfce_panel_plugin_get_nrows(m_plugin);
+	XfcePanelPluginMode mode = xfce_panel_plugin_get_mode(m_plugin);
+	GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+			? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
 #else
 	gint row_size = size;
-#endif
-
 	GtkOrientation orientation = xfce_panel_plugin_get_orientation(m_plugin);
+#endif
 
 	// Make icon expand to fill button if title is not visible
 	gtk_box_set_child_packing(GTK_BOX(m_button_box), GTK_WIDGET(m_button_icon),
@@ -349,9 +357,9 @@ bool Plugin::size_changed(int size)
 		xfce_panel_image_set_size(m_button_icon, row_size - border);
 		gtk_widget_set_size_request(GTK_WIDGET(m_plugin), -1, -1);
 
-#if (LIBXFCE4PANEL_CHECK_VERSION(4,10,0))
+#if (LIBXFCE4PANEL_CHECK_VERSION(4,9,0))
 		// Put title next to icon if panel is wide enough
-		if (xfce_panel_plugin_get_mode(m_plugin) == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+		if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
 		{
 			GtkRequisition label_size;
 			gtk_widget_size_request(GTK_WIDGET(m_button_label), &label_size);
diff --git a/panel-plugin/plugin.h b/panel-plugin/plugin.h
index c81b3f8..2e3e55a 100644
--- a/panel-plugin/plugin.h
+++ b/panel-plugin/plugin.h
@@ -108,7 +108,7 @@ private:
 		return obj->size_changed(size);
 	}
 
-#if (LIBXFCE4PANEL_CHECK_VERSION(4,10,0))
+#if (LIBXFCE4PANEL_CHECK_VERSION(4,9,0))
 	static void mode_changed_slot(XfcePanelPlugin*, XfcePanelPluginMode mode, Plugin* obj)
 	{
 		obj->orientation_changed(mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL);

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