[Xfce4-commits] <xfce4-clipman-plugin:master> Bug #8571: Fix height of history menu

[Mike Massonnet]

Updating branch refs/heads/master
         to b978324ef02f8bf5c74cc74fee4429ad3382ac83 (commit)
       from 622f507c052ea3ae11d50420bf278a0aa7cf9ec4 (commit)

commit b978324ef02f8bf5c74cc74fee4429ad3382ac83
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Thu Mar 15 21:08:02 2012 +0100

    Bug #8571: Fix height of history menu

 panel-plugin/main-panel-plugin.c |   28 ++++++++++------------------
 1 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index 5a7d70a..e2af4d7 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -39,12 +39,8 @@
 static void             panel_plugin_register           (XfcePanelPlugin *panel_plugin);
 XFCE_PANEL_PLUGIN_REGISTER (panel_plugin_register);
 
-#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
-static gboolean         panel_plugin_set_size           (XfcePanelPlugin *panel_plugin,
-                                                         gint             size,
-                                                         MyPlugin        *plugin);
-#endif
-
+static gboolean         plugin_set_size                 (MyPlugin *plugin,
+                                                         gint size);
 static gboolean         cb_button_pressed               (GtkButton *button,
                                                          GdkEventButton *event,
                                                          MyPlugin *plugin);
@@ -107,27 +103,25 @@ panel_plugin_register (XfcePanelPlugin *panel_plugin)
                             G_CALLBACK (plugin_save), plugin);
   g_signal_connect_swapped (panel_plugin, "free-data",
                             G_CALLBACK (plugin_free), plugin);
+  g_signal_connect_swapped (panel_plugin, "size-changed",
+                            G_CALLBACK (plugin_set_size), plugin);
   g_signal_connect (plugin->menu, "deactivate",
                     G_CALLBACK (cb_menu_deactivate), plugin);
-#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
-  g_signal_connect (panel_plugin, "size-changed", G_CALLBACK (panel_plugin_set_size), plugin);
-#endif
 
   gtk_widget_show_all (GTK_WIDGET (panel_plugin));
 }
 
-#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
 static gboolean
-panel_plugin_set_size (XfcePanelPlugin *panel_plugin,
-                       gint             size,
-                       MyPlugin        *plugin)
+plugin_set_size (MyPlugin *plugin,
+                 gint size)
 {
-  size /= xfce_panel_plugin_get_nrows (panel_plugin);
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+  size /= xfce_panel_plugin_get_nrows (plugin->panel_plugin);
+#endif
   gtk_widget_set_size_request(GTK_WIDGET(plugin->button), size, size);
 
   return TRUE;
 }
-#endif
 
 static gboolean
 cb_button_pressed (GtkButton *button,
@@ -157,14 +151,12 @@ my_plugin_position_menu (GtkMenu *menu,
                          gboolean *push_in,
                          MyPlugin *plugin)
 {
-  GtkWidget *button;
   gint button_width, button_height;
   GtkRequisition requisition;
   GtkOrientation orientation;
 
-  button = plugin->button;
   orientation = xfce_panel_plugin_get_orientation (plugin->panel_plugin);
-  gtk_widget_get_size_request (button, &button_width, &button_height);
+  gtk_widget_get_size_request (plugin->button, &button_width, &button_height);
   gtk_widget_size_request (GTK_WIDGET (menu), &requisition);
   gdk_window_get_origin (gtk_widget_get_window (GTK_WIDGET (plugin->panel_plugin)), x, y);