From 60dbdc6ecabd4dfff975747c58e7cf93dcff7fe5 Mon Sep 17 00:00:00 2001 From: Barrucadu Date: Sun, 26 Apr 2009 20:44:11 +0100 Subject: Reorganised AUTHORS file. --- AUTHORS | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/AUTHORS b/AUTHORS index 1effcd1..5e634b5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,14 +1,12 @@ -Dieter Plaetinck (Dieter@be) - Uzbl - -Michael Walker (Barrucadu) - Original threaded FIFO interface. Command adding methods. - -Zane Ashby (HashBox) - 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) + Dusan Popovic (dusanx) + Michael Walker (Barrucadu) + +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 -- cgit v1.2.3 From 8d3a16b9a61a8f2c0549ae2e26fa66989e26c5e6 Mon Sep 17 00:00:00 2001 From: Barrucadu Date: Sun, 26 Apr 2009 20:48:13 +0100 Subject: Merged dieter/experimental. --- uzbl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/uzbl.c b/uzbl.c index b39eace..ce1d190 100644 --- a/uzbl.c +++ b/uzbl.c @@ -402,9 +402,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 { @@ -452,7 +452,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); @@ -460,9 +460,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); } -- cgit v1.2.3