gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-06-30 23:46:35 +00:00
Code Issues Projects Releases Wiki Activity

previewer: Drop ununsed XID parameter

Browse Source 
It's been supperceeded by the window handle string, which, for X11
windows, is a concatenation of "x11:" and the XID.
This commit is contained in:
António Fernandes 2024-04-28 16:32:50 +01:00
parent 9698bcaccf
commit 0c5d28bcd6
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nautilus-files-view.c
View File

@ -1294,11 +1294,10 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (PreviewExportData, preview_export_data_free)
static void
on_window_handle_export (NautilusWindow *window,
const char *handle,
guint xid,
gpointer user_data)
{
g_autoptr (PreviewExportData) data = user_data;
nautilus_previewer_call_show_file (data->uri, handle, xid, !data->is_update);
nautilus_previewer_call_show_file (data->uri, handle, !data->is_update);
}
static void
@ -1310,7 +1309,7 @@ nautilus_files_view_preview (NautilusFilesView *view,
data))
{
/* Let's use a fallback, so at least a preview will be displayed */
nautilus_previewer_call_show_file (data->uri, "x11:0", 0, !data->is_update);
nautilus_previewer_call_show_file (data->uri, "x11:0", !data->is_update);
}
}

1
src/nautilus-previewer.c
View File

@ -174,7 +174,6 @@ previewer2_method_ready_cb (GObject *source,
void
nautilus_previewer_call_show_file (const gchar *uri,
const gchar *window_handle,
guint xid,
gboolean close_if_already_visible)
{
if (!ensure_previewer_proxy ())

1
src/nautilus-previewer.h
View File

@ -29,7 +29,6 @@ G_BEGIN_DECLS
void nautilus_previewer_call_show_file (const gchar *uri,
const gchar *window_handle,
guint xid,
gboolean close_if_already_visible);
void nautilus_previewer_call_close (void);

10
src/nautilus-window.c
View File

@ -2027,7 +2027,7 @@ wayland_window_handle_exported (GdkToplevel *toplevel,
WaylandWindowHandleExportedData *data = user_data;
data->window->export_handle = g_strdup_printf ("wayland:%s", wayland_handle_str);
data->callback (data->window, data->window->export_handle, 0, data->user_data);
data->callback (data->window, data->window->export_handle, data->user_data);
}
#endif
@ -2036,19 +2036,17 @@ nautilus_window_export_handle (NautilusWindow *window,
NautilusWindowHandleExported callback,
gpointer user_data)
{
guint xid = get_window_xid (window);
if (window->export_handle != NULL)
{
callback (window, window->export_handle, xid, user_data);
callback (window, window->export_handle, user_data);
return TRUE;
}
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (GTK_WIDGET (window))))
{
window->export_handle = g_strdup_printf ("x11:%x", xid);
callback (window, window->export_handle, xid, user_data);
window->export_handle = g_strdup_printf ("x11:%x", get_window_xid (window));
callback (window, window->export_handle, user_data);
return TRUE;
}

1
src/nautilus-window.h
View File

@ -43,7 +43,6 @@ typedef gboolean (* NautilusWindowGoToCallback) (NautilusWindow *window,
typedef void (* NautilusWindowHandleExported) (NautilusWindow *window,
const char *handle,
guint xid,
gpointer user_data);
/* window geometry */