[gnome-commander/GSettings] Shortens gsettings confirmation keys

[Uwe Scholz <uwescholz src gnome org>]

commit b8811eb09bf353cc988cf6a871164117e66f2018
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun Jun 19 13:35:51 2016 +0200

    Shortens gsettings confirmation keys

 data/org.gnome.gnome-commander.gschema.xml |   16 ++++++++--------
 src/gnome-cmd-data.cc                      |   10 +++++-----
 src/gnome-cmd-data.h                       |   12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index c15536e..497c494 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -73,12 +73,12 @@
     <value nick="styled text" value="2"/>
   </enum>
 
-  <enum id="org.gnome.gnome-commander.preferences.confirmation.confirm-delete-default-enum">
+  <enum id="org.gnome.gnome-commander.preferences.confirmations.delete-default-enum">
     <value nick="cancel" value="3"/>
     <value nick="delete" value="1"/>
   </enum>
 
-  <enum id="org.gnome.gnome-commander.preferences.confirmation.confirm-overwrite-enum">
+  <enum id="org.gnome.gnome-commander.preferences.confirmations.overwrite-enum">
     <value nick="skip all" value="0"/>
     <value nick="query" value="1"/>
     <value nick="overwrite silently" value="2"/>
@@ -355,36 +355,36 @@
       <description></description>
     </key>
   </schema>
-  <schema gettext-domain="gnome-commander" id="org.gnome.gnome-commander.preferences.confirmation" 
path="/org/gnome/gnome-commander/preferences/confirmation/">
-    <key name="confirm-delete" type="b">
+  <schema gettext-domain="gnome-commander" id="org.gnome.gnome-commander.preferences.confirmations" 
path="/org/gnome/gnome-commander/preferences/confirmations/">
+    <key name="delete" type="b">
       <default l10n="messages">true</default>
       <summary>Confirm delete</summary>
       <description>
           Defines if deletion of an item should be confirmed.
       </description>
     </key>
-    <key name="confirm-delete-default" 
enum="org.gnome.gnome-commander.preferences.confirmation.confirm-delete-default-enum">
+    <key name="delete-default" 
enum="org.gnome.gnome-commander.preferences.confirmations.delete-default-enum">
       <default l10n="messages">'delete'</default>
       <summary>Delete default</summary>
       <description>
           This setting defines the default active option in the delete confirmation dialog.
       </description>
     </key>
-    <key name="confirm-copy-overwrite" 
enum="org.gnome.gnome-commander.preferences.confirmation.confirm-overwrite-enum">
+    <key name="copy-overwrite" enum="org.gnome.gnome-commander.preferences.confirmations.overwrite-enum">
       <default l10n="messages">'query'</default>
       <summary>Confirm copy overwrite</summary>
       <description>
           This option defines the default behavior when items will be overwritten by a copy command.
       </description>
     </key>
-    <key name="confirm-move-overwrite" 
enum="org.gnome.gnome-commander.preferences.confirmation.confirm-overwrite-enum">
+    <key name="move-overwrite" enum="org.gnome.gnome-commander.preferences.confirmations.overwrite-enum">
       <default l10n="messages">'query'</default>
       <summary>Confirm move overwrite</summary>
       <description>
         This option defines the default behavior when items will be overwritten by a move command.
       </description>
     </key>
-    <key name="confirm-mouse-drag-and-drop" type="b">
+    <key name="mouse-drag-and-drop" type="b">
       <default l10n="messages">true</default>
       <summary>Confirm mouse drag and drop</summary>
       <description>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 4373706..83ea22a 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -473,27 +473,27 @@ static void gcmd_connect_gsettings_signals(GcmdSettings *gs)
                       NULL);
 
     g_signal_connect (gs->confirm,
-                      "changed::confirm-delete",
+                      "changed::delete",
                       G_CALLBACK (on_confirm_delete_changed),
                       NULL);
 
     g_signal_connect (gs->confirm,
-                      "changed::confirm-delete-default",
+                      "changed::delete-default",
                       G_CALLBACK (on_confirm_delete_default_changed),
                       NULL);
 
     g_signal_connect (gs->confirm,
-                      "changed::confirm-copy-overwrite",
+                      "changed::copy-overwrite",
                       G_CALLBACK (on_confirm_copy_overwrite_changed),
                       NULL);
 
     g_signal_connect (gs->confirm,
-                      "changed::confirm-move-overwrite",
+                      "changed::move-overwrite",
                       G_CALLBACK (on_confirm_move_overwrite_changed),
                       NULL);
 
     g_signal_connect (gs->confirm,
-                      "changed::confirm-mouse-drag-and-drop",
+                      "changed::mouse-drag-and-drop",
                       G_CALLBACK (on_mouse_drag_and_drop_changed),
                       NULL);
 
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index d7ac281..3f2b7f7 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -102,12 +102,12 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_FILTER_DOTFILE                  "hide-dotfile"
 #define GCMD_SETTINGS_FILTER_BACKUP                   "hide-backup-files"
 
-#define GCMD_PREF_CONFIRM                             "org.gnome.gnome-commander.preferences.confirmation"
-#define GCMD_SETTINGS_CONFIRM_DELETE                  "confirm-delete"
-#define GCMD_SETTINGS_CONFIRM_DELETE_DEFAULT          "confirm-delete-default"
-#define GCMD_SETTINGS_CONFIRM_COPY_OVERWRITE          "confirm-copy-overwrite"
-#define GCMD_SETTINGS_CONFIRM_MOVE_OVERWRITE          "confirm-move-overwrite"
-#define GCMD_SETTINGS_CONFIRM_MOUSE_DRAG_AND_DROP     "confirm-mouse-drag-and-drop"
+#define GCMD_PREF_CONFIRM                             "org.gnome.gnome-commander.preferences.confirmations"
+#define GCMD_SETTINGS_CONFIRM_DELETE                  "delete"
+#define GCMD_SETTINGS_CONFIRM_DELETE_DEFAULT          "delete-default"
+#define GCMD_SETTINGS_CONFIRM_COPY_OVERWRITE          "copy-overwrite"
+#define GCMD_SETTINGS_CONFIRM_MOVE_OVERWRITE          "move-overwrite"
+#define GCMD_SETTINGS_CONFIRM_MOUSE_DRAG_AND_DROP     "mouse-drag-and-drop"
 
 struct GnomeCmdConRemote;