From: Enno Boland (tox) <tox@s01.de>
Date: Fri, 4 Sep 2009 11:20:48 +0000 (+0200)
Subject: merge, download fixing.
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=77fc27ef561c6777c2c05c394bf13183c1d74143;p=surf.git

merge, download fixing.
---

77fc27ef561c6777c2c05c394bf13183c1d74143
diff --cc surf.c
index ec846ad,0d9988f..476fd56
--- a/surf.c
+++ b/surf.c
@@@ -317,7 -312,7 +312,7 @@@ loadfile(Client *c, const gchar *f) 
  void
  loaduri(Client *c, const gchar *uri) {
  	gchar *u;
--	u = g_strrstr(uri, ":") ? g_strdup(uri)
++	u = g_strrstr(uri, "://") ? g_strdup(uri)
  		: g_strdup_printf("http://%s", uri);
  	webkit_web_view_load_uri(c->view, u);
  	c->progress = 0;
@@@ -421,6 -416,6 +416,7 @@@ processx(GdkXEvent *e, GdkEvent *event
  	int idummy;
  	unsigned long ldummy;
  	unsigned char *buf = NULL;
++
  	if(((XEvent *)e)->type == PropertyNotify) {
  		ev = &((XEvent *)e)->xproperty;
  		if(ev->atom == urlprop && ev->state == PropertyNewValue) {