[evolution] Make MessageList extensible.



commit 96c32f5facc22faefd2f753d22d462266009de21
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Jun 14 10:44:56 2013 -0400

    Make MessageList extensible.
    
    Also add a placeholder ESettingsMessageList extension.  Going to clean
    out some of the direct GSettings usage in MessageList by adding GObject
    properties and binding them to GSettings keys from the extension.

 mail/message-list.c                          |   12 ++++
 modules/settings/Makefile.am                 |    2 +
 modules/settings/e-settings-message-list.c   |   90 ++++++++++++++++++++++++++
 modules/settings/e-settings-message-list.h   |   66 +++++++++++++++++++
 modules/settings/evolution-module-settings.c |    2 +
 5 files changed, 172 insertions(+), 0 deletions(-)
---
diff --git a/mail/message-list.c b/mail/message-list.c
index f8d2f10..dcf5a24 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -162,6 +162,8 @@ G_DEFINE_TYPE_WITH_CODE (
        message_list,
        E_TYPE_TREE,
        G_IMPLEMENT_INTERFACE (
+               E_TYPE_EXTENSIBLE, NULL)
+       G_IMPLEMENT_INTERFACE (
                E_TYPE_SELECTABLE,
                message_list_selectable_init))
 
@@ -2748,6 +2750,15 @@ message_list_finalize (GObject *object)
 }
 
 static void
+message_list_constructed (GObject *object)
+{
+       /* Chain up to parent's constructed() method. */
+       G_OBJECT_CLASS (message_list_parent_class)->constructed (object);
+
+       e_extensible_load_extensions (E_EXTENSIBLE (object));
+}
+
+static void
 message_list_selectable_update_actions (ESelectable *selectable,
                                         EFocusTracker *focus_tracker,
                                         GdkAtom *clipboard_targets,
@@ -2784,6 +2795,7 @@ message_list_class_init (MessageListClass *class)
        object_class->get_property = message_list_get_property;
        object_class->dispose = message_list_dispose;
        object_class->finalize = message_list_finalize;
+       object_class->constructed = message_list_constructed;
 
        class->message_list_built = NULL;
 
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index 27dc8c7..d7c00b7 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -39,6 +39,8 @@ module_settings_la_SOURCES = \
        e-settings-meeting-store.h \
        e-settings-meeting-time-selector.c \
        e-settings-meeting-time-selector.h \
+       e-settings-message-list.c \
+       e-settings-message-list.h \
        e-settings-name-selector-entry.c \
        e-settings-name-selector-entry.h \
        e-settings-spell-entry.c \
diff --git a/modules/settings/e-settings-message-list.c b/modules/settings/e-settings-message-list.c
new file mode 100644
index 0000000..fccc2f4
--- /dev/null
+++ b/modules/settings/e-settings-message-list.c
@@ -0,0 +1,90 @@
+/*
+ * e-settings-message-list.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include "e-settings-message-list.h"
+
+#include <mail/message-list.h>
+
+G_DEFINE_DYNAMIC_TYPE (
+       ESettingsMessageList,
+       e_settings_message_list,
+       E_TYPE_EXTENSION)
+
+static MessageList *
+settings_message_list_get_extensible (ESettingsMessageList *extension)
+{
+       EExtensible *extensible;
+
+       extensible = e_extension_get_extensible (E_EXTENSION (extension));
+
+       return MESSAGE_LIST (extensible);
+}
+
+static void
+settings_message_list_constructed (GObject *object)
+{
+       ESettingsMessageList *extension;
+       MessageList *message_list;
+       GSettings *settings;
+
+       extension = E_SETTINGS_MESSAGE_LIST (object);
+       message_list = settings_message_list_get_extensible (extension);
+
+       settings = g_settings_new ("org.gnome.evolution.mail");
+
+       /* FIXME Bind stuff here... */
+
+       g_object_unref (settings);
+
+       /* Chain up to parent's constructed() method. */
+       G_OBJECT_CLASS (e_settings_message_list_parent_class)->
+               constructed (object);
+}
+
+static void
+e_settings_message_list_class_init (ESettingsMessageListClass *class)
+{
+       GObjectClass *object_class;
+       EExtensionClass *extension_class;
+
+       object_class = G_OBJECT_CLASS (class);
+       object_class->constructed = settings_message_list_constructed;
+
+       extension_class = E_EXTENSION_CLASS (class);
+       extension_class->extensible_type = MESSAGE_LIST_TYPE;
+}
+
+static void
+e_settings_message_list_class_finalize (ESettingsMessageListClass *class)
+{
+}
+
+static void
+e_settings_message_list_init (ESettingsMessageList *extension)
+{
+}
+
+void
+e_settings_message_list_type_register (GTypeModule *type_module)
+{
+       /* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
+        *     function, so we have to wrap it with a public function in
+        *     order to register types from a separate compilation unit. */
+       e_settings_message_list_register_type (type_module);
+}
+
diff --git a/modules/settings/e-settings-message-list.h b/modules/settings/e-settings-message-list.h
new file mode 100644
index 0000000..81e7f11
--- /dev/null
+++ b/modules/settings/e-settings-message-list.h
@@ -0,0 +1,66 @@
+/*
+ * e-settings-message-list.h
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#ifndef E_SETTINGS_MESSAGE_LIST_H
+#define E_SETTINGS_MESSAGE_LIST_H
+
+#include <libebackend/libebackend.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SETTINGS_MESSAGE_LIST \
+       (e_settings_message_list_get_type ())
+#define E_SETTINGS_MESSAGE_LIST(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_SETTINGS_MESSAGE_LIST, ESettingsMessageList))
+#define E_SETTINGS_MESSAGE_LIST_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_SETTINGS_MESSAGE_LIST, ESettingsMessageListClass))
+#define E_IS_SETTINGS_MESSAGE_LIST(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_SETTINGS_MESSAGE_LIST))
+#define E_IS_SETTINGS_MESSAGE_LIST_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_SETTINGS_MESSAGE_LIST))
+#define E_SETTINGS_MESSAGE_LIST_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_SETTINGS_MESSAGE_LIST, ESettingsMessageListClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESettingsMessageList ESettingsMessageList;
+typedef struct _ESettingsMessageListClass ESettingsMessageListClass;
+typedef struct _ESettingsMessageListPrivate ESettingsMessageListPrivate;
+
+struct _ESettingsMessageList {
+       EExtension parent;
+       ESettingsMessageListPrivate *priv;
+};
+
+struct _ESettingsMessageListClass {
+       EExtensionClass parent_class;
+};
+
+GType          e_settings_message_list_get_type
+                                               (void) G_GNUC_CONST;
+void           e_settings_message_list_type_register
+                                               (GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_SETTINGS_MESSAGE_LIST_H */
+
diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c
index 7cde55a..f1c31ab 100644
--- a/modules/settings/evolution-module-settings.c
+++ b/modules/settings/evolution-module-settings.c
@@ -29,6 +29,7 @@
 #include "e-settings-mail-reader.h"
 #include "e-settings-meeting-store.h"
 #include "e-settings-meeting-time-selector.h"
+#include "e-settings-message-list.h"
 #include "e-settings-name-selector-entry.h"
 #include "e-settings-spell-entry.h"
 #include "e-settings-web-view.h"
@@ -55,6 +56,7 @@ e_module_load (GTypeModule *type_module)
        e_settings_mail_reader_type_register (type_module);
        e_settings_meeting_store_type_register (type_module);
        e_settings_meeting_time_selector_type_register (type_module);
+       e_settings_message_list_type_register (type_module);
        e_settings_name_selector_entry_type_register (type_module);
        e_settings_spell_entry_type_register (type_module);
        e_settings_web_view_type_register (type_module);


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