merge in uranthers zoomlevel thingie. doesnt work yet because of strof not recognized...

diff --cc AUTHORS
index 4ee7f0c,24597f1..8a55a32
--- 1/AUTHORS
--- 2/AUTHORS
+++ b/AUTHORS
@@@ -18,7 -18,6 +18,8 @@@ Contributors
      Sylvester Johansson (scj) - form filler script & different take on link follower 
      (mxf) - uzblcat
      Mark Nevill - misc patches
 +    Uli Schlachter (psychon) - basic mime_policy_cb & Makefile patch
++    (uranther) - zoom level
  
  Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
  Which is  copyrighted:

diff --cc examples/configs/sampleconfig
Simple merge

diff --cc examples/configs/sampleconfig-dev
index c1c2e1d,939fa7e..c8eddd0
--- 1/examples/configs/sampleconfig-dev
--- 2/examples/configs/sampleconfig-dev
+++ b/examples/configs/sampleconfig-dev
@@@ -104,6 -104,6 +104,7 @@@ bind    r         = reloa
  bind    R         = reload_ign_cache
  bind    +         = zoom_in
  bind    -         = zoom_out
++bind    0         = sh "echo set zoom_level = 1.0 > $4"
  bind    t         = toggle_status
  # Hilight matches. Notice the * after the slash - it makes the command incremental, i.e. gets called
  # on every character you type.  You can do `bind /_ = search %s' if you want it less interactive.

diff --cc uzbl.c
index b444c97,8e6b51b..ba5a98a
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -36,13 -36,17 +36,15 @@@
  #include <gtk/gtk.h>
  #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
 -
 -#include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/stat.h>
 +#include <sys/types.h>
 +#include <sys/un.h>
  #include <sys/utsname.h>
  #include <sys/time.h>
 -#include <sys/un.h>
 -
  #include <webkit/webkit.h>
+ #include <libsoup/soup.h>
+ 
  #include <stdio.h>
  #include <string.h>
  #include <unistd.h>
@@@ -1541,12 -1529,13 +1544,17 @@@ set_var_value(gchar *name, gchar *val) 
          if (c->type == TYPE_STR) {
              buf = expand_vars(val);
              g_free(*c->ptr);
 -            *c->ptr = g_strdup(val);
 -        } else if (c->type == TYPE_INT) {
 +            *c->ptr = buf;
 +        } else if(c->type == TYPE_INT) {
              int *ip = (int *)c->ptr;
 -            *ip = (int)strtoul(val, &endp, 10);
 +            buf = expand_vars(val);
 +            *ip = (int)strtoul(buf, &endp, 10);
 +            g_free(buf);
+         } else if (c->type == TYPE_FLOAT) {
+             float *fp = (float *)c->ptr;
 -            *fp = strtof(val, &endp);
++            buf = expand_vars(val);
++            *fp = strtof(buf, &endp);
++            g_free(buf);
          }
  
          /* invoke a command specific function */

diff --cc uzbl.h
Simple merge