[balsa/gtk3] Reimplement default toolbar style
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Reimplement default toolbar style
- Date: Sat, 29 Jan 2011 14:14:03 +0000 (UTC)
commit 74376f8e5e899d59fd36e7730dc0076aa1e8f24d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Jan 29 09:12:47 2011 -0500
Reimplement default toolbar style
* src/toolbar-factory.c (balsa_toolbar_model_finalize),
(tm_gsettings_change_cb), (balsa_toolbar_model_new),
(tm_default_style): really use the desktop default when so
configured.
ChangeLog | 7 +++++++
src/toolbar-factory.c | 11 ++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2e6c030..7ba8e5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-29 Peter Bloomfield
+
+ * src/toolbar-factory.c (balsa_toolbar_model_finalize),
+ (tm_gsettings_change_cb), (balsa_toolbar_model_new),
+ (tm_default_style): really use the desktop default when so
+ configured.
+
2011-01-28 Peter Bloomfield
Migrate from GConf to GSettings
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 6ed9a22..546c11f 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -52,6 +52,7 @@ struct BalsaToolbarModel_ {
GSList *current;
BalsaToolbarType type;
GtkToolbarStyle style;
+ GSettings *settings;
};
enum {
@@ -67,6 +68,7 @@ balsa_toolbar_model_finalize(GObject * object)
{
BalsaToolbarModel *model = BALSA_TOOLBAR_MODEL(object);
g_hash_table_destroy(model->legal);
+ g_object_unref(model->settings);
G_OBJECT_CLASS(parent_class)->finalize(object);
}
@@ -272,7 +274,7 @@ tm_gsettings_change_cb(GSettings * settings,
{
BalsaToolbarModel *model = user_data;
- if (!strcmp(key, "toolbar_style") &&
+ if (!strcmp(key, "toolbar-style") &&
model->style == (GtkToolbarStyle) (-1))
balsa_toolbar_model_changed(model);
}
@@ -284,16 +286,14 @@ balsa_toolbar_model_new(BalsaToolbarType type, GSList * standard)
{
BalsaToolbarModel *model =
g_object_new(BALSA_TYPE_TOOLBAR_MODEL, NULL);
- GSettings *settings;
model->type = type;
model->standard = standard;
tm_load_model(model);
- settings = g_settings_new("org.gnome.desktop.interface");
- g_signal_connect(G_OBJECT(settings), "changed",
+ model->settings = g_settings_new("org.gnome.desktop.interface");
+ g_signal_connect(model->settings, "changed",
G_CALLBACK(tm_gsettings_change_cb), model);
- g_object_unref(settings);
return model;
}
@@ -541,6 +541,7 @@ tm_default_style(void)
}
g_free(str);
}
+ g_object_unref(settings);
return default_style;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]