merge in dusanx stuff

diff --cc TODO
index 64033dd,c6eeda3..0f06a3a
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -16,22 -16,7 +16,23 @@@ ASA
  * select/fork based instead of the pthread stuff -> drops dependency, more lightweight.
  * on website, see if we can <pre><?php include('..'); ?></pre> the documentation inside the uzbl project itself, so we need to maintain the stuff on only 1 place
  * see if we can use the github bugtracker (anonymous posting allowed?)
 -* allow user to change bindings for navigation (up,down,left,right, page up, page down etc)
 +* allow user to change bindings for navigation (up,down,left,right, page up, page down etc)and use vim-like defaults
 +* put on uzbl.org that you can use http://github.com/Dieterbe/uzbl/issues after registering
 +* make default size configurable, and optional
 +* on uzbl.org commits overview: add date+time and repository
 +* how to handle different content types? (text-plain, image/png, application/pdf,... maybe a map of content-type to uzbl/command
 +  xdg already has a spec for this i think
 +  different "opening" modes (open as configured vs ask before opening)
 +  integration with download and new window thingies?
 +* see if/how we can remove /bin/bash from scripts
 +* unify internal and external bindings. 
 +* unify command triggering, whether they came in through fifo or keybind
 +* add to bottom /* vi: set et ts=4: */
 +* ideal uri editor: awesome mode like FF, some keyb shortcuts (erase search string, go to end/begin of string,..), history (if you patch dmenu to be in vertical mode and you order correctly, that's it), support copy paste
 +* get rid of the home page concept. allow user to make keybinds to go to one or more "homepages". a home page is nothing special.
 +* blinking cursor when not in insert mode is confusing.  i suggest dimming it's color if possible
++* open in new window -> uzbl: Fatal IO error 11 (Resource temporarily unavailable) on X server :0.0.
 +
  
  SOMEDAY:
  check if we can make the settings loading less hard coded. eg( keep a list of all settings, and for each one, try to load it)

diff --cc uzbl.c
index 401e628,cbd577d..8cc7152
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -509,11 -554,9 +543,10 @@@ settings_init () 
      gboolean res  = FALSE;
      gchar** keysi = NULL;
      gchar** keyse = NULL;
 +    char *saveptr;
  
-     if (! config_file) {
+     if (!config_file) {
          const char* XDG_CONFIG_HOME = getenv ("XDG_CONFIG_HOME");
-         char conf[256];
          if (! XDG_CONFIG_HOME || ! strcmp (XDG_CONFIG_HOME, "")) {
            XDG_CONFIG_HOME = (char *)XDG_CONFIG_HOME_default;
          }
@@@ -534,15 -577,15 +567,15 @@@
  
              char buffer[512];
              strcpy (buffer, XDG_CONFIG_DIRS);
 -            const gchar* dir = strtok (buffer, ":");
 +            const gchar* dir = (char *) strtok_r (buffer, ":", &saveptr);
-             while (dir && ! file_exists (conf)) {
-                 strcpy (conf, dir);
-                 strcat (conf, "/uzbl/config");
-                 if (file_exists (conf)) {
-                     printf ("Config file %s found.\n", conf);
-                     config_file = &conf[0];
+             while (dir && ! file_exists (config_file_path)) {
+                 strcpy (config_file_path, dir);
 -                strcat (config_file_path, "/uzbl/config");
++                strcat (config_file_path, "/uzbl/config_file_pathig");
+                 if (file_exists (config_file_path)) {
+                     printf ("Config file %s found.\n", config_file_path);
+                     config_file = &config_file_path[0];
                  }
 -                dir = strtok (NULL, ":");
 +                dir = (char * ) strtok_r (NULL, ":", &saveptr);
              }
          }
      }