Merge branch 'robhelmut' of http://gnarfk.homelinux.org/~helmut/uzbl

diff --cc uzbl.c
index dd3e7e3,fc8754f..006b778
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -224,12 -224,10 +224,12 @@@ const struct 
  /* construct a hash from the var_name_to_ptr array for quick access */
  void
  make_var_to_name_hash() {
-     struct var_name_to_ptr_t *n2v_p = &var_name_to_ptr;
+     const struct var_name_to_ptr_t *n2v_p = var_name_to_ptr;
      uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal);
      while(n2v_p->name) {
 -        g_hash_table_insert(uzbl.comm.proto_var, n2v_p->name, (gpointer) &n2v_p->cp);
 +        g_hash_table_insert(uzbl.comm.proto_var,
 +                (gpointer) n2v_p->name,
 +                (gpointer) &n2v_p->cp);
          n2v_p++;
      }
  }