gnome-commander r1596 - in trunk: . src
- From: epiotr svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-commander r1596 - in trunk: . src
- Date: Thu, 28 Feb 2008 16:13:24 +0000 (GMT)
Author: epiotr
Date: Thu Feb 28 16:13:23 2008
New Revision: 1596
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=1596&view=rev
Log:
Resurrected gcmd-block
Modified:
trunk/ChangeLog
trunk/src/Makefile.am
trunk/src/gnome-cmd-data.cc
trunk/src/gnome-cmd-data.h
trunk/src/utils.cc
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Thu Feb 28 16:13:23 2008
@@ -11,7 +11,7 @@
-DDATADIR=\""$(datadir)"\"\
-DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
-bin_PROGRAMS = gnome-commander
+bin_PROGRAMS = gnome-commander gcmd-block
gnome_commander_SOURCES = \
cap.cc cap.h \
@@ -105,3 +105,5 @@
gnome_commander_LDFLAGS = \
$(GNOMEUI_LIBS) \
$(GNOMEVFS_LIBS)
+
+gcmd_block_SOURCES = block.cc
Modified: trunk/src/gnome-cmd-data.cc
==============================================================================
--- trunk/src/gnome-cmd-data.cc (original)
+++ trunk/src/gnome-cmd-data.cc Thu Feb 28 16:13:23 2008
@@ -113,6 +113,8 @@
gchar *editor;
gchar *differ;
gchar *term;
+
+ gboolean use_gcmd_block; // defaults to FALSE
};
@@ -1282,6 +1284,8 @@
gnome_cmd_data_set_string ("/programs/differ",data->priv->differ);
gnome_cmd_data_set_string ("/programs/terminal",data->priv->term);
+ gnome_cmd_data_set_bool ("/programs/use_gcmd_block",data->priv->use_gcmd_block);
+
gnome_cmd_data_set_bool ("/devices/only_icon",data->priv->device_only_icon);
gnome_cmd_data_set_int ("/options/dir_cache_size",data->priv->dir_cache_size);
gnome_cmd_data_set_bool ("/colors/use_ls_colors",data->priv->use_ls_colors);
@@ -1511,6 +1515,8 @@
data->priv->differ = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
data->priv->term = gnome_cmd_data_get_string ("/programs/terminal", "xterm -hold -e %s");
+ data->priv->use_gcmd_block = gnome_cmd_data_get_bool ("/programs/use_gcmd_block", FALSE);
+
data->priv->device_only_icon = gnome_cmd_data_get_bool ("/devices/only_icon", FALSE);
data->priv->dir_cache_size = gnome_cmd_data_get_int ("/options/dir_cache_size", 10);
data->priv->use_ls_colors = gnome_cmd_data_get_bool ("/colors/use_ls_colors", FALSE);
@@ -1980,6 +1986,12 @@
}
+gboolean gnome_cmd_data_get_use_gcmd_block (void)
+{
+ return data->priv->use_gcmd_block;
+}
+
+
gboolean gnome_cmd_data_get_case_sens_sort (void)
{
return data->priv->case_sens_sort;
Modified: trunk/src/gnome-cmd-data.h
==============================================================================
--- trunk/src/gnome-cmd-data.h (original)
+++ trunk/src/gnome-cmd-data.h Thu Feb 28 16:13:23 2008
@@ -165,6 +165,8 @@
const gchar *gnome_cmd_data_get_term (void);
void gnome_cmd_data_set_term (const gchar *shell);
+gboolean gnome_cmd_data_get_use_gcmd_block (void);
+
gboolean gnome_cmd_data_get_show_toolbar (void);
void gnome_cmd_data_set_show_toolbar (gboolean value);
Modified: trunk/src/utils.cc
==============================================================================
--- trunk/src/utils.cc (original)
+++ trunk/src/utils.cc Thu Feb 28 16:13:23 2008
@@ -122,7 +122,16 @@
if (term)
{
- gchar *arg = g_shell_quote (in_command);
+ gchar *arg;
+
+ if (gnome_cmd_data_get_use_gcmd_block ())
+ {
+ gchar *s = g_strdup_printf ("%s; %s/bin/gcmd-block", in_command, PREFIX);
+ arg = g_shell_quote (s);
+ g_free (s);
+ }
+ else
+ arg = g_shell_quote (in_command);
command = g_strdup_printf (gnome_cmd_data_get_term (), arg);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]