[evolution: 1439/1446] Merge branch 'master' into wip/gsettings
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution: 1439/1446] Merge branch 'master' into wip/gsettings
- Date: Wed, 23 Nov 2011 02:12:15 +0000 (UTC)
commit 00e495279937c6495d6fab99fe7f89583859ecd1
Merge: 0c83b9b f3abed7
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue Nov 22 14:52:33 2011 -0500
Merge branch 'master' into wip/gsettings
Conflicts:
mail/e-mail-paned-view.c
configure.ac | 1 +
e-util/e-alert.c | 12 -
e-util/e-marshal.list | 1 +
mail/Makefile.am | 44 +-
mail/e-mail-attachment-bar.c | 132 ++---
mail/e-mail-browser.c | 143 ++----
mail/e-mail-display.c | 65 +--
mail/e-mail-folder-pane.c | 9 +-
mail/e-mail-label-action.c | 41 +--
mail/e-mail-label-dialog.c | 46 +--
mail/e-mail-label-list-store.c | 81 +--
mail/e-mail-label-manager.c | 45 +--
mail/e-mail-label-tree-view.c | 42 +--
mail/e-mail-message-pane.c | 9 +-
mail/e-mail-notebook-view.c | 230 +++++----
mail/e-mail-paned-view.c | 119 +++--
mail/e-mail-paned-view.h | 1 -
mail/e-mail-reader-utils.c | 32 --
mail/e-mail-reader-utils.h | 2 -
mail/e-mail-reader.c | 267 +++++++---
mail/e-mail-reader.h | 13 +-
mail/e-mail-tab-picker.c | 97 ++--
mail/e-mail-tab-picker.h | 149 +++---
mail/e-mail-tab.c | 93 ++--
mail/e-mail-tab.h | 158 +++---
mail/e-mail-tag-editor.c | 42 +--
mail/e-mail-view.c | 9 +-
mail/em-account-editor.c | 46 +--
mail/em-composer-utils.c | 263 ---------
mail/em-composer-utils.h | 7 -
mail/em-config.c | 2 +-
mail/em-config.h | 19 +
mail/em-event.c | 2 +-
mail/em-event.h | 19 +
mail/em-filter-context.c | 11 +-
mail/em-filter-editor.c | 34 +--
mail/em-filter-rule.c | 104 ++---
mail/em-folder-selection-button.c | 2 +-
mail/em-folder-tree.c | 2 +-
mail/em-format-hook.c | 76 ++--
mail/em-format-html-display.c | 56 +--
mail/em-format-html-print.c | 40 +--
mail/em-format-html.c | 9 +-
mail/em-search-context.c | 40 +--
mail/em-vfolder-context.c | 11 +-
mail/em-vfolder-rule.c | 10 +-
mail/mail-folder-cache.c | 257 +++++-----
mail/mail.error.xml | 7 -
mail/message-list.c | 59 +--
modules/Makefile.am | 1 +
modules/mail/e-mail-shell-content.c | 114 ++---
modules/mdn/Makefile.am | 36 ++
modules/mdn/evolution-mdn.c | 569 ++++++++++++++++++++
modules/mdn/evolution-mdn.error.xml | 9 +
.../evolution-offline-alert.error.xml | 2 -
plugins/mail-to-task/mail-to-task.c | 9 +-
plugins/save-calendar/csv-format.c | 2 +-
plugins/save-calendar/ical-format.c | 2 +-
plugins/save-calendar/rdf-format.c | 2 +-
po/POTFILES.in | 2 +
widgets/misc/e-alert-bar.c | 218 +++++---
widgets/misc/e-alert-bar.h | 1 +
widgets/misc/e-preview-pane.c | 70 +++-
widgets/misc/e-preview-pane.h | 1 +
64 files changed, 2125 insertions(+), 1872 deletions(-)
---
diff --cc mail/e-mail-attachment-bar.c
index c07d0e8,a48ca30..a33f8c9
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@@ -255,10 -272,13 +270,10 @@@ static voi
mail_attachment_bar_constructed (GObject *object)
{
EMailAttachmentBarPrivate *priv;
- GConfBridge *bridge;
- const gchar *key;
+ GSettings *settings;
- priv = E_MAIL_ATTACHMENT_BAR (object)->priv;
+ priv = E_MAIL_ATTACHMENT_BAR_GET_PRIVATE (object);
- bridge = gconf_bridge_get ();
-
/* Set up property-to-property bindings. */
g_object_bind_property (
@@@ -309,13 -329,13 +324,13 @@@
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
- /* Set up property-to-GConf bindings. */
-
- key = "/apps/evolution/shell/attachment_view";
- gconf_bridge_bind_property (bridge, key, object, "active-view");
+ /* Set up property-to-GSettings bindings. */
+ settings = g_settings_new ("org.gnome.evolution.shell");
+ g_settings_bind (settings, "attachment-view", object, "active-view", G_SETTINGS_BIND_DEFAULT);
+ g_object_unref (settings);
/* Chain up to parent's constructed() method. */
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ G_OBJECT_CLASS (e_mail_attachment_bar_parent_class)->constructed (object);
}
static EAttachmentViewPrivate *
diff --cc mail/e-mail-browser.c
index 1125510,e9c8372..ec0e925
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@@ -706,16 -695,16 +694,16 @@@ mail_browser_constructed (GObject *obje
g_signal_connect_swapped (
search_bar, "changed",
- G_CALLBACK (em_format_queue_redraw), priv->formatter);
+ G_CALLBACK (em_format_queue_redraw),
+ browser->priv->formatter);
- /* Bind GObject properties to GConf keys. */
+ /* Bind GObject properties to GSettings keys. */
- bridge = gconf_bridge_get ();
+ settings = g_settings_new ("org.gnome.evolution.mail");
object = G_OBJECT (reader);
- key = "/apps/evolution/mail/display/show_deleted";
- gconf_bridge_bind_property (bridge, key, object, "show-deleted");
+ g_settings_bind (settings, "show-deleted", object, "show-deleted", G_SETTINGS_BIND_DEFAULT);
+ g_object_unref (settings);
id = "org.gnome.evolution.mail.browser";
e_plugin_ui_register_manager (ui_manager, id, object);
diff --cc mail/e-mail-label-list-store.c
index 673893c,bcc915c..7e8c6f2
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@@ -27,10 -27,14 +27,14 @@@
#include <glib/gi18n.h>
#include <camel/camel.h>
-#include "e-util/gconf-bridge.h"
+ #define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_MAIL_LABEL_LIST_STORE, EMailLabelListStorePrivate))
+
struct _EMailLabelListStorePrivate {
GHashTable *tag_index;
+ GSettings *mail_settings;
};
static struct {
@@@ -161,87 -175,11 +175,88 @@@ mail_label_list_store_finalize (GObjec
g_hash_table_destroy (priv->tag_index);
+ if (priv->mail_settings != NULL) {
+ g_object_unref (priv->mail_settings);
+ priv->mail_settings = NULL;
+ }
+
/* Chain up to parent's finalize() method. */
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (e_mail_label_list_store_parent_class)->
+ finalize (object);
}
+
+static void labels_settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data);
+
+static void
+labels_model_changed_cb (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
+{
+ EMailLabelListStore *store;
+ GPtrArray *array;
+ GtkTreeIter tmp_iter;
+ gboolean res;
+
+ store = E_MAIL_LABEL_LIST_STORE (user_data);
+
+ /* Make sure we don't enter an infinite synchronizing loop */
+ g_signal_handlers_block_by_func (store->priv->mail_settings, labels_settings_changed_cb, store);
+
+ /* Build list to store in GSettings */
+ array = g_ptr_array_new ();
+ res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &tmp_iter);
+ while (res) {
+ gchar *string;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &tmp_iter,
+ 0, &string, -1);
+ g_ptr_array_add (array, string);
+
+ res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &tmp_iter);
+ }
+
+ g_ptr_array_add (array, NULL);
+ g_settings_set_strv (
+ store->priv->mail_settings, "labels",
+ (const gchar * const *) array->pdata);
+
+ g_ptr_array_free (array, TRUE);
+ g_signal_handlers_unblock_by_func (store->priv->mail_settings, labels_settings_changed_cb, store);
+}
+
+static void
+labels_settings_changed_cb (GSettings *settings,
+ const gchar *key,
+ gpointer user_data)
+{
+ EMailLabelListStore *store;
+ gchar **strv;
+ gint i;
+
+ store = E_MAIL_LABEL_LIST_STORE (user_data);
+
+ /* Make sure we don't enter an infinite synchronizing loop */
+ g_signal_handlers_block_by_func (store, labels_model_changed_cb, store);
+
+ gtk_list_store_clear (GTK_LIST_STORE (store));
+
+ strv = g_settings_get_strv (store->priv->mail_settings, "labels");
+ for (i = 0; strv[i] != NULL; i++) {
+ GtkTreeIter iter;
+
+ gtk_list_store_insert_with_values (GTK_LIST_STORE (store),
+ &iter, -1,
+ 0, strv[i],
+ -1);
+ }
+
+ g_strfreev (strv);
+
+ g_signal_handlers_unblock_by_func (store, labels_model_changed_cb, store);
+}
+
static void
mail_label_list_store_constructed (GObject *object)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
