[gnome-commander/GSettings] Removes btn_relief option, always use GTK_RELIEF_NONE for buttons now

[Uwe Scholz <uwescholz src gnome org>]

commit 526509d64e9bbbe7fff52bfbea6d737950775206
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Tue May 24 21:26:34 2016 +0200

    Removes btn_relief option, always use GTK_RELIEF_NONE for buttons now

 data/org.gnome.gnome-commander.gschema.xml |    5 -----
 src/gnome-cmd-combo.cc                     |    2 +-
 src/gnome-cmd-data.cc                      |    3 ---
 src/gnome-cmd-data.h                       |    1 -
 src/gnome-cmd-dir-indicator.cc             |    4 ++--
 src/utils.cc                               |    2 +-
 6 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 482bbe7..4fe09b6 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -172,11 +172,6 @@
       <default>16</default>
       <summary>Commandline history length</summary>
     </key>
-    <key name="btn-relief" type="i">
-      <default l10n="messages">2</default>
-      <summary></summary>
-      <description></description>
-    </key>
     <key name="filter-type" type="i">
       <default l10n="messages">1</default>
       <summary></summary>
diff --git a/src/gnome-cmd-combo.cc b/src/gnome-cmd-combo.cc
index 77a78de..40971a6 100644
--- a/src/gnome-cmd-combo.cc
+++ b/src/gnome-cmd-combo.cc
@@ -379,7 +379,7 @@ static void init (GnomeCmdCombo *combo)
 
     combo->button = gtk_button_new ();
     g_object_ref (combo->button);
-    gtk_button_set_relief (GTK_BUTTON (combo->button), gnome_cmd_data.button_relief);
+    gtk_button_set_relief (GTK_BUTTON (combo->button), GTK_RELIEF_NONE);
     g_object_set_data_full (*combo, "button", combo->button, g_object_unref);
     gtk_widget_show (combo->button);
 
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index d757ec6..2eb8e2e 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -1600,7 +1600,6 @@ GnomeCmdData::GnomeCmdData(): search_defaults(selections)
     dev_icon_size = 16;
     memset(fs_col_width, 0, sizeof(fs_col_width));
     gui_update_rate = DEFAULT_GUI_UPDATE_RATE;
-    button_relief = GTK_RELIEF_NONE;
 
     cmdline_history = NULL;
     cmdline_history_length = 0;
@@ -1929,7 +1928,6 @@ void GnomeCmdData::load()
     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);
     cmdline_history_length = g_settings_get_uint (options.gcmd_settings->general, 
GCMD_SETTINGS_CMDLINE_HISTORY_LENGTH);
-    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);
     gui_update_rate = gnome_cmd_data_get_int ("/options/gui_update_rate", DEFAULT_GUI_UPDATE_RATE);
     priv->main_win_pos[0] = gnome_cmd_data_get_int ("/options/main_win_pos_x", -1);
@@ -2460,7 +2458,6 @@ void GnomeCmdData::save()
     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);
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_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);
     gnome_cmd_data_set_int    ("/options/gui_update_rate", gui_update_rate);
 
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index d0e1b0b..087ea07 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -505,7 +505,6 @@ struct GnomeCmdData
     guint                        dev_icon_size;
     guint                        fs_col_width[GnomeCmdFileList::NUM_COLUMNS];
     guint                        gui_update_rate;
-    GtkReliefStyle               button_relief;
 
     GList                       *cmdline_history;
     gint                         cmdline_history_length;
diff --git a/src/gnome-cmd-dir-indicator.cc b/src/gnome-cmd-dir-indicator.cc
index 281cc7f..d153208 100644
--- a/src/gnome-cmd-dir-indicator.cc
+++ b/src/gnome-cmd-dir-indicator.cc
@@ -471,7 +471,7 @@ static void init (GnomeCmdDirIndicator *indicator)
     indicator->priv->history_button = gtk_button_new ();
     GTK_WIDGET_UNSET_FLAGS (indicator->priv->history_button, GTK_CAN_FOCUS);
     g_object_ref (indicator->priv->history_button);
-    gtk_button_set_relief (GTK_BUTTON (indicator->priv->history_button), gnome_cmd_data.button_relief);
+    gtk_button_set_relief (GTK_BUTTON (indicator->priv->history_button), GTK_RELIEF_NONE);
     g_object_set_data_full (G_OBJECT (indicator), "button", indicator->priv->history_button, g_object_unref);
     gtk_widget_show (indicator->priv->history_button);
 
@@ -484,7 +484,7 @@ static void init (GnomeCmdDirIndicator *indicator)
     // create the bookmark popup button
     indicator->priv->bookmark_button = create_styled_pixmap_button (NULL, IMAGE_get_gnome_cmd_pixmap 
(PIXMAP_BOOKMARK));
     GTK_WIDGET_UNSET_FLAGS (indicator->priv->bookmark_button, GTK_CAN_FOCUS);
-    gtk_button_set_relief (GTK_BUTTON (indicator->priv->bookmark_button), gnome_cmd_data.button_relief);
+    gtk_button_set_relief (GTK_BUTTON (indicator->priv->bookmark_button), GTK_RELIEF_NONE);
     g_object_set_data_full (G_OBJECT (indicator), "button", indicator->priv->bookmark_button, 
g_object_unref);
     gtk_widget_show (indicator->priv->bookmark_button);
 
diff --git a/src/utils.cc b/src/utils.cc
index 908d337..a7a82d3 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -887,7 +887,7 @@ GtkWidget *create_styled_button (const gchar *text)
 {
     GtkWidget *w = text ? gtk_button_new_with_label (text) : gtk_button_new ();
 
-    gtk_button_set_relief (GTK_BUTTON (w), gnome_cmd_data.button_relief);
+    gtk_button_set_relief (GTK_BUTTON (w), GTK_RELIEF_NONE);
     g_object_ref (w);
     gtk_widget_show (w);