File 0001-Replace-x-terminal-emulator-with-xdg-termi... of Package rofi

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch of Package rofi (Revision 567d8d54055e4901b8cfd81c2fb0bbe2)

Currently displaying revision 567d8d54055e4901b8cfd81c2fb0bbe2 , Show latest

From 787a36f020ed1d902ed805444dd990ed01f2b51f Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@openmailbox.org>
Date: Mon, 3 Aug 2015 18:22:27 +0200
Subject: [PATCH] Replace x-terminal-emulator with xdg-terminal

x-terminal-emulator is working only on debian and derivates AFAIK. I
think xdg-open is the correct thing to use here since it behaves the
same across all distros.

Conflicts:
	test/helper-test.c

diff --git a/config/config.def.c b/config/config.def.c
index 47e63a3..ed2d6de 100644
--- a/config/config.def.c
+++ b/config/config.def.c
@@ -78,16 +78,16 @@ Settings config = {
     .menu_hlbg_urgent = "#DC322F",
     .menu_hlbg_active = "#268BD2",
     /** Terminal to use. (for ssh and open in terminal) */
-    .terminal_emulator = "x-terminal-emulator",
+    .terminal_emulator = "xdg-terminal",
     .ssh_client        = "ssh",
     /** Command when executing ssh. */
-    .ssh_command       = "{terminal} -e {ssh-client} {host}",
+    .ssh_command       = "{terminal} '{ssh-client} {host}'",
     /** Command when running */
     .run_command       = "{cmd}",
     /** Command used to list executable commands. empty -> internal */
     .run_list_command  = "",
     /** Command executed when running application in terminal */
-    .run_shell_command = "{terminal} -e {cmd}",
+    .run_shell_command = "{terminal} '{cmd}'",
     /**
      * Location of the window.
      * Enumeration indicating location or gravity of window.
--- a/test/helper-test.c
+++ b/test/helper-test.c
@@ -17,7 +17,7 @@ int main ( int argc, char ** argv )
 	int llength = 0;
 	char * test_str = "{host} {terminal} -e bash -c \"{ssh-client} {host}; echo '{terminal} {host}'\"";
 	helper_parse_setup( test_str, &list, &llength, "{host}", "chuck",
-			"{terminal}", "x-terminal-emulator", NULL);
+			"{terminal}", "xdg-terminal", NULL);
 
 	TASSERT ( llength == 6 );
 	TASSERT ( strcmp(list[0], "chuck")  == 0 );
-- 
2.1.4

Places

File 0001-Replace-x-terminal-emulator-with-xdg-terminal.patch of Package rofi (Revision 567d8d54055e4901b8cfd81c2fb0bbe2)

Places