Skip to content

Commit 33a8e45

Browse files
committed
Enhancement-Factored out switcheroos for the different Wayland shell protocols
1 parent 54fe23c commit 33a8e45

File tree

2 files changed

+373
-192
lines changed

2 files changed

+373
-192
lines changed

code-style.diff

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
--- cog.c (before formatting)
2+
+++ cog.c (after formatting)
3+
@@ -37,7 +37,7 @@
4+
CogPlatform *platform;
5+
};
6+
union {
7+
- char *filter_path;
8+
+ char * filter_path;
9+
WebKitUserContentFilter *filter;
10+
};
11+
union {
12+
@@ -120,7 +120,7 @@
13+
return WEBPROCESS_FAIL_ERROR_PAGE;
14+
15+
for (unsigned i = 0; i < G_N_ELEMENTS (action_map); i++)
16+
- if (strcmp (action, action_map[i].action) == 0)
17+
+ if (strcmp(action, action_map[i].action) == 0)
18+
return action_map[i].action_id;
19+
20+
return WEBPROCESS_FAIL_UNKNOWN;
21+
@@ -384,8 +384,7 @@
22+
// If the platform plug-in failed, try the default WPE backend.
23+
if (!view_backend) {
24+
g_debug ("Instantiating default WPE backend as fall-back.");
25+
- view_backend = webkit_web_view_backend_new (wpe_view_backend_create (),
26+
- NULL, NULL);
27+
+ view_backend = webkit_web_view_backend_new(wpe_view_backend_create(), NULL, NULL);
28+
}
29+
30+
// At this point, either the platform plug-in or the default WPE backend
31+
--- core/cog-host-routes-handler.c (before formatting)
32+
+++ core/cog-host-routes-handler.c (after formatting)
33+
@@ -52,7 +52,7 @@
34+
GObject parent;
35+
36+
CogRequestHandler *fallback;
37+
- GHashTable *route; /* string -> CogRequestHandler */
38+
+ GHashTable * route; /* string -> CogRequestHandler */
39+
};
40+
41+
enum {
42+
@@ -86,10 +86,10 @@
43+
44+
#if COG_USE_SOUP2
45+
g_autoptr(SoupURI) uri = soup_uri_new(webkit_uri_scheme_request_get_uri(request));
46+
- const char *host = SOUP_URI_IS_VALID(uri) ? soup_uri_get_host(uri) : NULL;
47+
+ const char * host = SOUP_URI_IS_VALID(uri) ? soup_uri_get_host(uri) : NULL;
48+
#else
49+
g_autoptr(GUri) uri = g_uri_parse(webkit_uri_scheme_request_get_uri(request), G_URI_FLAGS_ENCODED, NULL);
50+
- const char *host = uri ? g_uri_get_host(uri) : NULL;
51+
+ const char * host = uri ? g_uri_get_host(uri) : NULL;
52+
#endif
53+
if (host) {
54+
CogRequestHandler *handler = g_hash_table_lookup(self->route, host);

0 commit comments

Comments
 (0)