wp/xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed dependencies on mate-terminal

Browse Source
This commit is contained in:
Clement Lefebvre
2016-01-25 16:30:44 +00:00
parent 7f38755543
commit f8e40ce128
3 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/externaltools/data/open-terminal-here.tool.in
View File

@@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
#TODO: use "mateconftool-2 -g /desktop/mate/applications/terminal/exec" xterminal --working-directory=$XEDIT_CURRENT_DOCUMENT_DIR &
mate-terminal --working-directory=$XEDIT_CURRENT_DOCUMENT_DIR &

3
plugins/externaltools/data/run-command.tool.in
View File

@@ -1,4 +1,3 @@
#!/bin/sh #!/bin/sh
#TODO: use "gsettings get org.mate.applications-terminal exec" exec `zenity --entry --title="Run command" --text="Command to run"`
exec `zenity --entry --title="Run command - Xedit" --text="Command to run"`

19
plugins/filebrowser/xedit-file-browser-plugin.c
View File

@@ -43,8 +43,6 @@
#define FILE_BROWSER_SCHEMA "org.x.editor.plugins.filebrowser" #define FILE_BROWSER_SCHEMA "org.x.editor.plugins.filebrowser"
#define FILE_BROWSER_ONLOAD_SCHEMA "org.x.editor.plugins.filebrowser.on-load" #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)) #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 * static gchar *
get_terminal (XeditFileBrowserPluginData * data) get_terminal (XeditFileBrowserPluginData * data)
{ {
gchar * 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");
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;
} }
static void static void