GNOME.org
 

[gnome-commander/GSettings] Removes useless document_icon_dir option

commit 29cc3ee2b723868339eb1f52e469ce622544574e
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Mon May 23 22:08:00 2016 +0200

    Removes useless document_icon_dir option
    
    This option, by default a path to a directory with xmp files, could be
    set by the user when the layout was set to 'MIME type icons'. Setting
    this string value to a non-existing path didn't change anything in the
    file panes view. This option seemes to be not fully implemented and
    therefore I decided to remove this option completely, and all its
    related lines of code.

 data/org.gnome.gnome-commander.gschema.xml |    5 -----
 src/dialogs/gnome-cmd-options-dialog.cc    |    7 -------
 src/gnome-cmd-data.cc                      |    7 -------
 src/gnome-cmd-data.h                       |   11 +----------
 src/imageloader.cc                         |    4 ++--
 5 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index b808494..161370f 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -168,11 +168,6 @@
       <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>
-      <summary></summary>
-      <description></description>
-    </key>
     <key name="cmdline-history-length" type="i">
       <default l10n="messages">16</default>
       <summary></summary>
diff --git a/src/dialogs/gnome-cmd-options-dialog.cc b/src/dialogs/gnome-cmd-options-dialog.cc
index 9792061..541e26a 100644
--- a/src/dialogs/gnome-cmd-options-dialog.cc
+++ b/src/dialogs/gnome-cmd-options-dialog.cc
@@ -806,8 +806,6 @@ inline GtkWidget *create_layout_tab (GtkWidget *parent, GnomeCmdData::Options &c
     table_add (table, scale, 1, 1, (GtkAttachOptions) GTK_FILL);
     entry = create_file_entry (parent, "theme_icondir_entry", cfg.theme_icon_dir);
     table_add (table, entry, 1, 2, (GtkAttachOptions)0);
-    entry = create_file_entry (parent, "doc_icondir_entry", cfg.document_icon_dir);
-    table_add (table, entry, 1, 3, (GtkAttachOptions)0);
 
     label = create_label (parent, _("Icon size:"));
     table_add (table, label, 0, 0, (GtkAttachOptions) GTK_FILL);
@@ -815,9 +813,6 @@ inline GtkWidget *create_layout_tab (GtkWidget *parent, GnomeCmdData::Options &c
     table_add (table, label, 0, 1, (GtkAttachOptions) GTK_FILL);
     label = create_label (parent, _("Theme icon directory:"));
     table_add (table, label, 0, 2, (GtkAttachOptions) GTK_FILL);
-    label = create_label (parent, _("Document icon directory:"));
-    table_add (table, label, 0, 3, (GtkAttachOptions) GTK_FILL);
-
 
     gtk_option_menu_set_history (GTK_OPTION_MENU (fe_optmenu), (gint) cfg.ext_disp_mode);
     gtk_option_menu_set_history (GTK_OPTION_MENU (lm_optmenu), (gint) cfg.layout);
@@ -832,7 +827,6 @@ inline void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
     GtkWidget *iconsize_spin       = lookup_widget (dialog, "iconsize_spin");
     GtkWidget *iconquality_scale   = lookup_widget (dialog, "iconquality_scale");
     GtkWidget *theme_icondir_entry = lookup_widget (dialog, "theme_icondir_entry");
-    GtkWidget *doc_icondir_entry   = lookup_widget (dialog, "doc_icondir_entry");
     GtkWidget *row_height_spin     = lookup_widget (dialog, "row_height_spin");
     GtkWidget *use_ls              = lookup_widget (dialog, "use_ls_colors");
 
@@ -852,7 +846,6 @@ inline void store_layout_options (GtkWidget *dialog, GnomeCmdData::Options &cfg)
     cfg.set_list_font (list_font);
 
     cfg.set_theme_icon_dir (gtk_entry_get_text (GTK_ENTRY (theme_icondir_entry)));
-    cfg.set_document_icon_dir (gtk_entry_get_text (GTK_ENTRY (doc_icondir_entry)));
     cfg.icon_size = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (iconsize_spin));
 
     GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (iconquality_scale));
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index a24c136..4f1c07b 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -359,7 +359,6 @@ GnomeCmdData::Options::Options(const Options &cfg)
     icon_size = cfg.icon_size;
     icon_scale_quality = cfg.icon_scale_quality;
     theme_icon_dir = cfg.theme_icon_dir;
-    document_icon_dir = cfg.document_icon_dir;
     always_show_tabs = cfg.always_show_tabs;
     tab_lock_indicator = cfg.tab_lock_indicator;
     confirm_delete = cfg.confirm_delete;
@@ -417,7 +416,6 @@ GnomeCmdData::Options &GnomeCmdData::Options::operator = (const Options &cfg)
         icon_size = cfg.icon_size;
         icon_scale_quality = cfg.icon_scale_quality;
         theme_icon_dir = cfg.theme_icon_dir;
-        document_icon_dir = cfg.document_icon_dir;
         always_show_tabs = cfg.always_show_tabs;
         tab_lock_indicator = cfg.tab_lock_indicator;
         confirm_delete = cfg.confirm_delete;
@@ -1762,8 +1760,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);
-
     priv = g_new0 (Private, 1);
 
     options.color_themes[GNOME_CMD_COLOR_CUSTOM].respect_theme = FALSE;
@@ -1929,8 +1925,6 @@ void GnomeCmdData::load()
     dev_icon_size = g_settings_get_uint (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE);
     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);
     button_relief = (GtkReliefStyle) gnome_cmd_data_get_int ("/options/btn_relief", GTK_RELIEF_NONE);
     list_orientation = gnome_cmd_data_get_bool ("/options/list_orientation", FALSE);
@@ -2462,7 +2456,6 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_DEV_ICON_SIZE, 
&(dev_icon_size));
     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);
     gnome_cmd_data_set_bool   ("/options/list_orientation", list_orientation);
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 99edaaa..d47684b 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -70,7 +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_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"
@@ -166,7 +166,6 @@ struct GnomeCmdData
         guint                        icon_size;
         GdkInterpType                icon_scale_quality;
         gchar                       *theme_icon_dir;
-        gchar                       *document_icon_dir;
         //  Tabs
         gboolean                     always_show_tabs;
         int                          tab_lock_indicator;
@@ -220,7 +219,6 @@ struct GnomeCmdData
                    icon_size(16),
                    icon_scale_quality(GDK_INTERP_HYPER),
                    theme_icon_dir(NULL),
-                   document_icon_dir(NULL),
                    always_show_tabs(FALSE),
                    tab_lock_indicator(TAB_LOCK_ICON),
                    confirm_delete(TRUE),
@@ -253,7 +251,6 @@ struct GnomeCmdData
             g_free (date_format);
             g_free (list_font);
             g_free (theme_icon_dir);
-            g_free (document_icon_dir);
             g_free (backup_pattern);
             patlist_free (backup_pattern_list);
             g_free (viewer);
@@ -294,12 +291,6 @@ struct GnomeCmdData
             theme_icon_dir = g_strdup (dir);
         }
 
-        void set_document_icon_dir(const gchar *dir)
-        {
-            g_free (document_icon_dir);
-            document_icon_dir = g_strdup (dir);
-        }
-
         void set_backup_pattern(const gchar *value)
         {
             g_free (backup_pattern);
diff --git a/src/imageloader.cc b/src/imageloader.cc
index 2c787b4..9654d16 100644
--- a/src/imageloader.cc
+++ b/src/imageloader.cc
@@ -400,8 +400,8 @@ static gboolean get_mime_icon (GnomeVFSFileType type,
 {
     if (get_mime_icon_in_dir (gnome_cmd_data.options.theme_icon_dir, type, mime_type, symlink, pixmap, mask))
         return TRUE;
-
-    return get_mime_icon_in_dir (gnome_cmd_data.options.document_icon_dir, type, mime_type, symlink, pixmap, 
mask);
+    else
+        return FALSE;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]