diff options
author | Tomas Popela <tpopela@redhat.com> | 2014-09-16 15:42:15 +0200 |
---|---|---|
committer | Tomas Popela <tpopela@redhat.com> | 2014-09-16 15:42:15 +0200 |
commit | 191c71a8452f98fd5923bef9fe81c94875129874 (patch) | |
tree | 21e883fe7f4de80655e2538d4fedfa1890645cca | |
parent | 948de02c11a68ad0e07d4d4c91ebb741a9b52800 (diff) | |
download | evolution-wip-webkit2.tar.gz |
Remove unneeded code after the WebKit context initialization was moved into *_class_init functionswip-webkit2
-rw-r--r-- | e-util/e-web-view.c | 11 | ||||
-rw-r--r-- | e-util/e-web-view.h | 3 | ||||
-rw-r--r-- | mail/e-mail-display.c | 34 |
3 files changed, 0 insertions, 48 deletions
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c index 9ff39c2ce5..843378724f 100644 --- a/e-util/e-web-view.c +++ b/e-util/e-web-view.c @@ -110,7 +110,6 @@ enum { STOP_LOADING, UPDATE_ACTIONS, PROCESS_MAILTO, - REGISTER_URI_HANDLERS, LAST_SIGNAL }; @@ -1960,16 +1959,6 @@ e_web_view_class_init (EWebViewClass *class) NULL, NULL, e_marshal_BOOLEAN__STRING, G_TYPE_BOOLEAN, 1, G_TYPE_STRING); - - signals[REGISTER_URI_HANDLERS] = g_signal_new ( - "register-uri-handlers", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EWebViewClass, register_uri_handlers), - NULL, NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, - WEBKIT_TYPE_WEB_CONTEXT); } static void diff --git a/e-util/e-web-view.h b/e-util/e-web-view.h index fa9df40565..53977ff214 100644 --- a/e-util/e-web-view.h +++ b/e-util/e-web-view.h @@ -109,9 +109,6 @@ struct _EWebViewClass { void (*update_actions) (EWebView *web_view); gboolean (*process_mailto) (EWebView *web_view, const gchar *mailto_uri); - void (*register_uri_handlers) - (EWebView *web_view, - WebKitWebContext *context); }; GType e_web_view_get_type (void) G_GNUC_CONST; diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 5350763d9b..cfcb97801a 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1877,39 +1877,6 @@ mail_display_mail_uri_scheme_appeared_cb (WebKitURISchemeRequest *request) } static void -mail_display_register_uri_handlers (EWebView *web_view, - WebKitWebContext *web_context) -{ - webkit_web_context_register_uri_scheme ( - web_context, - "evo-http", - (WebKitURISchemeRequestCallback) mail_display_http_uri_scheme_appeared_cb, - NULL, - NULL); - - webkit_web_context_register_uri_scheme ( - web_context, - "evo-https", - (WebKitURISchemeRequestCallback) mail_display_http_uri_scheme_appeared_cb, - NULL, - NULL); - - webkit_web_context_register_uri_scheme ( - web_context, - "mail", - (WebKitURISchemeRequestCallback) mail_display_mail_uri_scheme_appeared_cb, - NULL, - NULL); - - webkit_web_context_register_uri_scheme ( - web_context, - "cid", - (WebKitURISchemeRequestCallback) mail_display_cid_uri_scheme_appeared_cb, - NULL, - NULL); -} - -static void mail_display_constructed (GObject *object) { e_extensible_load_extensions (E_EXTENSIBLE (object)); @@ -2158,7 +2125,6 @@ e_mail_display_class_init (EMailDisplayClass *class) web_view_class->redirect_uri = mail_display_redirect_uri; web_view_class->suggest_filename = mail_display_suggest_filename; #endif - web_view_class->register_uri_handlers = mail_display_register_uri_handlers; web_view_class->set_fonts = mail_display_set_fonts; g_object_class_install_property ( |