dots
/
surf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge, download fixing.

This commit is contained in:
Enno Boland (tox) 2009-09-04 13:20:48 +02:00
parent 9ec6fbda90 96edaa8412
commit 77fc27ef56
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
surf.c
View File

@ -109,9 +109,6 @@ download(WebKitDownload *o, GParamSpec *pspec, Client *c) {
if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) { if(status == WEBKIT_DOWNLOAD_STATUS_STARTED || status == WEBKIT_DOWNLOAD_STATUS_CREATED) {
c->progress = (int)(webkit_download_get_progress(c->download)*100); c->progress = (int)(webkit_download_get_progress(c->download)*100);
} }
else {
stop(c);
}
updatetitle(c, NULL); updatetitle(c, NULL);
} }
@ -277,8 +274,6 @@ loadcommit(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
void void
loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) { loadstart(WebKitWebView *view, WebKitWebFrame *f, Client *c) {
if(c->download)
stop(c);
c->progress = 0; c->progress = 0;
updatetitle(c, NULL); updatetitle(c, NULL);
} }
@ -317,7 +312,7 @@ loadfile(Client *c, const gchar *f) {
void void
loaduri(Client *c, const gchar *uri) { loaduri(Client *c, const gchar *uri) {
gchar *u; gchar *u;
u = g_strrstr(uri, ":") ? g_strdup(uri) u = g_strrstr(uri, "://") ? g_strdup(uri)
: g_strdup_printf("http://%s", uri); : g_strdup_printf("http://%s", uri);
webkit_web_view_load_uri(c->view, u); webkit_web_view_load_uri(c->view, u);
c->progress = 0; c->progress = 0;
@ -409,8 +404,8 @@ newwindow(WebKitWebView *v, WebKitWebFrame *f, Client *c) {
void void
pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) { pasteurl(GtkClipboard *clipboard, const gchar *text, gpointer d) {
if(text!=NULL) if(text != NULL)
loaduri((Client *)d, text); loaduri((Client *) d, text);
} }
GdkFilterReturn GdkFilterReturn
@ -421,6 +416,7 @@ processx(GdkXEvent *e, GdkEvent *event, gpointer d) {
int idummy; int idummy;
unsigned long ldummy; unsigned long ldummy;
unsigned char *buf = NULL; unsigned char *buf = NULL;
if(((XEvent *)e)->type == PropertyNotify) { if(((XEvent *)e)->type == PropertyNotify) {
ev = &((XEvent *)e)->xproperty; ev = &((XEvent *)e)->xproperty;
if(ev->atom == urlprop && ev->state == PropertyNewValue) { if(ev->atom == urlprop && ev->state == PropertyNewValue) {