diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2010-03-21 20:30:33 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2010-03-21 20:30:33 +0800 |
| commit | d8c7f8038259d1c2827766255b80d57cd94ffe5c (patch) | |
| tree | 1c54f219293fa17d66bf26e0121051381171695c /src | |
| parent | 0ae55776fff195faa7a85cfaa926fcf91fca37d9 (diff) | |
| parent | a70ea8f85c3f5ba2fc361da9ba426aa292283413 (diff) | |
Merge branch 'master' into experimental
Diffstat (limited to 'src')
| -rw-r--r-- | src/callbacks.c | 3 | ||||
| -rw-r--r-- | src/callbacks.h | 3 | ||||
| -rw-r--r-- | src/events.c | 7 | ||||
| -rw-r--r-- | src/events.h | 2 | ||||
| -rw-r--r-- | src/uzbl-core.c | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/src/callbacks.c b/src/callbacks.c index ae66ba8..d3545cc 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -311,7 +311,7 @@ cmd_view_source() { void cmd_set_zoom_type () { - if(uzbl.behave.zoom_type) + if(uzbl.behave.zoom_type) webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, TRUE); else webkit_web_view_set_full_content_zoom (uzbl.gui.web_view, FALSE); @@ -764,4 +764,3 @@ populate_popup_cb(WebKitWebView *v, GtkMenu *m, void *c) { } } } - diff --git a/src/callbacks.h b/src/callbacks.h index 6ed8986..278a31a 100644 --- a/src/callbacks.h +++ b/src/callbacks.h @@ -1,4 +1,4 @@ -/* +/* ** Callbacks ** (c) 2009 by Robert Manea et al. */ @@ -207,4 +207,3 @@ button_release_cb (GtkWidget* window, GdkEventButton* event); gboolean focus_cb(GtkWidget* window, GdkEventFocus* event, void *ud); - diff --git a/src/events.c b/src/events.c index 1028c30..c209550 100644 --- a/src/events.c +++ b/src/events.c @@ -1,5 +1,5 @@ -/* - ** Uzbl event routines +/* + ** Uzbl event routines ** (c) 2009 by Robert Manea */ @@ -84,7 +84,7 @@ send_event_socket(GString *msg) { tmp->str, tmp->len, &len, &error); - if (ret == G_IO_STATUS_ERROR) + if (ret == G_IO_STATUS_ERROR) g_warning ("Error sending event to socket: %s", error->message); else g_io_channel_flush(gio, &error); @@ -205,4 +205,3 @@ key_to_event(guint keyval, gint mode) { } } - diff --git a/src/events.h b/src/events.h index fe3ff3b..1bd8804 100644 --- a/src/events.h +++ b/src/events.h @@ -1,4 +1,4 @@ -/* +/* ** Uzbl event routines ** (c) 2009 by Robert Manea */ diff --git a/src/uzbl-core.c b/src/uzbl-core.c index 5ee8243..697bd20 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -1011,7 +1011,7 @@ act_dump_config_as_events() { void load_uri (WebKitWebView *web_view, GArray *argv, GString *result) { (void) web_view; (void) result; - load_uri_imp (argv_idx (argv, 0)); + set_var_value("uri", argv_idx(argv, 0)); } /* Javascript*/ |