summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--baobab/src/baobab-utils.c7
-rw-r--r--gsearchtool/src/gsearchtool-callbacks.c5
-rw-r--r--logview/src/logview-window.c4
-rw-r--r--mate-dictionary/src/gdict-pref-dialog.c4
-rw-r--r--mate-dictionary/src/gdict-source-dialog.c4
-rw-r--r--mate-dictionary/src/gdict-window.c6
-rw-r--r--mate-screenshot/src/mate-screenshot.c7
7 files changed, 36 insertions, 1 deletions
diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c
index e84d7b51..40b52145 100644
--- a/baobab/src/baobab-utils.c
+++ b/baobab/src/baobab-utils.c
@@ -506,8 +506,15 @@ baobab_help_display (GtkWindow *parent,
g_strdup_printf ("help:%s/%s", file_name, link_id) :
g_strdup_printf ("help:%s", file_name);
+#if GTK_CHECK_VERSION (3, 22, 0)
+ ret = gtk_show_uri_on_window (parent,
+ uri,
+ gtk_get_current_event_time (),
+ &error);
+#else
ret = gtk_show_uri (gtk_window_get_screen (parent),
uri, gtk_get_current_event_time (), &error);
+#endif
g_free (uri);
if (error != NULL) {
diff --git a/gsearchtool/src/gsearchtool-callbacks.c b/gsearchtool/src/gsearchtool-callbacks.c
index 49dd5b7a..876fc0f5 100644
--- a/gsearchtool/src/gsearchtool-callbacks.c
+++ b/gsearchtool/src/gsearchtool-callbacks.c
@@ -186,8 +186,13 @@ click_help_cb (GtkWidget * widget,
GtkWidget * window = data;
GError * error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (window), "help:mate-search-tool",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_widget_get_screen (widget), "help:mate-search-tool",
gtk_get_current_event_time (), &error);
+#endif
if (error) {
GtkWidget * dialog;
diff --git a/logview/src/logview-window.c b/logview/src/logview-window.c
index d53c9577..11c4c8e6 100644
--- a/logview/src/logview-window.c
+++ b/logview/src/logview-window.c
@@ -356,7 +356,11 @@ logview_help (GtkAction *action, GtkWidget *parent_window)
{
GError *error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (parent_window),
+#else
gtk_show_uri (gtk_widget_get_screen (parent_window),
+#endif
"help:mate-system-log", gtk_get_current_event_time (),
&error);
diff --git a/mate-dictionary/src/gdict-pref-dialog.c b/mate-dictionary/src/gdict-pref-dialog.c
index 1ac35cb3..006d5711 100644
--- a/mate-dictionary/src/gdict-pref-dialog.c
+++ b/mate-dictionary/src/gdict-pref-dialog.c
@@ -484,7 +484,11 @@ response_cb (GtkDialog *dialog,
switch (response_id)
{
case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+#else
gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
+#endif
"help:mate-dictionary/mate-dictionary-preferences",
gtk_get_current_event_time (), &err);
if (err)
diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c
index 502f1578..589ae962 100644
--- a/mate-dictionary/src/gdict-source-dialog.c
+++ b/mate-dictionary/src/gdict-source-dialog.c
@@ -469,7 +469,11 @@ gdict_source_dialog_response_cb (GtkDialog *dialog,
build_new_source (GDICT_SOURCE_DIALOG (dialog));
break;
case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+#else
gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (dialog)),
+#endif
"help:mate-dictionary/mate-dictionary-add-source",
gtk_get_current_event_time (), &err);
if (err)
diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c
index 026cb9e9..0bc300c4 100644
--- a/mate-dictionary/src/gdict-window.c
+++ b/mate-dictionary/src/gdict-window.c
@@ -1243,8 +1243,12 @@ gdict_window_cmd_help_contents (GtkAction *action,
GError *err = NULL;
g_return_if_fail (GDICT_IS_WINDOW (window));
-
+
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (window),
+#else
gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
+#endif
"help:mate-dictionary",
gtk_get_current_event_time (), &err);
if (err)
diff --git a/mate-screenshot/src/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c
index 338337d7..499b582a 100644
--- a/mate-screenshot/src/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
@@ -123,9 +123,16 @@ display_help (GtkWindow *parent)
{
GError *error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (parent,
+ "help:mate-user-guide/goseditmainmenu-53",
+ gtk_get_current_event_time (),
+ &error);
+#else
gtk_show_uri (gtk_window_get_screen (parent),
"help:mate-user-guide/goseditmainmenu-53",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{