[Xfce4-commits] [panel-plugins/xfce4-clipman-plugin] 01/01: Fix panel plugin popup

[noreply at xfce.org]

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

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-clipman-plugin.

commit 1f9f67e5abf01c82c6e44cf9e5c58242f01c0fe7
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Wed Jul 19 23:22:02 2017 +0200

    Fix panel plugin popup
---
 panel-plugin/main-panel-plugin.c | 2 ++
 panel-plugin/plugin.c            | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/panel-plugin/main-panel-plugin.c b/panel-plugin/main-panel-plugin.c
index 6a375da..fc87fed 100644
--- a/panel-plugin/main-panel-plugin.c
+++ b/panel-plugin/main-panel-plugin.c
@@ -204,6 +204,8 @@ my_plugin_position_menu (GtkMenu *menu,
   GtkRequisition natural_size;
   XfceScreenPosition screen_position;
 
+  g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin->panel_plugin));
+
   screen_position = xfce_panel_plugin_get_screen_position (plugin->panel_plugin);
   gtk_widget_get_size_request (plugin->button, &button_width, &button_height);
   gtk_widget_get_preferred_size (GTK_WIDGET (menu), &minimum_size, &natural_size);
diff --git a/panel-plugin/plugin.c b/panel-plugin/plugin.c
index 95cb088..bf70319 100644
--- a/panel-plugin/plugin.c
+++ b/panel-plugin/plugin.c
@@ -356,7 +356,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
       gtk_menu_set_screen (GTK_MENU (plugin->menu), gtk_widget_get_screen (plugin->button));
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       gtk_menu_popup (GTK_MENU (plugin->menu), NULL, NULL,
-                      plugin->menu_position_func, plugin->panel_plugin,
+                      plugin->menu_position_func, plugin,
                       0, gtk_get_current_event_time ());
 G_GNUC_END_IGNORE_DEPRECATIONS
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (plugin->button), TRUE);
@@ -372,4 +372,3 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 #endif
   }
 }
-

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