summaryrefslogtreecommitdiff
path: root/mate-panel
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2017-07-28 23:44:13 -0400
committerlukefromdc <[email protected]>2017-07-29 13:17:11 -0400
commit33c4bd47a7210cd9e695ea1a2cbf26abbc3b7bed (patch)
tree0cf2f27fc73fa400c90dad18515f84d65be0f604 /mate-panel
parenta3129a0b2d0e8e51f423af255f7d12b0bf741369 (diff)
downloadmate-panel-33c4bd47a7210cd9e695ea1a2cbf26abbc3b7bed.tar.bz2
mate-panel-33c4bd47a7210cd9e695ea1a2cbf26abbc3b7bed.tar.xz
don't use deprecated gtk_show_uri
Diffstat (limited to 'mate-panel')
-rw-r--r--mate-panel/libpanel-util/panel-show.c12
-rw-r--r--mate-panel/libpanel-util/panel-show.h3
2 files changed, 10 insertions, 5 deletions
diff --git a/mate-panel/libpanel-util/panel-show.c b/mate-panel/libpanel-util/panel-show.c
index 2eeee2ec..a4c7f6d7 100644
--- a/mate-panel/libpanel-util/panel-show.c
+++ b/mate-panel/libpanel-util/panel-show.c
@@ -177,9 +177,11 @@ gboolean panel_show_uri(GdkScreen* screen, const gchar* uri, guint32 timestamp,
{
return panel_show_caja_search_uri(screen, uri, timestamp, error);
}
-
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (NULL, uri,timestamp, &local_error);
+#else
gtk_show_uri(screen, uri, timestamp, &local_error);
-
+#endif
return _panel_show_handle_error(uri, screen, local_error, error);
}
@@ -282,9 +284,11 @@ panel_show_help (GdkScreen *screen,
uri = g_strdup_printf ("help:%s/%s", doc, link);
else
uri = g_strdup_printf ("help:%s", doc);
-
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &local_error);
+#else
gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error);
-
+#endif
g_free (uri);
return _panel_show_help_handle_error (doc, screen, local_error, error);
diff --git a/mate-panel/libpanel-util/panel-show.h b/mate-panel/libpanel-util/panel-show.h
index ec3e9baa..34111aaa 100644
--- a/mate-panel/libpanel-util/panel-show.h
+++ b/mate-panel/libpanel-util/panel-show.h
@@ -1,5 +1,6 @@
/*
- * panel-show.h: a helper around gtk_show_uri
+ * panel-show.h: a helper around gtk_show_uri_on_window for gtk 3.22
+ * or gtk_show_uri for gtk 3.20 and earlier
*
* Copyright (C) 2008 Novell, Inc.
*