From c496ee40d060b756ff40ce32dccf6f3bbb8b9132 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Mon, 30 Oct 2017 13:18:14 -0400 Subject: Revert "mq_web_view_*_scheme_methods: Make const" This reverts commit 0b796336a0c5ce1cf5185c2946c4ff22fa3da296. Conflicts: src/web-view-schemes/normal.c src/web-view-schemes/view-source.c --- (limited to 'src') diff --git a/src/web-view-schemes/normal.c b/src/web-view-schemes/normal.c index 0d96fea..b206397 100644 --- a/src/web-view-schemes/normal.c +++ b/src/web-view-schemes/normal.c @@ -777,7 +777,7 @@ save_file(MqWebView *web_view, MqWebViewScheme *scheme) gtk_widget_show_all(dialog); } -const MqWebViewSchemeMethods mq_web_view_normal_scheme_methods = { +MqWebViewSchemeMethods mq_web_view_normal_scheme_methods = { .match_uri = match_uri, .finalize = finalize, .rewrite_uri = rewrite_uri, diff --git a/src/web-view-schemes/schemes.h b/src/web-view-schemes/schemes.h index 1b52a9f..adef875 100644 --- a/src/web-view-schemes/schemes.h +++ b/src/web-view-schemes/schemes.h @@ -59,8 +59,8 @@ typedef struct { void (*save_file) (MqWebView *, MqWebViewScheme *); } MqWebViewSchemeMethods; -extern const MqWebViewSchemeMethods mq_web_view_normal_scheme_methods; -extern const MqWebViewSchemeMethods mq_web_view_view_source_scheme_methods; +extern MqWebViewSchemeMethods mq_web_view_normal_scheme_methods; +extern MqWebViewSchemeMethods mq_web_view_view_source_scheme_methods; G_END_DECLS diff --git a/src/web-view-schemes/view-source.c b/src/web-view-schemes/view-source.c index faea4d5..f5619d1 100644 --- a/src/web-view-schemes/view-source.c +++ b/src/web-view-schemes/view-source.c @@ -219,7 +219,7 @@ save_file(MqWebView *web_view, MqWebViewScheme *scheme) *scheme = *scheme; } -const MqWebViewSchemeMethods mq_web_view_view_source_scheme_methods = { +MqWebViewSchemeMethods mq_web_view_view_source_scheme_methods = { .match_uri = match_uri, .finalize = finalize, .rewrite_uri = rewrite_uri, diff --git a/src/web-view.c b/src/web-view.c index 03be1e9..eded264 100644 --- a/src/web-view.c +++ b/src/web-view.c @@ -34,16 +34,16 @@ #include "web-view-schemes/schemes.h" struct _MqWebView { - WebKitWebView parent_instance; - MqTabPage *tab_page; - MqWebViewScheme scheme; - const MqWebViewSchemeMethods *scheme_methods; - gchar *uri; - MqConfig *config; - WebKitHitTestResult *hit_test_result; - WebKitHitTestResult *mouse_target_hit_test_result; - GtkComboBox *save_type_combo_box; - GFile *save_file; + WebKitWebView parent_instance; + MqTabPage *tab_page; + MqWebViewScheme scheme; + MqWebViewSchemeMethods *scheme_methods; + gchar *uri; + MqConfig *config; + WebKitHitTestResult *hit_test_result; + WebKitHitTestResult *mouse_target_hit_test_result; + GtkComboBox *save_type_combo_box; + GFile *save_file; }; enum { -- cgit v0.9.1