[gnome-commander/GSettings] Renames external-viewer-cmd GSettings key to viewer-cmd

[Uwe Scholz <uwescholz src gnome org>]

commit 6ae0c6f4ef2c1413c4f5e522eae10177ec268b18
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Tue Jul 5 18:18:05 2016 +0200

    Renames external-viewer-cmd GSettings key to viewer-cmd

 data/org.gnome.gnome-commander.gschema.xml |    6 +++---
 src/gnome-cmd-data.cc                      |   10 +++++-----
 src/gnome-cmd-data.h                       |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index b73b657..7ac7b43 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -509,11 +509,11 @@
           This option defines if the internal viewer should be used by default.
       </description>
     </key>
-    <key name="external-viewer-cmd" type="s">
+    <key name="viewer-cmd" type="s">
       <default l10n="messages">'gedit %s'</default>
-      <summary>External viewer command</summary>
+      <summary>Viewer command</summary>
       <description>
-          This string defines the command for starting the external viewer.
+          This string defines the command for starting the (external) viewer.
       </description>
     </key>
     <key name="editor-cmd" type="s">
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index d85fb32..7bd687b 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -769,7 +769,7 @@ void on_external_viewer_cmd_changed()
 {
     gchar *external_viewer_cmd;
 
-    external_viewer_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_EXTERNAL_VIEWER_CMD);
+    external_viewer_cmd = g_settings_get_string (gnome_cmd_data.options.gcmd_settings->programs, 
GCMD_SETTINGS_VIEWER_CMD);
     gnome_cmd_data.options.viewer = external_viewer_cmd;
 }
 
@@ -1138,7 +1138,7 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
                       NULL);
 
     g_signal_connect (gs->programs,
-                      "changed::external-viewer-cmd",
+                      "changed::viewer-cmd",
                       G_CALLBACK (on_external_viewer_cmd_changed),
                       NULL);
 
@@ -2788,7 +2788,7 @@ void GnomeCmdData::migrate_all_data_to_gsettings()
                                               options.gcmd_settings->devices, GCMD_SETTINGS_SKIP_MOUNTING);
         //viewer
         migrate_data_string_value_into_gsettings(gnome_cmd_data_get_string ("/programs/viewer", "gedit %s"),
-                                                        options.gcmd_settings->programs, 
GCMD_SETTINGS_EXTERNAL_VIEWER_CMD);
+                                                        options.gcmd_settings->programs, 
GCMD_SETTINGS_VIEWER_CMD);
         //editor
         migrate_data_string_value_into_gsettings(gnome_cmd_data_get_string ("/programs/editor", "gedit %s"),
                                                         options.gcmd_settings->programs, 
GCMD_SETTINGS_EDITOR_CMD);
@@ -3170,7 +3170,7 @@ void GnomeCmdData::load()
         options.symlink_prefix = NULL;
     }
 
-    options.viewer = g_settings_get_string(options.gcmd_settings->programs, 
GCMD_SETTINGS_EXTERNAL_VIEWER_CMD);
+    options.viewer = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_VIEWER_CMD);
     options.editor = g_settings_get_string(options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD);
     options.differ = gnome_cmd_data_get_string ("/programs/differ", "meld %s");
     options.sendto = gnome_cmd_data_get_string ("/programs/sendto", "nautilus-sendto %s");
@@ -3701,7 +3701,7 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_MAIN_WIN_POS_X, 
&(options.main_win_pos[0]));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_MAIN_WIN_POS_Y, 
&(options.main_win_pos[1]));
 
-    set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_EXTERNAL_VIEWER_CMD, 
options.viewer);
+    set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_VIEWER_CMD, 
options.viewer);
     set_gsettings_when_changed      (options.gcmd_settings->programs, GCMD_SETTINGS_EDITOR_CMD, 
options.editor);
     gnome_cmd_data_set_string ("/programs/differ", options.differ);
     gnome_cmd_data_set_string ("/programs/sendto", options.sendto);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 53230ce..fb462ba 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -146,7 +146,7 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_PREF_PROGRAMS                            "org.gnome.gnome-commander.preferences.programs"
 #define GCMD_SETTINGS_DONT_DOWNLOAD                   "dont-download"
 #define GCMD_SETTINGS_USE_INTERNAL_VIEWER             "use-internal-viewer"
-#define GCMD_SETTINGS_EXTERNAL_VIEWER_CMD             "external-viewer-cmd"
+#define GCMD_SETTINGS_VIEWER_CMD             "viewer-cmd"
 #define GCMD_SETTINGS_EDITOR_CMD                      "editor-cmd"
 
 #define GCMD_PREF_KEYBINDINGS                         "org.gnome.gnome-commander.preferences.keybindings"