Skip to content

Commit 416dc9b

Browse files
baedertraveit65
authored andcommitted
util: Port to gtk_show_uri_on_window
gtk_show_uri is deprecated and will be removed in later versions. https://bugzilla.gnome.org/show_bug.cgi?id=792923 origin commit: https://gitlab.gnome.org/GNOME/eog/commit/77f16df
1 parent 4115f76 commit 416dc9b

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

src/eom-metadata-sidebar.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,16 +429,22 @@ _folder_button_clicked_cb (GtkButton *button, gpointer user_data)
429429
{
430430
EomMetadataSidebarPrivate *priv = EOM_METADATA_SIDEBAR(user_data)->priv;
431431
EomImage *img;
432-
GdkScreen *screen;
432+
GtkWidget *toplevel;
433+
GtkWindow *window;
433434
GFile *file;
434435

435436
g_return_if_fail (priv->parent_window != NULL);
436437

437438
img = eom_window_get_image (priv->parent_window);
438-
screen = gtk_widget_get_screen (GTK_WIDGET (priv->parent_window));
439439
file = eom_image_get_file (img);
440440

441-
eom_util_show_file_in_filemanager (file, screen);
441+
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
442+
if (GTK_IS_WINDOW (toplevel))
443+
window = GTK_WINDOW (toplevel);
444+
else
445+
window = NULL;
446+
447+
eom_util_show_file_in_filemanager (file, window);
442448

443449
g_object_unref (file);
444450
}

src/eom-util.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ eom_util_file_is_persistent (GFile *file)
343343
}
344344

345345
static void
346-
_eom_util_show_file_in_filemanager_fallback (GFile *file, GdkScreen *screen)
346+
_eom_util_show_file_in_filemanager_fallback (GFile *file, GtkWindow *toplevel)
347347
{
348348
gchar *uri = NULL;
349349
GError *error = NULL;
@@ -362,7 +362,7 @@ _eom_util_show_file_in_filemanager_fallback (GFile *file, GdkScreen *screen)
362362
g_object_unref (parent_file);
363363
}
364364

365-
if (uri && !gtk_show_uri (screen, uri, timestamp, &error)) {
365+
if (uri && !gtk_show_uri_on_window (toplevel, uri, timestamp, &error)) {
366366
g_warning ("Couldn't show containing folder \"%s\": %s", uri,
367367
error->message);
368368
g_error_free (error);
@@ -372,7 +372,7 @@ _eom_util_show_file_in_filemanager_fallback (GFile *file, GdkScreen *screen)
372372
}
373373

374374
void
375-
eom_util_show_file_in_filemanager (GFile *file, GdkScreen *screen)
375+
eom_util_show_file_in_filemanager (GFile *file, GtkWindow *toplevel)
376376
{
377377
GDBusProxy *proxy;
378378
gboolean done = FALSE;
@@ -425,5 +425,5 @@ eom_util_show_file_in_filemanager (GFile *file, GdkScreen *screen)
425425

426426
/* Fallback to gtk_show_uri() if launch over DBus is not possible */
427427
if (!done)
428-
_eom_util_show_file_in_filemanager_fallback (file, screen);
428+
_eom_util_show_file_in_filemanager_fallback (file, toplevel);
429429
}

src/eom-util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ gboolean eom_util_file_is_persistent (GFile *file);
6363

6464
G_GNUC_INTERNAL
6565
void eom_util_show_file_in_filemanager (GFile *file,
66-
GdkScreen *screen);
66+
GtkWindow *toplevel);
6767

6868
G_END_DECLS
6969

src/eom-window.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3025,7 +3025,7 @@ eom_window_cmd_open_containing_folder (GtkAction *action, gpointer user_data)
30253025
g_return_if_fail (file != NULL);
30263026

30273027
eom_util_show_file_in_filemanager (file,
3028-
gtk_widget_get_screen (GTK_WIDGET (user_data)));
3028+
GTK_WINDOW (user_data));
30293029
}
30303030

30313031
static void

0 commit comments

Comments
 (0)