nilix/surf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replacing ignore_once with ignorexprop

Browse source
This commit is contained in:
Enno Boland (tox) 2009-10-21 08:35:58 +02:00
parent 52a9c8ca52
commit 9557e7b769
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
surf.c
View file

@ -61,7 +61,7 @@ static SoupSession *session;
static Client *clients = NULL; static Client *clients = NULL;
static GdkNativeWindow embed = 0; static GdkNativeWindow embed = 0;
static gboolean showxid = FALSE; static gboolean showxid = FALSE;
static gboolean ignore_once = FALSE; static int ignorexprop = 0;
static char winid[64]; static char winid[64];
static char *progname; static char *progname;
static gboolean lockcookie = FALSE; static gboolean lockcookie = FALSE;
@ -233,6 +233,7 @@ destroyclient(Client *c) {
gboolean gboolean
decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) { decidewindow(WebKitWebView *view, WebKitWebFrame *f, WebKitNetworkRequest *r, WebKitWebNavigationAction *n, WebKitWebPolicyDecision *p, Client *c) {
Arg arg; Arg arg;
if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) { if(webkit_web_navigation_action_get_reason(n) == WEBKIT_WEB_NAVIGATION_REASON_LINK_CLICKED) {
webkit_web_policy_decision_ignore(p); webkit_web_policy_decision_ignore(p);
arg.v = (void *)webkit_network_request_get_uri(r); 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) { if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty; ev = &((XEvent *)e)->xproperty;
if(ignore_once) if(ignorexprop)
ignore_once = FALSE; ignorexprop--;
else if(ev->state == PropertyNewValue) { else if(ev->state == PropertyNewValue) {
if(ev->atom == uriprop) { if(ev->atom == uriprop) {
arg.v = getatom(c, uriprop); arg.v = getatom(c, uriprop);
@ -648,7 +649,7 @@ sigchld(int unused) {
void void
setatom(Client *c, Atom a, const char *v) { setatom(Client *c, Atom a, const char *v) {
XSync(dpy, False); XSync(dpy, False);
ignore_once = TRUE; ignorexprop++;
XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a, XChangeProperty(dpy, GDK_WINDOW_XID(GTK_WIDGET(c->win)->window), a,
XA_STRING, 8, PropModeReplace, (unsigned char *)v, XA_STRING, 8, PropModeReplace, (unsigned char *)v,
strlen(v) + 1); strlen(v) + 1);