[devhelp] settings: remove search-notebook GSettings (no longer used)
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] settings: remove search-notebook GSettings (no longer used)
- Date: Fri, 28 Apr 2017 11:42:31 +0000 (UTC)
commit 50b3c468a53bce9600f9dcb4b570ab754c7a2e08
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri Apr 28 12:37:19 2017 +0200
settings: remove search-notebook GSettings (no longer used)
I've checked the whole gschema, all remaining settings are used in the
code.
data/devhelp.convert | 3 ---
data/org.gnome.devhelp.gschema.xml | 8 --------
src/dh-settings.c | 10 ----------
src/dh-settings.h | 2 --
4 files changed, 0 insertions(+), 23 deletions(-)
---
diff --git a/data/devhelp.convert b/data/devhelp.convert
index 7f9c8e6..3b0a721 100644
--- a/data/devhelp.convert
+++ b/data/devhelp.convert
@@ -15,9 +15,6 @@ y-position=/apps/devhelp/state/assistant/window/y_position
[org.gnome.devhelp.state.main.paned]
position=/apps/devhelp/state/main/paned/position
-[org.gnome.devhelp.state.search_notebook]
-selected-tab=/apps/devhelp/state/main/search_notebook/selected_tab
-
[org.gnome.devhelp.state.main.contents]
books-disabled=/apps/devhelp/state/main/contents/books_disabled
group-books-by-language=/apps/devhelp/state/main/contents/group_books_by_language
diff --git a/data/org.gnome.devhelp.gschema.xml b/data/org.gnome.devhelp.gschema.xml
index 4f51ced..2f69201 100644
--- a/data/org.gnome.devhelp.gschema.xml
+++ b/data/org.gnome.devhelp.gschema.xml
@@ -10,7 +10,6 @@
<schema id="org.gnome.devhelp.state.main" path="/org/gnome/devhelp/state/main/">
<child name="window" schema="org.gnome.devhelp.state.main.window"/>
<child name="paned" schema="org.gnome.devhelp.state.main.paned"/>
- <child name="search-notebook" schema="org.gnome.devhelp.state.main.search-notebook"/>
<child name="contents" schema="org.gnome.devhelp.state.main.contents"/>
</schema>
<schema id="org.gnome.devhelp.state.main.window" path="/org/gnome/devhelp/state/main/window/">
@@ -47,13 +46,6 @@
<description>The width of the index and search pane.</description>
</key>
</schema>
- <schema id="org.gnome.devhelp.state.main.search-notebook"
path="/org/gnome/devhelp/state/main/search-notebook/">
- <key name="selected-tab" type="s">
- <default>'content'</default>
- <summary>Selected tab: "content" or "search"</summary>
- <description>Which of the tabs is selected: "content" or "search".</description>
- </key>
- </schema>
<schema id="org.gnome.devhelp.state.main.contents" path="/org/gnome/devhelp/state/main/contents/">
<key name="books-disabled" type="as">
<default>[]</default>
diff --git a/src/dh-settings.c b/src/dh-settings.c
index 193377d..d7453e3 100644
--- a/src/dh-settings.c
+++ b/src/dh-settings.c
@@ -29,7 +29,6 @@ G_DEFINE_TYPE (DhSettings, dh_settings, G_TYPE_OBJECT);
#define SETTINGS_SCHEMA_ID_WINDOW "org.gnome.devhelp.state.main.window"
#define SETTINGS_SCHEMA_ID_CONTENTS "org.gnome.devhelp.state.main.contents"
#define SETTINGS_SCHEMA_ID_PANED "org.gnome.devhelp.state.main.paned"
-#define SETTINGS_SCHEMA_ID_SEARCH_NOTEBOOK "org.gnome.devhelp.state.main.search-notebook"
#define SETTINGS_SCHEMA_ID_ASSISTANT "org.gnome.devhelp.state.assistant.window"
/* singleton object - all consumers of DhSettings get the same object (refcounted) */
@@ -45,7 +44,6 @@ struct _DhSettingsPrivate {
GSettings *settings_window;
GSettings *settings_contents;
GSettings *settings_paned;
- GSettings *settings_search_notebook;
GSettings *settings_assistant;
};
@@ -67,7 +65,6 @@ dh_settings_init (DhSettings *self)
self->priv->settings_window = g_settings_new (SETTINGS_SCHEMA_ID_WINDOW);
self->priv->settings_contents = g_settings_new (SETTINGS_SCHEMA_ID_CONTENTS);
self->priv->settings_paned = g_settings_new (SETTINGS_SCHEMA_ID_PANED);
- self->priv->settings_search_notebook = g_settings_new (SETTINGS_SCHEMA_ID_SEARCH_NOTEBOOK);
self->priv->settings_assistant = g_settings_new (SETTINGS_SCHEMA_ID_ASSISTANT);
/* setup GSettings notifications */
@@ -86,7 +83,6 @@ dispose (GObject *object)
g_clear_object (&self->priv->settings_window);
g_clear_object (&self->priv->settings_contents);
g_clear_object (&self->priv->settings_paned);
- g_clear_object (&self->priv->settings_search_notebook);
g_clear_object (&self->priv->settings_assistant);
G_OBJECT_CLASS (dh_settings_parent_class)->dispose (object);
@@ -203,12 +199,6 @@ dh_settings_peek_paned_settings (DhSettings *self)
}
GSettings *
-dh_settings_peek_search_notebook_settings (DhSettings *self)
-{
- return self->priv->settings_search_notebook;
-}
-
-GSettings *
dh_settings_peek_assistant_settings (DhSettings *self)
{
return self->priv->settings_assistant;
diff --git a/src/dh-settings.h b/src/dh-settings.h
index a8fa33d..35d41e0 100644
--- a/src/dh-settings.h
+++ b/src/dh-settings.h
@@ -70,8 +70,6 @@ GSettings * dh_settings_peek_contents_settings (DhSettings *self);
GSettings * dh_settings_peek_paned_settings (DhSettings *self);
-GSettings * dh_settings_peek_search_notebook_settings (DhSettings *self);
-
GSettings * dh_settings_peek_assistant_settings (DhSettings *self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]