[gnome-commander/GSettings] Removes unused GSetting option, fixes wrong variable assignments



commit f73d2e8338b9fb5a0168361b3208d21b38eb1c94
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Tue Jul 5 22:39:53 2016 +0200

    Removes unused GSetting option, fixes wrong variable assignments

 data/org.gnome.gnome-commander.gschema.xml |    5 -----
 src/gnome-cmd-data.cc                      |    6 +++---
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 15d3be4..f9a788e 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -530,11 +530,6 @@
           This string defines the command for starting the diff tool.
       </description>
     </key>
-    <key name="terminal" type="s">
-      <default l10n="messages">'xfce4-terminal -x %s'</default>
-      <summary></summary>
-      <description></description>
-    </key>
     <key name="use-gcmd-block" type="b">
       <default l10n="messages">false</default>
       <summary></summary>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 0483a55..7305d78 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -802,15 +802,15 @@ void on_terminal_cmd_changed()
     gchar *terminal_cmd;
 
     terminal_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_TERMINAL_CMD);
-    gnome_cmd_data.options.sendto = terminal_cmd;
+    gnome_cmd_data.options.termopen = terminal_cmd;
 }
 
 void on_terminal_exec_cmd_changed()
 {
     gchar *terminal_exec_cmd;
 
-    terminal_exec_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_TERMINAL_CMD);
-    gnome_cmd_data.options.sendto = terminal_exec_cmd;
+    terminal_exec_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_TERMINAL_EXEC_CMD);
+    gnome_cmd_data.options.termexec = terminal_exec_cmd;
 }
 
 static void gcmd_settings_class_init (GcmdSettingsClass *klass)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]