[gnome-commander/GSettings] Renames concombo_visibility variables and functions to show_devlist

[Uwe Scholz <uwescholz src gnome org>]

commit 14516076341e700c405700b27fae7f723addbcd3
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sat Jun 4 22:37:21 2016 +0200

    Renames concombo_visibility variables and functions to show_devlist

 src/gnome-cmd-data.cc          |   12 ++++++------
 src/gnome-cmd-data.h           |    2 +-
 src/gnome-cmd-file-selector.cc |    6 +++---
 src/gnome-cmd-file-selector.h  |    2 +-
 src/gnome-cmd-main-menu.cc     |    2 +-
 src/gnome-cmd-main-win.cc      |    2 +-
 src/gnome-cmd-user-actions.cc  |    8 ++++----
 7 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 0f7696d..49e02fe 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -210,10 +210,10 @@ void on_show_devlist_changed ()
     gboolean show_devlist;
 
     show_devlist = g_settings_get_boolean (gnome_cmd_data.options.gcmd_settings->general, 
GCMD_SETTINGS_SHOW_DEVLIST);
-    gnome_cmd_data.concombo_visibility = show_devlist;
+    gnome_cmd_data.show_devlist = show_devlist;
 
-    main_win->fs(ACTIVE)->update_concombo_visibility();
-    main_win->fs(INACTIVE)->update_concombo_visibility();
+    main_win->fs(ACTIVE)->update_show_devlist();
+    main_win->fs(INACTIVE)->update_show_devlist();
 }
 
 void on_horizontal_orientation_changed ()
@@ -1639,7 +1639,7 @@ GnomeCmdData::GnomeCmdData(): search_defaults(selections)
 
     toolbar_visibility = TRUE;
     show_devbuttons = TRUE;
-    concombo_visibility = TRUE;
+    show_devlist = TRUE;
     cmdline_visibility = TRUE;
     buttonbar_visibility = TRUE;
 
@@ -1994,7 +1994,7 @@ void GnomeCmdData::load()
 
     toolbar_visibility = gnome_cmd_data_get_bool ("/programs/toolbar_visibility", TRUE);
     show_devbuttons = g_settings_get_boolean (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS);
-    concombo_visibility = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_SHOW_DEVLIST);
+    show_devlist = g_settings_get_boolean (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVLIST);
     cmdline_visibility = gnome_cmd_data_get_bool ("/options/cmdline_visibility", TRUE);
     buttonbar_visibility = gnome_cmd_data_get_bool ("/programs/buttonbar_visibility", TRUE);
 
@@ -2530,7 +2530,7 @@ void GnomeCmdData::save()
 
     gnome_cmd_data_set_bool   ("/programs/toolbar_visibility", toolbar_visibility);
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVBUTTONS, 
&(show_devbuttons));
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVLIST, 
&(concombo_visibility));
+    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SHOW_DEVLIST, 
&(show_devlist));
     gnome_cmd_data_set_bool   ("/options/cmdline_visibility", cmdline_visibility);
     gnome_cmd_data_set_bool   ("/programs/buttonbar_visibility", buttonbar_visibility);
 
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index 0462286..96f1af5 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -502,7 +502,7 @@ struct GnomeCmdData
 
     gboolean                     toolbar_visibility;
     gboolean                     show_devbuttons;
-    gboolean                     concombo_visibility;
+    gboolean                     show_devlist;
     gboolean                     cmdline_visibility;
     gboolean                     buttonbar_visibility;
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 8aa8edb..8e1b0da 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -828,7 +828,7 @@ static void init (GnomeCmdFileSelector *fs)
 
     // show the widgets
     gtk_widget_show (GTK_WIDGET (vbox));
-    fs->update_concombo_visibility();
+    fs->update_show_devlist();
     gtk_widget_show (*fs->con_combo);
     gtk_widget_show (fs->vol_label);
     gtk_widget_show (fs->dir_indicator);
@@ -1355,9 +1355,9 @@ void GnomeCmdFileSelector::update_show_devbuttons()
 }
 
 
-void GnomeCmdFileSelector::update_concombo_visibility()
+void GnomeCmdFileSelector::update_show_devlist()
 {
-    if (gnome_cmd_data.concombo_visibility)
+    if (gnome_cmd_data.show_devlist)
         gtk_widget_show (con_hbox);
     else
         gtk_widget_hide (con_hbox);
diff --git a/src/gnome-cmd-file-selector.h b/src/gnome-cmd-file-selector.h
index bccd67c..59dcc09 100644
--- a/src/gnome-cmd-file-selector.h
+++ b/src/gnome-cmd-file-selector.h
@@ -104,7 +104,7 @@ struct GnomeCmdFileSelector
     void update_style();
     void update_connections();
     void update_show_devbuttons();
-    void update_concombo_visibility();
+    void update_show_devlist();
 
     void do_file_specific_action (GnomeCmdFileList *fl, GnomeCmdFile *f);
 
diff --git a/src/gnome-cmd-main-menu.cc b/src/gnome-cmd-main-menu.cc
index 89ec354..8a51183 100644
--- a/src/gnome-cmd-main-menu.cc
+++ b/src/gnome-cmd-main-menu.cc
@@ -811,7 +811,7 @@ static void init (GnomeCmdMainMenu *main_menu)
 
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[8].widget), 
gnome_cmd_data.toolbar_visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[9].widget), 
gnome_cmd_data.show_devbuttons);
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[10].widget), 
gnome_cmd_data.concombo_visibility);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[10].widget), 
gnome_cmd_data.show_devlist);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[11].widget), 
gnome_cmd_data.cmdline_visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[12].widget), 
gnome_cmd_data.buttonbar_visibility);
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_menu_uiinfo[14].widget), 
!gnome_cmd_data.options.filter.hidden);
diff --git a/src/gnome-cmd-main-win.cc b/src/gnome-cmd-main-win.cc
index 341c237..3737204 100644
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@ -1105,7 +1105,7 @@ void GnomeCmdMainWin::change_connection(FileSelectorID id)
     GnomeCmdFileSelector *fs = this->fs(id);
 
     switch_fs(fs);
-    if (gnome_cmd_data.concombo_visibility)
+    if (gnome_cmd_data.show_devlist)
         fs->con_combo->popup_list();
 }
 
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index ba555d5..ec98896 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -1546,10 +1546,10 @@ void view_concombo (GtkMenuItem *menuitem, gpointer not_used)
     if (!GTK_WIDGET_REALIZED (main_win)) return;
 
     GtkCheckMenuItem *checkitem = (GtkCheckMenuItem *) menuitem;
-    gnome_cmd_data.concombo_visibility = checkitem->active;
-    g_settings_set_boolean (gcmd_user_actions.settings->general, GCMD_SETTINGS_SHOW_DEVLIST, 
gnome_cmd_data.concombo_visibility);
-    get_fs (ACTIVE)->update_concombo_visibility();
-    get_fs (INACTIVE)->update_concombo_visibility();
+    gnome_cmd_data.show_devlist = checkitem->active;
+    g_settings_set_boolean (gcmd_user_actions.settings->general, GCMD_SETTINGS_SHOW_DEVLIST, 
gnome_cmd_data.show_devlist);
+    get_fs (ACTIVE)->update_show_devlist();
+    get_fs (INACTIVE)->update_show_devlist();
 }