gnome-commander r1571 - in branches/gcmd-1-3: . doc/C src

[epiotr svn gnome org]

Author: epiotr
Date: Mon Feb 18 19:32:36 2008
New Revision: 1571
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1571&view=rev

Log:
Fix for problem #448942 (SHIFT+ENTER: running a command in a separate terminal)

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/doc/C/gnome-commander.xml
   branches/gcmd-1-3/src/Makefile.am
   branches/gcmd-1-3/src/gnome-cmd-data.cc
   branches/gcmd-1-3/src/utils.cc

Modified: branches/gcmd-1-3/doc/C/gnome-commander.xml
==============================================================================
--- branches/gcmd-1-3/doc/C/gnome-commander.xml	(original)
+++ branches/gcmd-1-3/doc/C/gnome-commander.xml	Mon Feb 18 19:32:36 2008
@@ -5335,7 +5335,7 @@
                                 </row>
                                 <row valign="top">
                                     <entry><para></para></entry>
-                                    <entry><para>term</para></entry>
+                                    <entry><para>terminal</para></entry>
                                     <entry><para></para></entry>
                                     <entry><para></para></entry>
                                     <entry><para></para></entry>
@@ -5647,6 +5647,9 @@
                             <para>Fixed problem #447415 (inability to launch executables)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #448942 (SHIFT+ENTER: running a command in a separate terminal)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem #468685 (crash in python module)</para>
                         </listitem>
                         <listitem>

Modified: branches/gcmd-1-3/src/Makefile.am
==============================================================================
--- branches/gcmd-1-3/src/Makefile.am	(original)
+++ branches/gcmd-1-3/src/Makefile.am	Mon Feb 18 19:32:36 2008
@@ -11,7 +11,7 @@
 	-DDATADIR=\""$(datadir)"\"\
 	-DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
 
-bin_PROGRAMS = gnome-commander gcmd-block
+bin_PROGRAMS = gnome-commander
 
 gnome_commander_SOURCES = \
 	cap.cc cap.h \
@@ -105,5 +105,3 @@
 gnome_commander_LDFLAGS = \
 	$(GNOMEUI_LIBS) \
 	$(GNOMEVFS_LIBS)
-
-gcmd_block_SOURCES = block.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-data.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-data.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-data.cc	Mon Feb 18 19:32:36 2008
@@ -1282,7 +1282,7 @@
     gnome_cmd_data_set_string ("/programs/viewer",data->priv->viewer);
     gnome_cmd_data_set_string ("/programs/editor",data->priv->editor);
     gnome_cmd_data_set_string ("/programs/differ",data->priv->differ);
-    gnome_cmd_data_set_string ("/programs/term",data->priv->term);
+    gnome_cmd_data_set_string ("/programs/terminal",data->priv->term);
     gnome_cmd_data_set_string ("/programs/mime_editor",data->priv->mime_editor);
 
     gnome_cmd_data_set_bool   ("/devices/only_icon",data->priv->device_only_icon);
@@ -1512,7 +1512,7 @@
     data->priv->viewer        = gnome_cmd_data_get_string ("/programs/viewer", "gedit %s");
     data->priv->editor        = gnome_cmd_data_get_string ("/programs/editor", "gedit %s");
     data->priv->differ        = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
-    data->priv->term          = gnome_cmd_data_get_string ("/programs/term", "gnome-terminal -e %s");
+    data->priv->term          = gnome_cmd_data_get_string ("/programs/terminal", "xterm -hold -e %s");
     data->priv->mime_editor   = gnome_cmd_data_get_string ("/programs/mime_editor", "gnome-file-types-properties");
 
     data->priv->device_only_icon = gnome_cmd_data_get_bool ("/devices/only_icon", FALSE);

Modified: branches/gcmd-1-3/src/utils.cc
==============================================================================
--- branches/gcmd-1-3/src/utils.cc	(original)
+++ branches/gcmd-1-3/src/utils.cc	Mon Feb 18 19:32:36 2008
@@ -119,18 +119,17 @@
 
     if (term)
     {
-        gchar *tmp, *arg;
+        gchar *arg = g_shell_quote (in_command);
 
-        tmp = g_strdup_printf ("%s; %s/bin/gcmd-block", in_command, PREFIX);
-        arg = g_shell_quote (tmp);
         command = g_strdup_printf (gnome_cmd_data_get_term (), arg);
+
         g_free (arg);
-        g_free (tmp);
     }
     else
         command = g_strdup (in_command);
 
-    DEBUG ('g', "running: %s\n", command);
+    DEBUG ('g', "running%s: %s\n", (term?" in terminal":""), command);
+
     gnome_execute_shell (dir, command);
     g_free (command);
 }