GNOME.org
 

[evolution] Add ESettingsSpellEntry.

commit 98f4b4a74bd7492f28e1fba889ed10e9c82a7cd5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Mar 11 13:18:57 2013 -0400

    Add ESettingsSpellEntry.
    
    Automatically configures the "checking-enabled" property on all
    ESpellEntry instances.

 calendar/gui/dialogs/event-page.c            |   11 ---
 calendar/gui/dialogs/memo-page.c             |   15 ----
 calendar/gui/dialogs/task-page.c             |   15 ----
 composer/e-composer-private.c                |    9 ---
 modules/settings/Makefile.am                 |    2 +
 modules/settings/e-settings-spell-entry.c    |   94 ++++++++++++++++++++++++++
 modules/settings/e-settings-spell-entry.h    |   65 ++++++++++++++++++
 modules/settings/evolution-module-settings.c |    2 +
 8 files changed, 163 insertions(+), 50 deletions(-)
---
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 6225eb7..f1f7c05 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2653,17 +2653,6 @@ get_widgets (EventPage *epage)
        gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion);
        g_object_unref (completion);
 
-       if (priv->summary) {
-               EShellSettings *shell_settings;
-
-               shell_settings = e_shell_get_shell_settings (shell);
-
-               g_object_bind_property (
-                       shell_settings, "composer-inline-spelling",
-                       priv->summary, "checking-enabled",
-                       G_BINDING_SYNC_CREATE);
-       }
-
        return (priv->summary
                && priv->location
                && priv->start_time
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 7c33ec6..c202444 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -906,21 +906,6 @@ get_widgets (MemoPage *mpage)
        gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion);
        g_object_unref (completion);
 
-       if (priv->summary_entry) {
-               EShell *shell;
-               EShellSettings *shell_settings;
-               CompEditor *editor;
-
-               editor = comp_editor_page_get_editor (page);
-               shell = comp_editor_get_shell (editor);
-               shell_settings = e_shell_get_shell_settings (shell);
-
-               g_object_bind_property (
-                       shell_settings, "composer-inline-spelling",
-                       priv->summary_entry, "checking-enabled",
-                       G_BINDING_SYNC_CREATE);
-       }
-
        return (priv->memo_content
                && priv->categories_btn
                && priv->categories
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 8cd35bd..1eb5f00 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1539,21 +1539,6 @@ get_widgets (TaskPage *tpage)
        gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion);
        g_object_unref (completion);
 
-       if (priv->summary) {
-               EShell *shell;
-               EShellSettings *shell_settings;
-               CompEditor *editor;
-
-               editor = comp_editor_page_get_editor (page);
-               shell = comp_editor_get_shell (editor);
-               shell_settings = e_shell_get_shell_settings (shell);
-
-               g_object_bind_property (
-                       shell_settings, "composer-inline-spelling",
-                       priv->summary, "checking-enabled",
-                       G_BINDING_SYNC_CREATE);
-       }
-
        return (priv->summary
                && priv->summary_label
                && priv->due_date
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 7ada4fd..09b9bf1 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -155,7 +155,6 @@ e_composer_private_constructed (EMsgComposer *composer)
        gchar *filename, *gallery_path;
        gint ii;
        GError *error = NULL;
-       EComposerHeader *header;
 
        editor = GTKHTML_EDITOR (composer);
        ui_manager = gtkhtml_editor_get_ui_manager (editor);
@@ -278,14 +277,6 @@ e_composer_private_constructed (EMsgComposer *composer)
        priv->header_table = g_object_ref (widget);
        gtk_widget_show (widget);
 
-       header = e_composer_header_table_get_header (
-               E_COMPOSER_HEADER_TABLE (widget),
-               E_COMPOSER_HEADER_SUBJECT);
-       g_object_bind_property (
-               shell_settings, "composer-inline-spelling",
-               header->input_widget, "checking-enabled",
-               G_BINDING_SYNC_CREATE);
-
        g_signal_connect (
                G_OBJECT (composer), "spell-languages-changed",
                G_CALLBACK (composer_spell_languages_changed), NULL);
diff --git a/modules/settings/Makefile.am b/modules/settings/Makefile.am
index 42a7115..9ecf1c1 100644
--- a/modules/settings/Makefile.am
+++ b/modules/settings/Makefile.am
@@ -37,6 +37,8 @@ module_settings_la_SOURCES = \
        e-settings-name-selector-entry.h \
        e-settings-photo-cache.c \
        e-settings-photo-cache.h \
+       e-settings-spell-entry.c \
+       e-settings-spell-entry.h \
        e-settings-web-view.c \
        e-settings-web-view.h \
        e-settings-web-view-gtkhtml.c \
diff --git a/modules/settings/e-settings-spell-entry.c b/modules/settings/e-settings-spell-entry.c
new file mode 100644
index 0000000..e1bf5c2
--- /dev/null
+++ b/modules/settings/e-settings-spell-entry.c
@@ -0,0 +1,94 @@
+/*
+ * e-settings-spell-entry.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-spell-entry.h"
+
+#include <e-util/e-util.h>
+
+#define E_SETTINGS_SPELL_ENTRY_GET_PRIVATE(obj) \
+       (G_TYPE_INSTANCE_GET_PRIVATE \
+       ((obj), E_TYPE_SETTINGS_SPELL_ENTRY, ESettingsSpellEntryPrivate))
+
+struct _ESettingsSpellEntryPrivate {
+       gint placeholder;
+};
+
+G_DEFINE_DYNAMIC_TYPE (
+       ESettingsSpellEntry,
+       e_settings_spell_entry,
+       E_TYPE_EXTENSION)
+
+static void
+settings_spell_entry_constructed (GObject *object)
+{
+       EExtension *extension;
+       EExtensible *extensible;
+       GSettings *settings;
+
+       extension = E_EXTENSION (object);
+       extensible = e_extension_get_extensible (extension);
+
+       settings = g_settings_new ("org.gnome.evolution.mail");
+
+       g_settings_bind (
+               settings, "composer-inline-spelling",
+               extensible, "checking-enabled",
+               G_SETTINGS_BIND_GET);
+
+       g_object_unref (settings);
+
+       /* Chain up to parent's constructed() method. */
+       G_OBJECT_CLASS (e_settings_spell_entry_parent_class)->
+               constructed (object);
+}
+
+static void
+e_settings_spell_entry_class_init (ESettingsSpellEntryClass *class)
+{
+       GObjectClass *object_class;
+       EExtensionClass *extension_class;
+
+       g_type_class_add_private (class, sizeof (ESettingsSpellEntryPrivate));
+
+       object_class = G_OBJECT_CLASS (class);
+       object_class->constructed = settings_spell_entry_constructed;
+
+       extension_class = E_EXTENSION_CLASS (class);
+       extension_class->extensible_type = E_TYPE_SPELL_ENTRY;
+}
+
+static void
+e_settings_spell_entry_class_finalize (ESettingsSpellEntryClass *class)
+{
+}
+
+static void
+e_settings_spell_entry_init (ESettingsSpellEntry *extension)
+{
+       extension->priv = E_SETTINGS_SPELL_ENTRY_GET_PRIVATE (extension);
+}
+
+void
+e_settings_spell_entry_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_spell_entry_register_type (type_module);
+}
+
diff --git a/modules/settings/e-settings-spell-entry.h b/modules/settings/e-settings-spell-entry.h
new file mode 100644
index 0000000..46aa462
--- /dev/null
+++ b/modules/settings/e-settings-spell-entry.h
@@ -0,0 +1,65 @@
+/*
+ * e-settings-spell-entry.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_SPELL_ENTRY_H
+#define E_SETTINGS_SPELL_ENTRY_H
+
+#include <e-util/e-util.h>
+
+/* Standard GObject macros */
+#define E_TYPE_SETTINGS_SPELL_ENTRY \
+       (e_settings_spell_entry_get_type ())
+#define E_SETTINGS_SPELL_ENTRY(obj) \
+       (G_TYPE_CHECK_INSTANCE_CAST \
+       ((obj), E_TYPE_SETTINGS_SPELL_ENTRY, ESettingsSpellEntry))
+#define E_SETTINGS_SPELL_ENTRY_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_CAST \
+       ((cls), E_TYPE_SETTINGS_SPELL_ENTRY, ESettingsSpellEntryClass))
+#define E_IS_SETTINGS_SPELL_ENTRY(obj) \
+       (G_TYPE_CHECK_INSTANCE_TYPE \
+       ((obj), E_TYPE_SETTINGS_SPELL_ENTRY))
+#define E_IS_SETTINGS_SPELL_ENTRY_CLASS(cls) \
+       (G_TYPE_CHECK_CLASS_TYPE \
+       ((cls), E_TYPE_SETTINGS_SPELL_ENTRY))
+#define E_SETTINGS_SPELL_ENTRY_GET_CLASS(obj) \
+       (G_TYPE_INSTANCE_GET_CLASS \
+       ((obj), E_TYPE_SETTINGS_SPELL_ENTRY, ESettingsSpellEntryClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ESettingsSpellEntry ESettingsSpellEntry;
+typedef struct _ESettingsSpellEntryClass ESettingsSpellEntryClass;
+typedef struct _ESettingsSpellEntryPrivate ESettingsSpellEntryPrivate;
+
+struct _ESettingsSpellEntry {
+       EExtension parent;
+       ESettingsSpellEntryPrivate *priv;
+};
+
+struct _ESettingsSpellEntryClass {
+       EExtensionClass parent_class;
+};
+
+GType          e_settings_spell_entry_get_type (void) G_GNUC_CONST;
+void           e_settings_spell_entry_type_register
+                                               (GTypeModule *type_module);
+
+G_END_DECLS
+
+#endif /* E_SETTINGS_SPELL_ENTRY_H */
+
diff --git a/modules/settings/evolution-module-settings.c b/modules/settings/evolution-module-settings.c
index 34fd599..a67d192 100644
--- a/modules/settings/evolution-module-settings.c
+++ b/modules/settings/evolution-module-settings.c
@@ -28,6 +28,7 @@
 #include "e-settings-meeting-time-selector.h"
 #include "e-settings-name-selector-entry.h"
 #include "e-settings-photo-cache.h"
+#include "e-settings-spell-entry.h"
 #include "e-settings-web-view.h"
 #include "e-settings-web-view-gtkhtml.h"
 #include "e-settings-weekday-chooser.h"
@@ -51,6 +52,7 @@ e_module_load (GTypeModule *type_module)
        e_settings_meeting_time_selector_type_register (type_module);
        e_settings_name_selector_entry_type_register (type_module);
        e_settings_photo_cache_type_register (type_module);
+       e_settings_spell_entry_type_register (type_module);
        e_settings_web_view_type_register (type_module);
        e_settings_web_view_gtkhtml_type_register (type_module);
        e_settings_weekday_chooser_type_register (type_module);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]