[evolution/wip-webkit2] EWebView, EMailDisplay - Refactor the context initialization into own function
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip-webkit2] EWebView, EMailDisplay - Refactor the context initialization into own function
- Date: Tue, 16 Sep 2014 13:16:14 +0000 (UTC)
commit 5627618f80fa24709277746b125a149d7931afac
Author: Tomas Popela <tpopela redhat com>
Date: Tue Sep 16 15:13:39 2014 +0200
EWebView, EMailDisplay - Refactor the context initialization into own function
e-util/e-web-view.c | 17 ++++++++++++-----
mail/e-mail-display.c | 19 +++++++++++++------
2 files changed, 25 insertions(+), 11 deletions(-)
---
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index b5385f9..c196e8d 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -1737,14 +1737,10 @@ web_view_selectable_select_all (ESelectable *selectable)
}
static void
-e_web_view_class_init (EWebViewClass *class)
+web_view_initialize_web_context (void)
{
- GObjectClass *object_class;
- GtkWidgetClass *widget_class;
WebKitWebContext *web_context = webkit_web_context_get_default ();
- g_type_class_add_private (class, sizeof (EWebViewPrivate));
-
webkit_web_context_set_cache_model (
web_context, WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
@@ -1761,6 +1757,17 @@ e_web_view_class_init (EWebViewClass *class)
(WebKitURISchemeRequestCallback) web_view_gtk_stock_uri_scheme_appeared_cb,
NULL,
NULL);
+}
+
+static void
+e_web_view_class_init (EWebViewClass *class)
+{
+ GObjectClass *object_class;
+ GtkWidgetClass *widget_class;
+
+ g_type_class_add_private (class, sizeof (EWebViewPrivate));
+
+ web_view_initialize_web_context ();
object_class = G_OBJECT_CLASS (class);
object_class->constructor = web_view_constructor;
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 0dafb81..5350763 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -2098,15 +2098,10 @@ mail_display_suggest_filename (EWebView *web_view,
#endif
static void
-e_mail_display_class_init (EMailDisplayClass *class)
+mail_display_initialize_web_context (void)
{
- GObjectClass *object_class;
- EWebViewClass *web_view_class;
- GtkWidgetClass *widget_class;
WebKitWebContext *web_context = webkit_web_context_get_default ();
- g_type_class_add_private (class, sizeof (EMailDisplayPrivate));
-
webkit_web_context_register_uri_scheme (
web_context,
"evo-http",
@@ -2134,6 +2129,18 @@ e_mail_display_class_init (EMailDisplayClass *class)
(WebKitURISchemeRequestCallback) mail_display_cid_uri_scheme_appeared_cb,
NULL,
NULL);
+}
+
+static void
+e_mail_display_class_init (EMailDisplayClass *class)
+{
+ GObjectClass *object_class;
+ EWebViewClass *web_view_class;
+ GtkWidgetClass *widget_class;
+
+ g_type_class_add_private (class, sizeof (EMailDisplayPrivate));
+
+ mail_display_initialize_web_context ();
object_class = G_OBJECT_CLASS (class);
object_class->constructed = mail_display_constructed;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]