Updating branch refs/heads/nick/gtk3
to ee014503c45b882baae292b1c127ff1b8303aced (commit)
from 2458b1e07c3aebdb086644976d9cbf2f20833b1d (commit)
commit ee014503c45b882baae292b1c127ff1b8303aced
Author: Andrzej <ndrwr...@gmail.com>
Date: Thu Apr 11 00:21:05 2013 +0100
Launcher: fixed(?) errors introduced during porting.
Not sure what exactly GTK_BUTTON (menu)->toplevel was doing.
Assumed that was a GtkWidget's field.
plugins/launcher/launcher.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 72d55da..0f3ffad 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1675,7 +1675,7 @@ launcher_plugin_menu_popup (gpointer user_data)
/* bit ugly... but show the menu */
gtk_widget_show (plugin->menu);
- gtk_window_move (GTK_WINDOW (gtk_widget_get_root_window (plugin->menu)),
x, y);
+ gtk_window_move (GTK_WINDOW (gtk_widget_get_toplevel (plugin->menu)), x,
y);
gtk_widget_show (gtk_widget_get_toplevel (plugin->menu));
}
@@ -2192,9 +2192,9 @@ launcher_plugin_arrow_drag_leave_timeout (gpointer
user_data)
NULL, &pointer_x, &pointer_y, NULL);
/* get the menu position */
- gdk_window_get_root_origin (gtk_widget_get_root_window (menu), &menu_x,
&menu_y);
- menu_w = gdk_window_get_width (gtk_widget_get_root_window (menu));
- menu_h = gdk_window_get_height (gtk_widget_get_root_window (menu));
+ gdk_window_get_root_origin (gtk_widget_get_window (menu), &menu_x, &menu_y);
+ menu_w = gdk_window_get_width (gtk_widget_get_window (menu));
+ menu_h = gdk_window_get_height (gtk_widget_get_window (menu));
/* check if we should hide the menu */
if (pointer_x < menu_x || pointer_x > menu_x + menu_w
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
