[gnome-commander/GSettings] Adds theme_icon_dir option to GSettings (now known as mime-icon-dir)

[Uwe Scholz <uwescholz src gnome org>]

commit c04b6ec0b12d2cbc77d648cfebd0a6eef3d2e2bf
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sun May 22 21:01:29 2016 +0200

    Adds theme_icon_dir option to GSettings (now known as mime-icon-dir)

 data/org.gnome.gnome-commander.gschema.xml |    6 +++---
 src/gnome-cmd-data.cc                      |   13 +++++++------
 src/gnome-cmd-data.h                       |    1 +
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 8ce44fc..b808494 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -163,10 +163,10 @@
       <summary>Icon scale quality</summary>
       <description>Describes the different interpolation modes that can be used with the scaling 
functions.</description>
     </key>
-    <key name="theme-icon-dir" type="s">
+    <key name="mime-icon-dir" type="s">
       <default l10n="messages">'/usr/local/share/pixmaps/gnome-commander/mime-icons'</default>
-      <summary></summary>
-      <description></description>
+      <summary>MIME icon directory</summary>
+      <description>Directory in which MIME icons are located.</description>
     </key>
     <key name="document-icon-dir" type="s">
       <default l10n="messages">'/usr/local/share/pixmaps/gnome-commander/file-type-icons'</default>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index bfc9c73..86c3cba 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1703,6 +1703,9 @@ void GnomeCmdData::migrate_all_data_to_gsettings()
         //icon_scale_quality
         migrate_data_int_value_into_gsettings(gnome_cmd_data_get_int ("/options/icon_scale_quality", 
GDK_INTERP_HYPER),
                                                         options.gcmd_settings->general, 
GCMD_SETTINGS_ICON_SCALE_QUALITY);
+        //theme_icon_dir
+        migrate_data_string_value_into_gsettings(gnome_cmd_data_get_string ("/options/theme_icon_dir", 
"/usr/local/share/pixmaps/gnome-commander/mime-icons"),
+                                                        options.gcmd_settings->general, 
GCMD_SETTINGS_MIME_ICON_DIR);
         // ToDo: Move old xml-file to ~/.gnome-commander/gnome-commander.xml.backup
         //       à la save_devices_old ("devices.backup");
         //       and move .gnome2/gnome-commander to .gnome2/gnome-commander.backup
@@ -1719,7 +1722,6 @@ void GnomeCmdData::load()
     gchar *xml_cfg_path = config_dir ? g_build_filename (config_dir, PACKAGE ".xml", NULL) : 
g_build_filename (g_get_home_dir (), "." PACKAGE, PACKAGE ".xml", NULL);
 
     gchar *document_icon_dir = g_strconcat (GNOME_PREFIX, "/share/pixmaps/document-icons/", NULL);
-    gchar *theme_icon_dir    = g_strconcat (PIXMAPS_DIR, "/mime-icons", NULL);
 
     priv = g_new0 (Private, 1);
 
@@ -1884,9 +1886,8 @@ void GnomeCmdData::load()
     options.right_mouse_button_mode = (RightMouseButtonMode) g_settings_get_enum 
(options.gcmd_settings->general, GCMD_SETTINGS_RIGHT_MOUSE_BUTTON_MODE);
     options.icon_size = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SIZE);
     dev_icon_size = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE);
-    options.icon_scale_quality = (GdkInterpType) g_settings_get_uint (options.gcmd_settings->general, 
GCMD_SETTINGS_ICON_SCALE_QUALITY);
-    options.theme_icon_dir = gnome_cmd_data_get_string ("/options/theme_icon_dir", theme_icon_dir);
-    g_free (theme_icon_dir);
+    options.icon_scale_quality = (GdkInterpType) g_settings_get_enum (options.gcmd_settings->general, 
GCMD_SETTINGS_ICON_SCALE_QUALITY);
+    options.theme_icon_dir = g_settings_get_string(options.gcmd_settings->general, 
GCMD_SETTINGS_MIME_ICON_DIR);
     options.document_icon_dir = gnome_cmd_data_get_string ("/options/document_icon_dir", document_icon_dir);
     g_free (document_icon_dir);
     cmdline_history_length = gnome_cmd_data_get_int ("/options/cmdline_history_length", 16);
@@ -2418,8 +2419,8 @@ void GnomeCmdData::save()
     set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_RIGHT_MOUSE_BUTTON_MODE, 
options.right_mouse_button_mode);
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SIZE, 
&(options.icon_size));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE, 
&(dev_icon_size));
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SCALE_QUALITY, 
&(options.icon_scale_quality));
-    gnome_cmd_data_set_string ("/options/theme_icon_dir", options.theme_icon_dir);
+    set_gsettings_enum_when_changed (options.gcmd_settings->general, GCMD_SETTINGS_ICON_SCALE_QUALITY, 
options.icon_scale_quality);
+    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_MIME_ICON_DIR, 
options.theme_icon_dir);
     gnome_cmd_data_set_string ("/options/document_icon_dir", options.document_icon_dir);
     gnome_cmd_data_set_int    ("/options/cmdline_history_length", cmdline_history_length);
     gnome_cmd_data_set_int    ("/options/btn_relief", button_relief);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 0af017f..ae506a3 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -70,6 +70,7 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_ICON_SIZE                       "icon-size"
 #define GCMD_SETTINGS_DEV_ICON_SIZE                   "dev-icon-size"
 #define GCMD_SETTINGS_ICON_SCALE_QUALITY              "icon-scale-quality"
+#define GCMD_SETTINGS_MIME_ICON_DIR                  "mime-icon-dir"
 
 #define GCMD_PREF_FILTER                              "org.gnome.gnome-commander.preferences.filter"
 #define GCMD_SETTINGS_FILTER_HIDE_UNKNOWN             "hide-unknown"