diff options
author | infirit <[email protected]> | 2015-09-14 19:07:06 +0200 |
---|---|---|
committer | infirit <[email protected]> | 2015-09-14 19:07:06 +0200 |
commit | b04c37a7641b474ca066627da27d42e6134c4e17 (patch) | |
tree | d607c2e5858d2354a13480f9352a4f49f8353195 /src/ui/menu.c | |
parent | 768fdd8d3852e67555a585da28b6404a97853cbd (diff) | |
download | marco-b04c37a7641b474ca066627da27d42e6134c4e17.tar.bz2 marco-b04c37a7641b474ca066627da27d42e6134c4e17.tar.xz |
Remove deprecated GTK+ symbols and use accessor functions
Direct struct access has been deprecated, so use the appropriate
replacements to build with GSEAL enabled.
Diffstat (limited to 'src/ui/menu.c')
-rw-r--r-- | src/ui/menu.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/menu.c b/src/ui/menu.c index 07a7c371..407ef986 100644 --- a/src/ui/menu.c +++ b/src/ui/menu.c @@ -381,6 +381,7 @@ meta_window_menu_new (MetaFrames *frames, Display *display; Window xroot; GdkScreen *screen; + GdkWindow *window; GtkWidget *submenu; int j; @@ -393,7 +394,7 @@ meta_window_menu_new (MetaFrames *frames, meta_verbose ("Creating %d-workspace menu current space %lu\n", n_workspaces, active_workspace); - GdkWindow* window = gtk_widget_get_window (GTK_WIDGET (frames)); + window = gtk_widget_get_window (GTK_WIDGET (frames)); display = GDK_WINDOW_XDISPLAY (window); @@ -500,14 +501,8 @@ void meta_window_menu_popup(MetaWindowMenu* menu, int root_x, int root_y, int bu gtk_menu_popup(GTK_MENU (menu->menu), NULL, NULL, popup_position_func, pt, button, timestamp); - #if GTK_CHECK_VERSION(3, 0, 0) if (!gtk_widget_get_visible (menu->menu)) - #else - if (!GTK_MENU_SHELL(menu->menu)->have_xgrab) - #endif - { - meta_warning("GtkMenu failed to grab the pointer\n"); - } + meta_warning("GtkMenu failed to grab the pointer\n"); } void meta_window_menu_free(MetaWindowMenu* menu) |