From 9cee475a1a6579e0816d5ad36eca9ba9a29f9353 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Oct 2012 11:31:26 -0400 Subject: EMailConfigWebView: Use G_DEFINE_DYNAMIC_TYPE. Follow the usual GObject conventions. --- modules/mail/e-mail-config-web-view.c | 126 ++++++++++++++++++---------------- modules/mail/e-mail-config-web-view.h | 38 +++++++++- modules/mail/evolution-module-mail.c | 2 +- 3 files changed, 103 insertions(+), 63 deletions(-) (limited to 'modules/mail') diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c index 2e9946d47f..aec9832cf2 100644 --- a/modules/mail/e-mail-config-web-view.c +++ b/modules/mail/e-mail-config-web-view.c @@ -25,25 +25,22 @@ #include "e-mail-config-web-view.h" -#include - #include #include -typedef struct _EMailConfigWebView EMailConfigWebView; -typedef struct _EMailConfigWebViewClass EMailConfigWebViewClass; +#define E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewPrivate)) -struct _EMailConfigWebView { - EExtension parent; +struct _EMailConfigWebViewPrivate { GtkCssProvider *css_provider; EShellSettings *shell_settings; }; -struct _EMailConfigWebViewClass { - EExtensionClass parent_class; -}; - -static gpointer parent_class; +G_DEFINE_DYNAMIC_TYPE ( + EMailConfigWebView, + e_mail_config_web_view, + E_TYPE_EXTENSION) /* replaces content of color string */ static void @@ -75,6 +72,7 @@ mail_config_web_view_load_style (EMailConfigWebView *extension) gboolean custom_fonts; gboolean mark_citations; EExtensible *extensible; + EShellSettings *shell_settings; GtkStyleContext *style_context; GError *error = NULL; @@ -82,23 +80,25 @@ mail_config_web_view_load_style (EMailConfigWebView *extension) * GtkHtml through style properties, unfortunately. This builds * a style sheet for the EWebView using values from GSettings. */ + shell_settings = extension->priv->shell_settings; + custom_fonts = e_shell_settings_get_boolean ( - extension->shell_settings, "mail-use-custom-fonts"); + shell_settings, "mail-use-custom-fonts"); monospace_font = e_shell_settings_get_string ( - extension->shell_settings, "mail-font-monospace"); + shell_settings, "mail-font-monospace"); variable_font = e_shell_settings_get_string ( - extension->shell_settings, "mail-font-variable"); + shell_settings, "mail-font-variable"); mark_citations = e_shell_settings_get_boolean ( - extension->shell_settings, "mail-mark-citations"); + shell_settings, "mail-mark-citations"); citation_color = e_shell_settings_get_string ( - extension->shell_settings, "mail-citation-color"); + shell_settings, "mail-citation-color"); spell_color = e_shell_settings_get_string ( - extension->shell_settings, "composer-spell-color"); + shell_settings, "composer-spell-color"); buffer = g_string_new ("EWebView {\n"); @@ -127,7 +127,8 @@ mail_config_web_view_load_style (EMailConfigWebView *extension) g_string_append (buffer, "}\n"); gtk_css_provider_load_from_data ( - extension->css_provider, buffer->str, buffer->len, &error); + extension->priv->css_provider, + buffer->str, buffer->len, &error); if (error != NULL) { g_warning ("%s", error->message); @@ -150,27 +151,31 @@ static void mail_config_web_view_realize (GtkWidget *widget, EMailConfigWebView *extension) { + EShellSettings *shell_settings; + + shell_settings = extension->priv->shell_settings; + g_object_bind_property ( - extension->shell_settings, + shell_settings, "composer-inline-spelling", widget, "inline-spelling", G_BINDING_SYNC_CREATE); g_object_bind_property ( - extension->shell_settings, + shell_settings, "composer-magic-links", widget, "magic-links", G_BINDING_SYNC_CREATE); g_object_bind_property ( - extension->shell_settings, + shell_settings, "composer-magic-smileys", widget, "magic-smileys", G_BINDING_SYNC_CREATE); gtk_style_context_add_provider ( gtk_widget_get_style_context (widget), - GTK_STYLE_PROVIDER (extension->css_provider), + GTK_STYLE_PROVIDER (extension->priv->css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); mail_config_web_view_load_style (extension); @@ -178,37 +183,37 @@ mail_config_web_view_realize (GtkWidget *widget, /* Reload the style sheet when certain settings change. */ g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::mail-use-custom-fonts", G_CALLBACK (mail_config_web_view_load_style), extension); g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::mail-font-monospace", G_CALLBACK (mail_config_web_view_load_style), extension); g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::mail-font-variable", G_CALLBACK (mail_config_web_view_load_style), extension); g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::mail-mark-citations", G_CALLBACK (mail_config_web_view_load_style), extension); g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::mail-citation-color", G_CALLBACK (mail_config_web_view_load_style), extension); g_signal_connect_swapped ( - extension->shell_settings, + shell_settings, "notify::composer-spell-color", G_CALLBACK (mail_config_web_view_load_style), extension); @@ -217,25 +222,25 @@ mail_config_web_view_realize (GtkWidget *widget, static void mail_config_web_view_dispose (GObject *object) { - EMailConfigWebView *extension; + EMailConfigWebViewPrivate *priv; - extension = (EMailConfigWebView *) object; + priv = E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE (object); - if (extension->css_provider != NULL) { - g_object_unref (extension->css_provider); - extension->css_provider = NULL; + if (priv->css_provider != NULL) { + g_object_unref (priv->css_provider); + priv->css_provider = NULL; } - if (extension->shell_settings != NULL) { + if (priv->shell_settings != NULL) { g_signal_handlers_disconnect_by_func ( - extension->shell_settings, + priv->shell_settings, mail_config_web_view_load_style, object); - g_object_unref (extension->shell_settings); - extension->shell_settings = NULL; + g_object_unref (priv->shell_settings); + priv->shell_settings = NULL; } /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (e_mail_config_web_view_parent_class)->dispose (object); } static void @@ -252,8 +257,8 @@ mail_config_web_view_constructed (GObject *object) extension = (EMailConfigWebView *) object; extensible = e_extension_get_extensible (E_EXTENSION (extension)); - extension->css_provider = gtk_css_provider_new (); - extension->shell_settings = g_object_ref (shell_settings); + extension->priv->css_provider = gtk_css_provider_new (); + extension->priv->shell_settings = g_object_ref (shell_settings); /* Wait to bind shell settings until the EWebView is realized * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI. @@ -264,16 +269,17 @@ mail_config_web_view_constructed (GObject *object) G_CALLBACK (mail_config_web_view_realize), extension); /* Chain up to parent's consturcted() method. */ - G_OBJECT_CLASS (parent_class)->constructed (object); + G_OBJECT_CLASS (e_mail_config_web_view_parent_class)-> + constructed (object); } static void -mail_config_web_view_class_init (EMailConfigWebViewClass *class) +e_mail_config_web_view_class_init (EMailConfigWebViewClass *class) { GObjectClass *object_class; EExtensionClass *extension_class; - parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EMailConfigWebViewPrivate)); object_class = G_OBJECT_CLASS (class); object_class->dispose = mail_config_web_view_dispose; @@ -283,23 +289,23 @@ mail_config_web_view_class_init (EMailConfigWebViewClass *class) extension_class->extensible_type = E_TYPE_WEB_VIEW; } +static void +e_mail_config_web_view_class_finalize (EMailConfigWebViewClass *class) +{ +} + +static void +e_mail_config_web_view_init (EMailConfigWebView *extension) +{ + extension->priv = E_MAIL_CONFIG_WEB_VIEW_GET_PRIVATE (extension); +} + void -e_mail_config_web_view_register_type (GTypeModule *type_module) +e_mail_config_web_view_type_register (GTypeModule *type_module) { - static const GTypeInfo type_info = { - sizeof (EMailConfigWebViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) mail_config_web_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EMailConfigWebView), - 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, - NULL /* value_table */ - }; - - g_type_module_register_type ( - type_module, E_TYPE_EXTENSION, - "EMailConfigWebView", &type_info, 0); + /* 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_mail_config_web_view_register_type (type_module); } + diff --git a/modules/mail/e-mail-config-web-view.h b/modules/mail/e-mail-config-web-view.h index c2a8758709..873121a49c 100644 --- a/modules/mail/e-mail-config-web-view.h +++ b/modules/mail/e-mail-config-web-view.h @@ -19,11 +19,45 @@ #ifndef E_MAIL_CONFIG_WEB_VIEW_H #define E_MAIL_CONFIG_WEB_VIEW_H -#include +#include + +/* Standard GObject macros */ +#define E_TYPE_MAIL_CONFIG_WEB_VIEW \ + (e_mail_config_web_view_get_type ()) +#define E_MAIL_CONFIG_WEB_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebView)) +#define E_MAIL_CONFIG_WEB_VIEW_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_CAST \ + ((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewClass)) +#define E_IS_MAIL_CONFIG_WEB_VIEW(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW)) +#define E_IS_MAIL_CONFIG_WEB_VIEW_CLASS(cls) \ + (G_TYPE_CHECK_CLASS_TYPE \ + ((cls), E_TYPE_MAIL_CONFIG_WEB_VIEW)) +#define E_MAIL_CONFIG_WEB_VIEW_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS \ + ((obj), E_TYPE_MAIL_CONFIG_WEB_VIEW, EMailConfigWebViewClass)) G_BEGIN_DECLS -void e_mail_config_web_view_register_type (GTypeModule *type_module); +typedef struct _EMailConfigWebView EMailConfigWebView; +typedef struct _EMailConfigWebViewClass EMailConfigWebViewClass; +typedef struct _EMailConfigWebViewPrivate EMailConfigWebViewPrivate; + +struct _EMailConfigWebView { + EExtension parent; + EMailConfigWebViewPrivate *priv; +}; + +struct _EMailConfigWebViewClass { + EExtensionClass parent_class; +}; + +GType e_mail_config_web_view_get_type (void) G_GNUC_CONST; +void e_mail_config_web_view_type_register + (GTypeModule *type_module); G_END_DECLS diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c index daeece98f0..91a2501b99 100644 --- a/modules/mail/evolution-module-mail.c +++ b/modules/mail/evolution-module-mail.c @@ -61,7 +61,7 @@ e_module_load (GTypeModule *type_module) e_mail_config_format_html_type_register (type_module); e_mail_config_reader_type_register (type_module); - e_mail_config_web_view_register_type (type_module); + e_mail_config_web_view_type_register (type_module); em_account_prefs_type_register (type_module); } -- cgit v1.2.3