[gnome-commander] Remove deprecated width and height config settings for removed search window



commit 5d365b1c6a9a81f84a20dadf317301e7030ce7f4
Author: Uwe Scholz <u scholz83 gmx de>
Date:   Sat Jan 15 23:54:59 2022 +0100

    Remove deprecated width and height config settings for removed search window

 data/org.gnome.gnome-commander.gschema.xml | 14 --------------
 src/gnome-cmd-data.cc                      |  7 -------
 src/gnome-cmd-data.h                       |  6 ------
 3 files changed, 27 deletions(-)
---
diff --git a/data/org.gnome.gnome-commander.gschema.xml b/data/org.gnome.gnome-commander.gschema.xml
index 7fe4aa80..111c1172 100644
--- a/data/org.gnome.gnome-commander.gschema.xml
+++ b/data/org.gnome.gnome-commander.gschema.xml
@@ -514,20 +514,6 @@
           The entries in this list represent the favorite apps configured by the user.
       </description>
     </key>
-    <key name="search-win-width" type="u">
-      <default>600</default>
-      <summary>Search window width</summary>
-      <description>
-          This option defines the width of the search window.
-      </description>
-    </key>
-    <key name="search-win-height" type="u">
-      <default>400</default>
-      <summary>Search window height</summary>
-      <description>
-          This option defines the height of the search window.
-      </description>
-    </key>
     <key name="search-text-history" type="as">
       <default>[]</default>
       <summary>Search text history</summary>
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 9138410f..6212fe8d 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -2682,9 +2682,6 @@ GnomeCmdData::GnomeCmdData(): search_defaults(profiles)
 
     use_gcmd_block = TRUE;
 
-    main_win_width = 600;
-    main_win_height = 400;
-
     main_win_state = GDK_WINDOW_STATE_MAXIMIZED;
 
     umask = ::umask(0);
@@ -3219,8 +3216,6 @@ void GnomeCmdData::load()
     options.save_tabs_on_exit = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_SAVE_TABS_ON_EXIT);
     options.save_dir_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_SAVE_DIR_HISTORY_ON_EXIT);
     options.save_cmdline_history_on_exit = g_settings_get_boolean (options.gcmd_settings->general, 
GCMD_SETTINGS_SAVE_CMDLINE_HISTORY_ON_EXIT);
-    search_defaults.height = g_settings_get_uint(options.gcmd_settings->general, 
GCMD_SETTINGS_SEARCH_WIN_HEIGHT);
-    search_defaults.width = g_settings_get_uint(options.gcmd_settings->general, 
GCMD_SETTINGS_SEARCH_WIN_WIDTH);
     search_defaults.content_patterns.ents = get_list_from_gsettings_string_array 
(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_TEXT_HISTORY);
     search_defaults.name_patterns.ents = get_list_from_gsettings_string_array 
(options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_PATTERN_HISTORY);
     bookmarks_defaults.width = g_settings_get_uint(options.gcmd_settings->general, 
GCMD_SETTINGS_BOOKMARKS_WINDOW_WIDTH);
@@ -3618,8 +3613,6 @@ void GnomeCmdData::save()
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SAVE_TABS_ON_EXIT, 
&(options.save_tabs_on_exit));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SAVE_DIR_HISTORY_ON_EXIT, 
&(options.save_dir_history_on_exit));
     set_gsettings_when_changed      (options.gcmd_settings->general, 
GCMD_SETTINGS_SAVE_CMDLINE_HISTORY_ON_EXIT, &(options.save_cmdline_history_on_exit));
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_WIN_WIDTH, 
&(search_defaults.width));
-    set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_SEARCH_WIN_HEIGHT, 
&(search_defaults.height));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_BOOKMARKS_WINDOW_WIDTH, 
&(bookmarks_defaults.width));
     set_gsettings_when_changed      (options.gcmd_settings->general, GCMD_SETTINGS_BOOKMARKS_WINDOW_HEIGHT, 
&(bookmarks_defaults.height));
 
diff --git a/src/gnome-cmd-data.h b/src/gnome-cmd-data.h
index a2c0eb57..6e112f84 100644
--- a/src/gnome-cmd-data.h
+++ b/src/gnome-cmd-data.h
@@ -127,8 +127,6 @@ GcmdSettings *gcmd_settings_new (void);
 #define GCMD_SETTINGS_FAV_APPS                        "favorite-apps"
 #define GCMD_SETTINGS_FAV_APPS_FORMAT_STRING          "(ssssubbb)"
 #define GCMD_SETTINGS_DIRECTORY_HISTORY               "directory-history"
-#define GCMD_SETTINGS_SEARCH_WIN_WIDTH                "search-win-width"
-#define GCMD_SETTINGS_SEARCH_WIN_HEIGHT               "search-win-height"
 #define GCMD_SETTINGS_SEARCH_PATTERN_HISTORY          "search-pattern-history"
 #define GCMD_SETTINGS_SEARCH_TEXT_HISTORY             "search-text-history"
 #define GCMD_SETTINGS_SEARCH_PROFILES                 "search-profiles"
@@ -577,8 +575,6 @@ struct GnomeCmdData
 
     struct SearchConfig
     {
-        gint width, height;
-
         SearchProfile default_profile;
 
         History name_patterns;
@@ -587,8 +583,6 @@ struct GnomeCmdData
         std::vector<SearchProfile> &profiles;
 
         explicit SearchConfig(std::vector<SearchProfile> &searchProfiles):
-            width(600),
-            height(400),
             name_patterns(SEARCH_HISTORY_SIZE),
             content_patterns(SEARCH_HISTORY_SIZE),
             profiles(searchProfiles)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]