diff options
Diffstat (limited to 'open-terminal/caja-open-terminal.c')
| -rw-r--r-- | open-terminal/caja-open-terminal.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/open-terminal/caja-open-terminal.c b/open-terminal/caja-open-terminal.c index b2d18e5..ca2b58d 100644 --- a/open-terminal/caja-open-terminal.c +++ b/open-terminal/caja-open-terminal.c @@ -22,15 +22,16 @@ */ #ifdef HAVE_CONFIG_H - #include <config.h> /* for GETTEXT_PACKAGE */ +#include <config.h> #endif +#include <glib/gi18n-lib.h> + #include "caja-open-terminal.h" #include <libcaja-extension/caja-menu-provider.h> #include <libcaja-extension/caja-configurable.h> -#include <glib/gi18n-lib.h> #include <gtk/gtkicontheme.h> #include <gtk/gtkwidget.h> #include <gtk/gtkmain.h> @@ -91,7 +92,7 @@ get_terminal_file_info (CajaFileInfo *file_info) return ret; } -char * +static char * lookup_in_data_dir (const char *basename, const char *data_dir) { @@ -260,7 +261,6 @@ append_sftp_info (char **terminal_exec, g_assert (terminal_exec != NULL); g_assert (file_info != NULL); - vfs_uri = g_file_new_for_uri (caja_file_info_get_activation_uri (file_info)); g_assert (vfs_uri != NULL); @@ -364,11 +364,12 @@ open_terminal_callback (CajaMenuItem *item, screen = g_object_get_data (G_OBJECT (item), "CajaOpenTerminal::screen"); display = gdk_screen_get_display (screen); + /*Inherit the display name do not set it, so xwayland apps can work if (screen != NULL) { display_str = gdk_display_get_name (display); g_setenv ("DISPLAY", display_str, TRUE); } - + */ if (dfile != NULL) { int orig_cwd = -1; @@ -520,7 +521,7 @@ caja_open_terminal_get_background_items (CajaMenuProvider *provider, } } -GList * +static GList * caja_open_terminal_get_file_items (CajaMenuProvider *provider, GtkWidget *window, GList *files) @@ -640,6 +641,7 @@ caja_open_terminal_register_type (GTypeModule *module) sizeof (CajaOpenTerminal), 0, (GInstanceInitFunc) caja_open_terminal_instance_init, + NULL }; static const GInterfaceInfo menu_provider_iface_info = { |