head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2011.04.14.19.22.58;	author dhn;	state dead;
branches;
next	1.2;

1.2
date	2011.03.24.15.56.53;	author dhn;	state Exp;
branches;
next	1.1;

1.1
date	2011.03.17.14.11.47;	author miwi;	state Exp;
branches;
next	;


desc
@@


1.3
log
@- Update to 2011.04.12

PR:		ports/156379
Submitted by:	Klaus Aehlig <aehlig@@linta.de> (maintainer)
@
text
@--- examples/data/scripts/uzbl-tabbed.orig	2011-03-17 13:06:03.000000000 +0000
+++ examples/data/scripts/uzbl-tabbed	2011-03-23 10:33:53.000000000 +0000
@@@@ -507,12 +507,12 @@@@
                 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()
@@@@ -1016,7 +1016,7 @@@@
             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)
@


1.2
log
@- Update to 2011.03.17

PR:		ports/155884
Submitted by:	Klaus Aehlig <aehlig@@linta.de> (maintainer)
@
text
@@


1.1
log
@- Update to 2011.03.14

PR:		ports/154859
Submitted by:	"Klaus T. Aehlig" <aehlig@@linta.de> (maintainer)
@
text
@d1 4
a4 33
--- examples/data/scripts/uzbl-tabbed.orig	2011-03-14 04:36:33.000000000 +0000
+++ examples/data/scripts/uzbl-tabbed	2011-03-15 16:45:32.000000000 +0000
@@@@ -449,8 +449,12 @@@@
 
         type, _, args = cmd.split(" ", 2)
         if type == "EVENT":
-            type, args = args.split(" ", 1)
+            type, args = (args + " ").split(" ", 1)
             if type == "TITLE_CHANGED":
+                try:
+                    _,args,_ = args.split("'",2)
+                except:
+                    pass
                 self.title = args.strip()
                 self.title_changed(False)
             elif type == "VARIABLE_SET":
@@@@ -459,7 +463,13 @@@@
                 try:
                     val = int(val)
                 except:
-                    pass
+                    try:
+                        val = float(val)
+                    except:
+                        try:
+                            _, val, _ = val.split("'",2)
+                        except:
+                            pass
 
                 if var in UZBL_TABBED_VARS:
                     if config[var] != val:
@@@@ -497,12 +507,12 @@@@
                 self.parent.new_tab(args, '', 0, next=True)
d7 3
a9 3
-                if args:
+                if args.strip():
                     self.parent.next_tab(int(args))
d13 3
a15 3
-                if args:
+                if args.strip():
                     self.parent.prev_tab(int(args))
d18 9
@

