summaryrefslogtreecommitdiff
path: root/src/normal.c
diff options
context:
space:
mode:
authorDaniel Carl <danielcarl@gmx.de>2014-06-06 02:08:38 +0200
committerDaniel Carl <danielcarl@gmx.de>2014-06-06 02:10:47 +0200
commit6ddf5b5224990d8568a011761f561589614af849 (patch)
treed2f652e1557446cb618c6c3a8206d4d611ea5e97 /src/normal.c
parent6302764e6bf33a226dbd36a70abfb941413352b1 (diff)
Remove obsolete GET_URI() macro.
Removed also the changed-uri signal observer. We get the new URI in the load status callback right before the event is triggered.
Diffstat (limited to 'src/normal.c')
-rw-r--r--src/normal.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/normal.c b/src/normal.c
index 9ffe4c8..8877987 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -364,7 +364,7 @@ static VbResult normal_descent(const NormalCmdInfo *info)
int count = info->count ? info->count : 1;
const char *uri, *p = NULL, *domain = NULL;
- uri = GET_URI();
+ uri = vb.state.uri;
/* get domain part */
if (!uri || !*uri
@@ -497,7 +497,10 @@ static VbResult normal_input_open(const NormalCmdInfo *info)
if (strchr("ot", info->key)) {
vb_set_input_text(info->key == 't' ? ":tabopen " : ":open ");
} else {
- vb_echo(VB_MSG_NORMAL, false, ":%s %s", info->key == 'T' ? "tabopen" : "open", GET_URI());
+ vb_echo(
+ VB_MSG_NORMAL, false,
+ ":%s %s", info->key == 'T' ? "tabopen" : "open", vb.state.uri
+ );
}
/* switch mode after setting the input text to not trigger the
* commands modes input change handler */