From f8e40ce1289912830beb46f71f8e11729ef3c050 Mon Sep 17 00:00:00 2001 From: Clement Lefebvre Date: Mon, 25 Jan 2016 16:30:44 +0000 Subject: [PATCH] Removed dependencies on mate-terminal --- .../data/open-terminal-here.tool.in | 3 +-- .../externaltools/data/run-command.tool.in | 3 +-- .../filebrowser/xedit-file-browser-plugin.c | 19 ++----------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/plugins/externaltools/data/open-terminal-here.tool.in b/plugins/externaltools/data/open-terminal-here.tool.in index 5ae337b..855bf86 100644 --- a/plugins/externaltools/data/open-terminal-here.tool.in +++ b/plugins/externaltools/data/open-terminal-here.tool.in @@ -1,4 +1,3 @@ #!/bin/sh -#TODO: use "mateconftool-2 -g /desktop/mate/applications/terminal/exec" -mate-terminal --working-directory=$XEDIT_CURRENT_DOCUMENT_DIR & +xterminal --working-directory=$XEDIT_CURRENT_DOCUMENT_DIR & diff --git a/plugins/externaltools/data/run-command.tool.in b/plugins/externaltools/data/run-command.tool.in index 4e1c635..6d6d674 100644 --- a/plugins/externaltools/data/run-command.tool.in +++ b/plugins/externaltools/data/run-command.tool.in @@ -1,4 +1,3 @@ #!/bin/sh -#TODO: use "gsettings get org.mate.applications-terminal exec" -exec `zenity --entry --title="Run command - Xedit" --text="Command to run"` +exec `zenity --entry --title="Run command" --text="Command to run"` diff --git a/plugins/filebrowser/xedit-file-browser-plugin.c b/plugins/filebrowser/xedit-file-browser-plugin.c index 112ac59..c62405d 100644 --- a/plugins/filebrowser/xedit-file-browser-plugin.c +++ b/plugins/filebrowser/xedit-file-browser-plugin.c @@ -43,8 +43,6 @@ #define FILE_BROWSER_SCHEMA "org.x.editor.plugins.filebrowser" #define FILE_BROWSER_ONLOAD_SCHEMA "org.x.editor.plugins.filebrowser.on-load" -#define TERMINAL_SCHEMA "org.mate.applications-terminal" -#define TERMINAL_EXEC_KEY "exec" #define XEDIT_FILE_BROWSER_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), XEDIT_TYPE_FILE_BROWSER_PLUGIN, XeditFileBrowserPluginPrivate)) @@ -295,21 +293,8 @@ on_action_set_active_root (GtkAction * action, static gchar * get_terminal (XeditFileBrowserPluginData * data) { - gchar * terminal; - - terminal = g_settings_get_string (data->terminal_settings, - TERMINAL_EXEC_KEY); - - if (terminal == NULL) { - const gchar *term = g_getenv ("TERM"); - - if (term != NULL) - terminal = g_strdup (term); - else - terminal = g_strdup ("xterm"); - } - - return terminal; + // TODO : Identify the DE, find the preferred terminal application (xterminal shouldn't be hardcoded here, it should be set as default in the DE prefs) + return g_strdup ("xterminal"); } static void