aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Brendan Taylor <whateley@gmail.com>2011-03-21 18:15:53 -0600
committerGravatar Brendan Taylor <whateley@gmail.com>2011-03-21 18:15:53 -0600
commit98498ef1cf2dc44bb7a413c3054463d710cbc9f9 (patch)
treea8845fe2877a9fb37893b97ca1bc40991869f6c9
parentbce29e41f55e74a65cdbd49a07811b2c9932bfc0 (diff)
parent2d0e769245445eba8ec6f63c7bd122040d35f5e4 (diff)
Merge branch 'fix-uzbl-tabbed' of git://github.com/christer/uzbl into christer-fix-uzbl-tabbed
-rwxr-xr-xexamples/data/scripts/uzbl-tabbed11
1 files changed, 7 insertions, 4 deletions
diff --git a/examples/data/scripts/uzbl-tabbed b/examples/data/scripts/uzbl-tabbed
index 4039096..2d7d7c9 100755
--- a/examples/data/scripts/uzbl-tabbed
+++ b/examples/data/scripts/uzbl-tabbed
@@ -501,7 +501,10 @@ class UzblInstance:
elif type == "LOAD_COMMIT":
self.uri = args[0]
elif type == "NEW_TAB":
- self.parent.new_tab(args[0])
+ if args:
+ self.parent.new_tab(args[0])
+ else:
+ self.parent.new_tab()
elif type == "NEW_BG_TAB":
self.parent.new_tab(args[0], '', 0)
elif type == "NEW_TAB_NEXT":
@@ -510,12 +513,12 @@ class UzblInstance:
self.parent.new_tab(args[0], '', 0, next=True)
elif type == "NEXT_TAB":
- if args[0]:
+ if args:
self.parent.next_tab(int(args[0]))
else:
self.parent.next_tab()
elif type == "PREV_TAB":
- if args[0]:
+ if args:
self.parent.prev_tab(int(args[0]))
else:
self.parent.prev_tab()
@@ -1024,7 +1027,7 @@ class UzblTabbed:
title = config['new_tab_title']
cmd = ['uzbl-browser', '-n', name, '-s', str(sid),
- '--connect-socket', self.socket_path, '--uri', uri]
+ '--connect-socket', self.socket_path, '--uri', str(uri)]
gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
uzbl = UzblInstance(self, tab, name, uri, title, switch)