Merge branch 'bar/experimental' into experimental

2 files changed, 13 insertions, 15 deletions

diff --git a/AUTHORS b/AUTHORS
index 1effcd1..5e634b5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,14 +1,12 @@
 
-Dieter Plaetinck (Dieter@be) <dieter@plaetinck.be> - Uzbl
-
-Michael Walker (Barrucadu) <mike@barrucadu.co.uk> - Original threaded FIFO interface. Command adding methods.
-
-Zane Ashby (HashBox) <http://demonastery.org> - Rewrote FIFO interface. Fixed various bugs.
-
-(sentientswitch) - Cleaned up code. Added some commands.
-
-Dusan Popovic (dusanx) - Key handling and stuff
-
+Developers:
+    Dieter Plaetinck (Dieter@be) <dieter@plaetinck.be>
+    Dusan Popovic (dusanx)
+    Michael Walker (Barrucadu) <mike@barrucadu.co.uk>
+
+Contributors:
+    Zane Ashby (HashBox) - Rewrote FIFO interface. Fixed various bugs.
+    (sentientswitch) - Cleaned up code. Added some commands.
 
 
 Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c
diff --git a/uzbl.c b/uzbl.c
index 114079c..707071f 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -404,9 +404,9 @@ settings_init () {
     if (config_file) {
         config = g_key_file_new ();
         res = g_key_file_load_from_file (config, config_file, G_KEY_FILE_NONE, NULL);
-    	if(res) {
+    	  if(res) {
             printf ("Config %s loaded\n", config_file);
-    	} else {
+    	  } else {
             fprintf (stderr, "Config %s loading failed\n", config_file);
         }
     } else {
@@ -454,7 +454,7 @@ settings_init () {
     }
 
     if (keysi) {
-	int i = 0;
+	      int i = 0;
         for (i = 0; keysi[i]; i++) {
             gchar *binding = g_key_file_get_string (config, "bindings_internal", keysi[i], NULL);
             printf ("Action: %s, Binding: %s (internal)\n", g_strdup (keysi[i]), binding);
@@ -462,9 +462,9 @@ settings_init () {
         }
     }
     if (keyse) {
-	int i = 0;
+	      int i = 0;
         for (i = 0; keyse[i]; i++) {
-            gchar *binding = g_key_file_get_string(config, "bindings_external", keyse[i], NULL);
+            gchar *binding = g_key_file_get_string (config, "bindings_external", keyse[i], NULL);
             printf ("Action: %s, Binding: %s (external)\n", g_strdup (keyse[i]), binding);
             add_binding (binding, g_strdup (keyse[i]), false);
         }