mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-06-30 23:46:35 +00:00
Skip patched-mutter shenaningans for testing purposes
This commit is contained in:
parent
adb8aeafe9
commit
80abefd369
|
@ -1128,23 +1128,11 @@ nautilus_application_startup (GApplication *app)
|
||||||
|
|
||||||
g_application_set_resource_base_path (G_APPLICATION (self), "/org/gnome/nautilus");
|
g_application_set_resource_base_path (G_APPLICATION (self), "/org/gnome/nautilus");
|
||||||
|
|
||||||
/* Initialize GDK display (for wayland-x11-interop protocol) before GTK does
|
|
||||||
* it during the chain-up. */
|
|
||||||
g_autoptr (GError) error = NULL;
|
|
||||||
GdkDisplay *display = init_external_window_display (&error);
|
|
||||||
if (error != NULL)
|
|
||||||
{
|
|
||||||
g_message ("Failed to initialize display server connection: %s",
|
|
||||||
error->message);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Chain up to the GtkApplication implementation early, so that gtk_init()
|
/* Chain up to the GtkApplication implementation early, so that gtk_init()
|
||||||
* is called for us.
|
* is called for us.
|
||||||
*/
|
*/
|
||||||
G_APPLICATION_CLASS (nautilus_application_parent_class)->startup (G_APPLICATION (self));
|
G_APPLICATION_CLASS (nautilus_application_parent_class)->startup (G_APPLICATION (self));
|
||||||
|
|
||||||
g_assert (gdk_display_get_default () == display);
|
|
||||||
|
|
||||||
gtk_window_set_default_icon_name (APPLICATION_ID);
|
gtk_window_set_default_icon_name (APPLICATION_ID);
|
||||||
|
|
||||||
/* initialize preferences and create the global GSettings objects */
|
/* initialize preferences and create the global GSettings objects */
|
||||||
|
|
|
@ -365,24 +365,7 @@ handle_file_chooser_methods (XdpImplFileChooser *object,
|
||||||
/* Show window */
|
/* Show window */
|
||||||
if (arg_parent_window != NULL)
|
if (arg_parent_window != NULL)
|
||||||
{
|
{
|
||||||
data->external_parent = create_external_window_from_handle (arg_parent_window);
|
g_message ("No parenting. Testing purposes only.");
|
||||||
if (data->external_parent == NULL)
|
|
||||||
{
|
|
||||||
g_warning ("Failed to associate portal window with parent window %s",
|
|
||||||
arg_parent_window);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
gtk_widget_realize (GTK_WIDGET (window));
|
|
||||||
|
|
||||||
GdkSurface *surface = gtk_native_get_surface (GTK_NATIVE (window));
|
|
||||||
gboolean modal = TRUE;
|
|
||||||
|
|
||||||
(void) g_variant_lookup (arg_options, "modal", "b", &modal);
|
|
||||||
|
|
||||||
external_window_set_parent_of (data->external_parent, surface);
|
|
||||||
gtk_window_set_modal (data->window, modal);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gtk_window_present (data->window);
|
gtk_window_present (data->window);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user