summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2017-07-22 17:19:34 +0200
committerraveit65 <[email protected]>2017-07-22 18:00:49 +0200
commit07a0a6ba9a536561533ac3b1b283d999f5dfd489 (patch)
tree8c00ee88698c4b0b4ad8b72202c3246ff2b65aab /src
parent7fd994d1573c77bdcc10e9a2c834c89a04955474 (diff)
downloadcaja-07a0a6ba9a536561533ac3b1b283d999f5dfd489.tar.bz2
caja-07a0a6ba9a536561533ac3b1b283d999f5dfd489.tar.xz
don't use deprecated gtk_show_uri
Diffstat (limited to 'src')
-rw-r--r--src/caja-bookmarks-window.c6
-rw-r--r--src/caja-connect-server-dialog.c6
-rw-r--r--src/caja-file-management-properties.c6
-rw-r--r--src/caja-location-dialog.c6
-rw-r--r--src/caja-property-browser.c6
-rw-r--r--src/caja-window-menus.c8
-rw-r--r--src/file-manager/fm-directory-view.c6
-rw-r--r--src/file-manager/fm-properties-window.c7
8 files changed, 51 insertions, 0 deletions
diff --git a/src/caja-bookmarks-window.c b/src/caja-bookmarks-window.c
index 10eb8e88..0c122dad 100644
--- a/src/caja-bookmarks-window.c
+++ b/src/caja-bookmarks-window.c
@@ -144,9 +144,15 @@ caja_bookmarks_window_response_callback (GtkDialog *dialog,
{
GError *error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ "help:mate-user-guide/goscaja-36",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
"help:mate-user-guide/goscaja-36",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{
diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c
index 6df18f66..05e6875f 100644
--- a/src/caja-connect-server-dialog.c
+++ b/src/caja-connect-server-dialog.c
@@ -710,9 +710,15 @@ connect_dialog_response_cb (CajaConnectServerDialog *dialog,
break;
case GTK_RESPONSE_HELP :
error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ "help:mate-user-guide/caja-server-connect",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
"help:mate-user-guide/caja-server-connect",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{
eel_show_error_dialog (_("There was an error displaying help."), error->message,
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index e7051284..131dc880 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -222,9 +222,15 @@ preferences_show_help (GtkWindow *parent,
help_string = g_strdup_printf ("help:%s/%s", helpfile, sect_id);
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (parent,
+ help_string, gtk_get_current_event_time (),
+ &error);
+#else
gtk_show_uri (gtk_window_get_screen (parent),
help_string, gtk_get_current_event_time (),
&error);
+#endif
g_free (help_string);
if (error)
diff --git a/src/caja-location-dialog.c b/src/caja-location-dialog.c
index 486f7339..43503b1b 100644
--- a/src/caja-location-dialog.c
+++ b/src/caja-location-dialog.c
@@ -94,9 +94,15 @@ response_callback (CajaLocationDialog *dialog,
break;
case GTK_RESPONSE_HELP :
error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ "help:mate-user-guide/caja-open-location",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
"help:mate-user-guide/caja-open-location",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{
eel_show_error_dialog (_("There was an error displaying help."), error->message,
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index b9b4c7d4..8c4bb5f7 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -1654,9 +1654,15 @@ help_button_callback (GtkWidget *widget, GtkWidget *property_browser)
GError *error = NULL;
GtkWidget *dialog;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (property_browser),
+ "help:mate-user-guide/goscaja-50",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_widget_get_screen (property_browser),
"help:mate-user-guide/goscaja-50",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{
diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c
index ef24484b..b0ee8747 100644
--- a/src/caja-window-menus.c
+++ b/src/caja-window-menus.c
@@ -575,11 +575,19 @@ action_caja_manual_callback (GtkAction *action,
error = NULL;
window = CAJA_WINDOW (user_data);
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (window),
+ CAJA_IS_DESKTOP_WINDOW (window)
+ ? "help:mate-user-guide"
+ : "help:mate-user-guide/goscaja-1",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (window)),
CAJA_IS_DESKTOP_WINDOW (window)
? "help:mate-user-guide"
: "help:mate-user-guide/goscaja-1",
gtk_get_current_event_time (), &error);
+#endif
if (error)
{
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 1d8c8b5b..99996801 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -1170,9 +1170,15 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data)
break;
case GTK_RESPONSE_HELP :
error = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ "help:mate-user-guide/caja-select-pattern",
+ gtk_get_current_event_time (), &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
"help:mate-user-guide/caja-select-pattern",
gtk_get_current_event_time (), &error);
+#endif
if (error) {
eel_show_error_dialog (_("There was an error displaying help."), error->message,
GTK_WINDOW (dialog));
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 90ea68cd..1ae66b62 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5405,10 +5405,17 @@ real_response (GtkDialog *dialog,
switch (response) {
case GTK_RESPONSE_HELP:
+#if GTK_CHECK_VERSION (3, 22, 0)
+ gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ "help:mate-user-guide/goscaja-51",
+ gtk_get_current_event_time (),
+ &error);
+#else
gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)),
"help:mate-user-guide/goscaja-51",
gtk_get_current_event_time (),
&error);
+#endif
if (error != NULL) {
eel_show_error_dialog (_("There was an error displaying help."), error->message,
GTK_WINDOW (dialog));