summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPatrick McDermott <pj@pehjota.net>2017-10-30 13:18:14 (EDT)
committer Patrick McDermott <pj@pehjota.net>2017-10-30 13:18:14 (EDT)
commitc496ee40d060b756ff40ce32dccf6f3bbb8b9132 (patch)
tree268565a8be2953cd61984e3d581805beb6543863 /src
parentbab53ac616646ef9cda01377c4516a473c5f6582 (diff)
downloadmarquee-c496ee40d060b756ff40ce32dccf6f3bbb8b9132.zip
marquee-c496ee40d060b756ff40ce32dccf6f3bbb8b9132.tar.gz
marquee-c496ee40d060b756ff40ce32dccf6f3bbb8b9132.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/web-view-schemes/normal.c2
-rw-r--r--src/web-view-schemes/schemes.h4
-rw-r--r--src/web-view-schemes/view-source.c2
-rw-r--r--src/web-view.c20
4 files changed, 14 insertions, 14 deletions
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 {