Merge branch 'experimental' of git://github.com/DuClare/uzbl into experimental
authorBarrucadu <mike@barrucadu.co.uk>
Wed, 20 May 2009 14:23:39 +0000 (15:23 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Wed, 20 May 2009 14:23:39 +0000 (15:23 +0100)
1  2 
uzbl.c

diff --cc uzbl.c
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -1145,12 -1047,13 +1147,13 @@@ cmd_modkey() 
  
      buf = g_utf8_strup(uzbl.behave.modkey, -1);
      uzbl.behave.modmask = 0;
-     
      if(uzbl.behave.modkey) 
          free(uzbl.behave.modkey);
+     uzbl.behave.modkey = buf;
  
      for (i = 0; modkeys[i].key != NULL; i++) {
 -        if (g_strrstr(uzbl.behave.modkey, modkeys[i].key))
 +        if (g_strrstr(buf, modkeys[i].key))
              uzbl.behave.modmask |= modkeys[i].mask;
      }
  }