pinosaur
/
surf.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d44bfb2
)
Fixing the bug of surf loading undefined data in arg.
author
Christoph Lohmann
<20h@r-36.net>
Thu, 8 Nov 2012 21:05:40 +0000
(22:05 +0100)
committer
Christoph Lohmann
<20h@r-36.net>
Thu, 8 Nov 2012 21:05:40 +0000
(22:05 +0100)
surf.c
patch
|
blob
|
history
diff --git
a/surf.c
b/surf.c
index
07c689e
..
390eaf0
100644
(file)
--- a/
surf.c
+++ b/
surf.c
@@
-453,8
+453,7
@@
void
linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
if(l) {
c->linkhover = copystr(&c->linkhover, l);
linkhover(WebKitWebView *v, const char* t, const char* l, Client *c) {
if(l) {
c->linkhover = copystr(&c->linkhover, l);
- }
- else if(c->linkhover) {
+ } else if(c->linkhover) {
free(c->linkhover);
c->linkhover = NULL;
}
free(c->linkhover);
c->linkhover = NULL;
}
@@
-504,8
+503,7
@@
loaduri(Client *c, const Arg *arg) {
/* prevents endless loop */
if(c->uri && strcmp(u, c->uri) == 0) {
reload(c, &a);
/* prevents endless loop */
if(c->uri && strcmp(u, c->uri) == 0) {
reload(c, &a);
- }
- else {
+ } else {
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
c->title = copystr(&c->title, u);
webkit_web_view_load_uri(c->view, u);
c->progress = 0;
c->title = copystr(&c->title, u);
@@
-905,6
+903,7
@@
update(Client *c) {
gtk_widget_hide_all(c->indicator);
t = g_strdup(c->title);
}
gtk_widget_hide_all(c->indicator);
t = g_strdup(c->title);
}
+
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
}
gtk_window_set_title(GTK_WINDOW(c->win), t);
g_free(t);
}
@@
-944,6
+943,8
@@
int
main(int argc, char *argv[]) {
Arg arg;
main(int argc, char *argv[]) {
Arg arg;
+ memset(&arg, 0, sizeof(arg));
+
/* command line args */
ARGBEGIN {
case 'c':
/* command line args */
ARGBEGIN {
case 'c':
@@
-985,6
+986,7
@@
main(int argc, char *argv[]) {
newclient();
if(arg.v)
loaduri(clients, &arg);
newclient();
if(arg.v)
loaduri(clients, &arg);
+
gtk_main();
cleanup();
gtk_main();
cleanup();