[gnome-commander/GSettings] Adds terminal_open to GSettings (now known as terminal-cmd)

[Uwe Scholz <uwescholz src gnome org>]

commit c25fe1e6d572b409394abea11ff3fe1ddcb7cd1a
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Tue Jul 5 21:19:02 2016 +0200

    Adds terminal_open to GSettings (now known as terminal-cmd)

 data/org.gnome.gnome-commander.gschema.xml |   10 ++++++----
 src/gnome-cmd-data.cc                      |   20 ++++++++++++++++++--
 src/gnome-cmd-data.h                       |    1 +
 3 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 7f98555..30ec3f2 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -540,10 +540,12 @@
       <summary></summary>
       <description></description>
     </key>
-    <key name="terminal-open" type="s">
-      <default l10n="messages">'xfce4-terminal'</default>
-      <summary></summary>
-      <description></description>
+    <key name="terminal-cmd" type="s">
+      <default l10n="messages">'gnome-terminal'</default>
+      <summary>Command for opening a terminal</summary>
+      <description>
+          This string defines the command for opening a terminal.
+      </description>
     </key>
     <key name="terminal-exec" type="s">
       <default l10n="messages">'xfce4-terminal -e %s'</default>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 75bf824..7c98b53 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -797,6 +797,14 @@ void on_sendto_cmd_changed()
     gnome_cmd_data.options.sendto = sendto_cmd;
 }
 
+void on_terminal_cmd_changed()
+{
+    gchar *terminal_open_cmd;
+
+    terminal_open_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_TERMINAL_CMD);
+    gnome_cmd_data.options.sendto = terminal_open_cmd;
+}
+
 static void gcmd_settings_class_init (GcmdSettingsClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -1173,6 +1181,11 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
                       G_CALLBACK (on_sendto_cmd_changed),
                       NULL);
 
+    g_signal_connect (gs->programs,
+                      "changed::terminal-cmd",
+                      G_CALLBACK (on_terminal_cmd_changed),
+                      NULL);
+
 }
 
 
@@ -2824,6 +2837,9 @@ void GnomeCmdData::migrate_all_data_to_gsettings()
         //sendto
         migrate_data_string_value_into_gsettings(gnome_cmd_data_get_string ("/programs/sendto", 
"nautilus-sendto %s"),
                                                         options.gcmd_settings->programs, 
GCMD_SETTINGS_SENDTO_CMD);
+        //terminal_open
+        migrate_data_string_value_into_gsettings(gnome_cmd_data_get_string ("/programs/terminal_open", 
"gnome-terminal"),
+                                                        options.gcmd_settings->programs, 
GCMD_SETTINGS_TERMINAL_CMD);
 
         g_free(color);
         // ToDo: Move old xml-file to ~/.gnome-commander/gnome-commander.xml.backup
@@ -3206,7 +3222,7 @@ void GnomeCmdData::load()
     options.editor = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD);
     options.differ = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_DIFFER_CMD);
     options.sendto = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_SENDTO_CMD);
-    options.termopen = gnome_cmd_data_get_string ("/programs/terminal_open", "gnome-terminal");
+    options.termopen = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_TERMINAL_CMD);
     options.termexec = gnome_cmd_data_get_string ("/programs/terminal_exec", "gnome-terminal -e %s");
 
     use_gcmd_block = gnome_cmd_data_get_bool ("/programs/use_gcmd_block", FALSE);
@@ -3737,7 +3753,7 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD, 
options.editor);
     set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_DIFFER_CMD, 
options.differ);
     set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_SENDTO_CMD, 
options.sendto);
-    gnome_cmd_data_set_string ("/programs/terminal_open", options.termopen);
+    set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_TERMINAL_CMD, 
options.termopen);
     gnome_cmd_data_set_string ("/programs/terminal_exec", options.termexec);
 
     gnome_cmd_data_set_bool   ("/programs/use_gcmd_block", use_gcmd_block);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index d8157cb..9bf380f 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -150,6 +150,7 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_EDITOR_CMD                      "editor-cmd"
 #define GCMD_SETTINGS_DIFFER_CMD                      "differ-cmd"
 #define GCMD_SETTINGS_SENDTO_CMD                      "sendto-cmd"
+#define GCMD_SETTINGS_TERMINAL_CMD               "terminal-cmd"
 
 #define GCMD_PREF_KEYBINDINGS                         "org.gnome.gnome-commander.preferences.keybindings"
 #define GCMD_SETTINGS_QUICK_SEARCH_SHORTCUT           "quick-search"