gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Enable wayland support

Wu Xiaotian 2020-04-06 19:03:09 +08:00 committed by Robert Antoni Buj Gelonch
parent 9d391911ac
commit 3b960c5eab
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/terminal-screen.c
View File

@ -1445,7 +1445,9 @@ get_child_environment (TerminalScreen *screen,
g_hash_table_replace (env_table, g_strdup ("TERM"), g_strdup ("xterm-256color")); /* FIXME configurable later? */ g_hash_table_replace (env_table, g_strdup ("TERM"), g_strdup ("xterm-256color")); /* FIXME configurable later? */
/* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */ /* FIXME: moving the tab between windows, or the window between displays will make the next two invalid... */
g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window)))); if (GDK_IS_X11_DISPLAY (display)) {
g_hash_table_replace (env_table, g_strdup ("WINDOWID"), g_strdup_printf ("%ld", GDK_WINDOW_XID (gtk_widget_get_window (window))));
}
g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display))); g_hash_table_replace (env_table, g_strdup ("DISPLAY"), g_strdup (gdk_display_get_name (display)));
g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (), TRUE, &list_schemas, NULL); g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (), TRUE, &list_schemas, NULL);

3
src/terminal.c
View File

@ -483,8 +483,6 @@ main (int argc, char **argv)
working_directory = g_get_current_dir (); working_directory = g_get_current_dir ();
gdk_set_allowed_backends ("x11");
/* Now change directory to $HOME so we don't prevent unmounting, e.g. if the /* Now change directory to $HOME so we don't prevent unmounting, e.g. if the
* factory is started by caja-open-terminal. See bug #565328. * factory is started by caja-open-terminal. See bug #565328.
* On failure back to /. * On failure back to /.
@ -507,7 +505,6 @@ main (int argc, char **argv)
egg_sm_client_get_option_group (), egg_sm_client_get_option_group (),
#endif /* HAVE_SMCLIENT */ #endif /* HAVE_SMCLIENT */
NULL); NULL);
g_free (working_directory); g_free (working_directory);
if (options == NULL) if (options == NULL)