From c0b33db1de315c0fa8932c4870b686dd37a6e81b Mon Sep 17 00:00:00 2001 From: William Wold Date: Mon, 11 Feb 2019 15:26:32 -0500 Subject: Wayland support for launcher.c --- mate-panel/launcher.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c index f4ce4f71..a0246993 100644 --- a/mate-panel/launcher.c +++ b/mate-panel/launcher.c @@ -33,7 +33,9 @@ #include "panel-util.h" #include "panel-config-global.h" #include "panel-profile.h" +#ifdef HAVE_X11 #include "xstuff.h" +#endif #include "panel-toplevel.h" #include "panel-a11y.h" #include "panel-globals.h" @@ -182,7 +184,9 @@ drag_data_received_cb (GtkWidget *widget, int i; GList *file_list; - if (panel_global_config_get_enable_animations ()) { + // The animation uses X specific functionality +#ifdef HAVE_X11 + if (is_using_x11 () && panel_global_config_get_enable_animations ()) { cairo_surface_t *surface; surface = button_widget_get_surface (BUTTON_WIDGET (widget)); xstuff_zoom_animate (widget, @@ -191,6 +195,7 @@ drag_data_received_cb (GtkWidget *widget, NULL); cairo_surface_destroy (surface); } +#endif file_list = NULL; uris = g_uri_list_extract_uris ((const char *) gtk_selection_data_get_data (selection_data)); @@ -400,7 +405,9 @@ static void clicked_cb (Launcher *launcher, GtkWidget *widget) { - if (panel_global_config_get_enable_animations ()) { + +#ifdef HAVE_X11 + if (is_using_x11 () && panel_global_config_get_enable_animations ()) { cairo_surface_t *surface; surface = button_widget_get_surface (BUTTON_WIDGET (widget)); xstuff_zoom_animate (widget, @@ -409,6 +416,7 @@ clicked_cb (Launcher *launcher, NULL); cairo_surface_destroy (surface); } +#endif launcher_launch (launcher, NULL); -- cgit v1.2.1