summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/dwb-js.725
-rw-r--r--api/jsapi.7.txt10
-rw-r--r--api/jsapi.txt19
-rw-r--r--src/scripts.c24
-rw-r--r--src/view.c7
5 files changed, 5 insertions, 80 deletions
diff --git a/api/dwb-js.7 b/api/dwb-js.7
index 1c3e07ac..d1fbb313 100644
--- a/api/dwb-js.7
+++ b/api/dwb-js.7
@@ -2,12 +2,12 @@
.\" Title: dwb-js
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\" Date: 12/05/2012
+.\" Date: 12/06/2012
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
-.TH "DWB\-JS" "7" "12/05/2012" "\ \&" "\ \&"
+.TH "DWB\-JS" "7" "12/06/2012" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -701,27 +701,6 @@ A string with the file content
.nr an-break-flag 1
.br
.ps +1
-\fBString io.statusBar(Object text)\fR
-.RS 4
-.sp
-Sets the statusbar text\&. The statusbar consists of two labels, a \fImiddle\fR label and a \fIright\fR label, on both labels pango markup can be used
-.PP
-\fItext\&.middle\fR
-.RS 4
-Text for the middle label
-.RE
-.PP
-\fItext\&.right\fR
-.RS 4
-Text for the right label
-.RE
-.RE
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
\fBBoolean io.write(String path, String mode, String text)\fR
.RS 4
.sp
diff --git a/api/jsapi.7.txt b/api/jsapi.7.txt
index 7c4e132f..324b073d 100644
--- a/api/jsapi.7.txt
+++ b/api/jsapi.7.txt
@@ -323,16 +323,6 @@ _path_;; Path to a file that should be read
_returns_;; A string with the file content
****
-==== String io.statusBar(Object text)
-****
-
-Sets the statusbar text. The statusbar consists of two labels, a 'middle' label and
-a 'right' label, on both labels pango markup can be used
-
-_text.middle_;; Text for the middle label
-_text.right_;; Text for the right label
-****
-
==== Boolean io.write(String path, String mode, String text)
****
diff --git a/api/jsapi.txt b/api/jsapi.txt
index 0e8eda9d..9e1ca53f 100644
--- a/api/jsapi.txt
+++ b/api/jsapi.txt
@@ -532,25 +532,6 @@ _returns_;; A string with the file content
****
****
-[[statusBar]]
-[float]
-==== *statusBar()* ====
-
-[source,javascript]
-----
-void io.statusBar(Object text)
-----
-
-Sets the statusbar text. The statusbar consists of two labels, a 'middle' label and
-a 'right' label, on both labels pango markup can be used
-
- ::
-
-_text.middle_;; Text for the middle label
-_text.right_;; Text for the right label
-****
-
-****
[[write]]
[float]
==== *write()* ====
diff --git a/src/scripts.c b/src/scripts.c
index ec1a6ede..d491725b 100644
--- a/src/scripts.c
+++ b/src/scripts.c
@@ -1709,29 +1709,6 @@ io_error(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t
}
return UNDEFINED;
}/*}}}*/
-static JSValueRef
-io_status_bar(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exc)
-{
- if (argc < 1)
- return UNDEFINED;
-
- JSObjectRef o = JSValueToObject(ctx, argv[0], exc);
- if (o == NULL)
- return UNDEFINED;
-
- char *middle = js_get_string_property(ctx, o, "middle");
- char *right = js_get_string_property(ctx, o, "right");
-
- if (middle != NULL)
- gtk_label_set_markup(GTK_LABEL(dwb.gui.urilabel), middle);
-
- if (right != NULL)
- gtk_label_set_markup(GTK_LABEL(dwb.gui.rstatus), right);
-
- g_free(middle);
- g_free(right);
- return UNDEFINED;
-}
static JSValueRef
io_dir_names(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argc, const JSValueRef argv[], JSValueRef* exc)
@@ -2515,7 +2492,6 @@ create_global_object()
{ "dirNames", io_dir_names, kJSDefaultAttributes },
{ "notify", io_notify, kJSDefaultAttributes },
{ "error", io_error, kJSDefaultAttributes },
- { "statusBar", io_status_bar, kJSDefaultAttributes },
{ 0, 0, 0 },
};
class = create_class("io", io_functions, NULL);
diff --git a/src/view.c b/src/view.c
index 856d10f6..f4194d0e 100644
--- a/src/view.c
+++ b/src/view.c
@@ -423,6 +423,7 @@ view_hovering_over_link_cb(WebKitWebView *web, char *title, char *uri, GList *gl
}
}/*}}}*/
+
/* view_mime_type_policy_cb {{{*/
static gboolean
view_mime_type_policy_cb(WebKitWebView *web, WebKitWebFrame *frame, WebKitNetworkRequest *request, char *mimetype, WebKitWebPolicyDecision *policy, GList *gl)
@@ -453,8 +454,6 @@ view_mime_type_policy_cb(WebKitWebView *web, WebKitWebFrame *frame, WebKitNetwor
return false;
}/*}}}*/
-
-
/* view_navigation_policy_cb {{{*/
static gboolean
view_navigation_policy_cb(WebKitWebView *web, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *action,
@@ -990,9 +989,9 @@ view_init_signals(GList *gl)
v->status->signals[SIG_LOAD_STATUS] = g_signal_connect(v->web, "notify::load-status", G_CALLBACK(view_load_status_cb), gl);
v->status->signals[SIG_LOAD_ERROR] = g_signal_connect(v->web, "load-error", G_CALLBACK(view_load_error_cb), gl);
- v->status->signals[SIG_LOAD_STATUS_AFTER] = g_signal_connect_after(v->web, "notify::load-status", G_CALLBACK(view_load_status_after_cb), gl);
+ v->status->signals[SIG_LOAD_STATUS_AFTER] = g_signal_connect(v->web, "notify::load-status", G_CALLBACK(view_load_status_after_cb), gl);
v->status->signals[SIG_POPULATE_POPUP] = g_signal_connect(v->web, "populate-popup", G_CALLBACK(view_populate_popup_cb), gl);
- v->status->signals[SIG_PROGRESS] = g_signal_connect(v->web, "notify::progress", G_CALLBACK(view_progress_cb), gl);
+ v->status->signals[SIG_PROGRESS] = g_signal_connect(v->web, "notify::progress", G_CALLBACK(view_progress_cb), gl);
v->status->signals[SIG_TITLE] = g_signal_connect(v->web, "notify::title", G_CALLBACK(view_title_cb), gl);
v->status->signals[SIG_URI] = g_signal_connect(v->web, "notify::uri", G_CALLBACK(view_uri_cb), gl);
v->status->signals[SIG_SCROLL] = g_signal_connect(v->web, "scroll-event", G_CALLBACK(view_scroll_cb), gl);