diff options
| author | Sorokin Alexei <[email protected]> | 2016-06-16 18:09:25 +0300 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-06-29 18:42:12 +0200 |
| commit | 225702b3c6a609065465c66f0f2739fc1d2184a9 (patch) | |
| tree | 08c677b952074a8a79b93c9d895950bdbd85799d /mate-panel/applet.c | |
| parent | de1be3467a6ff1b350fc286025364650c8d51d1e (diff) | |
| download | mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.bz2 mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.xz | |
fix some warnings and deprecations
Diffstat (limited to 'mate-panel/applet.c')
| -rw-r--r-- | mate-panel/applet.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mate-panel/applet.c b/mate-panel/applet.c index c7115379..c8b1c95b 100644 --- a/mate-panel/applet.c +++ b/mate-panel/applet.c @@ -520,8 +520,8 @@ mate_panel_applet_create_menu (AppletInfo *info) } menuitem = gtk_image_menu_item_new_with_mnemonic (_("_Remove From Panel")); - image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, - GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("list-remove", + GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); g_signal_connect (menuitem, "activate", @@ -635,9 +635,12 @@ mate_panel_applet_position_menu (GtkMenu *menu, #endif gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y); -#if GTK_CHECK_VERSION (3, 0, 0) +#if GTK_CHECK_VERSION(3, 20, 0) + device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (applet))); + gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL); +#elif GTK_CHECK_VERSION (3, 0, 0) device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet))); - gdk_window_get_device_position(gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL); + gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL); #else gtk_widget_get_pointer (applet, &pointer_x, &pointer_y); #endif |