pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
52a9c8c
)
replacing ignore_once with ignorexprop
author
Enno Boland (tox)
<tox@s01.de>
Wed, 21 Oct 2009 06:35:58 +0000
(08:35 +0200)
committer
Enno Boland (tox)
<tox@s01.de>
Wed, 21 Oct 2009 06:35:58 +0000
(08:35 +0200)
surf.c
patch
|
blob
|
history
diff --git
a/surf.c
b/surf.c
index
53cbff2
..
50c3be0
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-61,7
+61,7
@@
static SoupSession *session;
static Client *clients = NULL;
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
static Client *clients = NULL;
static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE;
-static
gboolean ignore_once = FALSE
;
+static
int ignorexprop = 0
;
static char winid[64];
static char *progname;
static gboolean lockcookie = FALSE;
static char winid[64];
static char *progname;
static gboolean lockcookie = FALSE;
@@
-233,6
+233,7
@@
destroyclient(Client *c) {
gboolean
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
Arg arg;
gboolean
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
Arg arg;
+
if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
webkit_web_policy_decision_ignore(p);
arg.v = (void *)webkit_network_request_get_uri(r);
if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
webkit_web_policy_decision_ignore(p);
arg.v = (void *)webkit_network_request_get_uri(r);
@@
-558,8
+559,8
@@
processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty;
- if(ignore
_once
)
- ignore
_once = FALSE
;
+ if(ignore
xprop
)
+ ignore
xprop--
;
else if(ev->state == PropertyNewValue) {
if(ev->atom == uriprop) {
arg.v = getatom(c, uriprop);
else if(ev->state == PropertyNewValue) {
if(ev->atom == uriprop) {
arg.v = getatom(c, uriprop);
@@
-648,7
+649,7
@@
sigchld(int unused) {
void
setatom(Client *c, Atom a, const char *v) {
XSync(dpy, False);
void
setatom(Client *c, Atom a, const char *v) {
XSync(dpy, False);
- ignore
_once = TRUE
;
+ ignore
xprop++
;
XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
XA_STRING, 8, PropModeReplace, (unsigned char *)v,
strlen(v) + 1);
XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
XA_STRING, 8, PropModeReplace, (unsigned char *)v,
strlen(v) + 1);