indent

41 files changed, 8870 insertions, 9504 deletions

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 60feb043..8ad947dc 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -131,10 +131,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #if WITH_DMALLOC
 #  include <dmalloc.h>
 #endif
+
 
 
 
-
 /* --- WINDOWS SUPPORT --- */
 
 
@@ -162,7 +162,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 struct dirent
 {
   char d_name[2048];
-  int  d_namlen;
+  int d_namlen;
 };
 
 typedef struct _DIR
@@ -174,8 +174,8 @@ typedef struct _DIR
 } DIR;
 
 #endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
-
 
+
 /* --- MANIFEST CONSTANTS --- */
 
 
@@ -199,30 +199,32 @@ typedef struct _DIR
 /* This accounts for the _LTX_ separator */
 #undef  LT_SYMBOL_OVERHEAD
 #define LT_SYMBOL_OVERHEAD      5
+
 
 
 
-
 /* --- MEMORY HANDLING --- */
 
 
 /* These are the functions used internally.  In addition to making
    use of the associated function pointers above, they also perform
    error handling.  */
-static char   *lt_estrdup       LT_PARAMS((const char *str));
-static lt_ptr lt_emalloc        LT_PARAMS((size_t size));
-static lt_ptr lt_erealloc       LT_PARAMS((lt_ptr addr, size_t size));
+static char *lt_estrdup LT_PARAMS ((const char *str));
+static lt_ptr lt_emalloc LT_PARAMS ((size_t size));
+static lt_ptr lt_erealloc LT_PARAMS ((lt_ptr addr, size_t size));
 
 /* static lt_ptr rpl_realloc    LT_PARAMS((lt_ptr ptr, size_t size)); */
 #define rpl_realloc realloc
 
 /* These are the pointers that can be changed by the caller:  */
-LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc)    LT_PARAMS((size_t size))
-                        = (lt_ptr (*) LT_PARAMS((size_t))) malloc;
-LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc)   LT_PARAMS((lt_ptr ptr, size_t size))
-                        = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc;
-LT_GLOBAL_DATA void   (*lt_dlfree)      LT_PARAMS((lt_ptr ptr))
-                        = (void (*) LT_PARAMS((lt_ptr))) free;
+LT_GLOBAL_DATA
+lt_ptr (*lt_dlmalloc)
+LT_PARAMS ((size_t size)) = (lt_ptr (*)LT_PARAMS ((size_t))) malloc;
+     LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc)
+  LT_PARAMS ((lt_ptr ptr, size_t size)) =
+  (lt_ptr (*)LT_PARAMS ((lt_ptr, size_t))) rpl_realloc;
+     LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr)) =
+  (void (*)LT_PARAMS ((lt_ptr))) free;
 
 /* The following macros reduce the amount of typing needed to cast
    assigned memory.  */
@@ -251,29 +253,28 @@ LT_GLOBAL_DATA void   (*lt_dlfree)	LT_PARAMS((lt_ptr ptr))
 #define LT_DLMEM_REASSIGN(p, q)                 LT_STMT_START { \
         if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; }   \
                                                 } LT_STMT_END
-
 
+
 /* --- REPLACEMENT FUNCTIONS --- */
 
 
 #undef strdup
 #define strdup rpl_strdup
 
-static char *strdup LT_PARAMS((const char *str));
+     static char *strdup LT_PARAMS ((const char *str));
 
-static char *
-strdup(str)
+     static char *strdup (str)
      const char *str;
 {
   char *tmp = 0;
 
   if (str)
     {
-      tmp = LT_DLMALLOC (char, 1+ strlen (str));
+      tmp = LT_DLMALLOC (char, 1 + strlen (str));
       if (tmp)
-        {
-          strcpy(tmp, str);
-        }
+        {
+          strcpy (tmp, str);
+        }
     }
 
   return tmp;
@@ -285,7 +286,7 @@ strdup(str)
 #undef strcmp
 #define strcmp rpl_strcmp
 
-static int strcmp LT_PARAMS((const char *str1, const char *str2));
+static int strcmp LT_PARAMS ((const char *str1, const char *str2));
 
 static int
 strcmp (str1, str2)
@@ -299,13 +300,13 @@ strcmp (str1, str2)
   if (str2 == 0)
     return 1;
 
-  for (;*str1 && *str2; ++str1, ++str2)
+  for (; *str1 && *str2; ++str1, ++str2)
     {
       if (*str1 != *str2)
-        break;
+        break;
     }
 
-  return (int)(*str1 - *str2);
+  return (int) (*str1 - *str2);
 }
 #endif
 
@@ -317,19 +318,19 @@ strcmp (str1, str2)
 #  else
 #    define strchr rpl_strchr
 
-static const char *strchr LT_PARAMS((const char *str, int ch));
+static const char *strchr LT_PARAMS ((const char *str, int ch));
 
-static const char*
-strchr(str, ch)
+static const char *
+strchr (str, ch)
      const char *str;
      int ch;
 {
   const char *p;
 
-  for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p)
-    /*NOWORK*/;
+  for (p = str; *p != (char) ch && *p != LT_EOS_CHAR; ++p)
+     /*NOWORK*/;
 
-  return (*p == (char)ch) ? p : 0;
+  return (*p == (char) ch) ? p : 0;
 }
 
 #  endif
@@ -343,10 +344,10 @@ strchr(str, ch)
 #  else
 #    define strrchr rpl_strrchr
 
-static const char *strrchr LT_PARAMS((const char *str, int ch));
+static const char *strrchr LT_PARAMS ((const char *str, int ch));
 
-static const char*
-strrchr(str, ch)
+static const char *
+strrchr (str, ch)
      const char *str;
      int ch;
 {
@@ -355,9 +356,9 @@ strrchr(str, ch)
   for (p = str; *p != LT_EOS_CHAR; ++p)
     {
       if (*p == (char) ch)
-        {
-          q = p;
-        }
+        {
+          q = p;
+        }
     }
 
   return q;
@@ -377,7 +378,7 @@ strrchr(str, ch)
 #  else
 #    define memcpy rpl_memcpy
 
-static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
+static lt_ptr memcpy LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
 
 static lt_ptr
 memcpy (dest, src, size)
@@ -396,12 +397,13 @@ memcpy (dest, src, size)
 }
 
 #  endif /* !HAVE_BCOPY */
-#endif   /* !HAVE_MEMCPY */
+#endif /* !HAVE_MEMCPY */
 
 #if ! HAVE_MEMMOVE
 #  define memmove rpl_memmove
 
-static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size));
+static lt_ptr memmove
+LT_PARAMS ((lt_ptr dest, const lt_ptr src, size_t size));
 
 static lt_ptr
 memmove (dest, src, size)
@@ -414,12 +416,12 @@ memmove (dest, src, size)
   if (dest < src)
     for (i = 0; i < size; ++i)
       {
-        dest[i] = src[i];
+        dest[i] = src[i];
       }
   else if (dest > src)
-    for (i = size -1; i >= 0; --i)
+    for (i = size - 1; i >= 0; --i)
       {
-        dest[i] = src[i];
+        dest[i] = src[i];
       }
 
   return dest;
@@ -429,71 +431,73 @@ memmove (dest, src, size)
 
 #ifdef LT_USE_WINDOWS_DIRENT_EMULATION
 
-static void closedir LT_PARAMS((DIR *entry));
+static void closedir LT_PARAMS ((DIR * entry));
 
 static void
-closedir(entry)
-  DIR *entry;
+closedir (entry)
+     DIR *entry;
 {
-  assert(entry != (DIR *) NULL);
-  FindClose(entry->hSearch);
-  lt_dlfree((lt_ptr)entry);
+  assert (entry != (DIR *) NULL);
+  FindClose (entry->hSearch);
+  lt_dlfree ((lt_ptr) entry);
 }
 
 
-static DIR * opendir LT_PARAMS((const char *path));
+static DIR *opendir LT_PARAMS ((const char *path));
 
-static DIR*
+static DIR *
 opendir (path)
-  const char *path;
+     const char *path;
 {
   char file_specification[LT_FILENAME_MAX];
   DIR *entry;
 
-  assert(path != (char *) NULL);
-  (void) strncpy(file_specification,path,LT_FILENAME_MAX-1);
-  (void) strcat(file_specification,"\\");
-  entry = LT_DLMALLOC (DIR,sizeof(DIR));
+  assert (path != (char *) NULL);
+  (void) strncpy (file_specification, path, LT_FILENAME_MAX - 1);
+  (void) strcat (file_specification, "\\");
+  entry = LT_DLMALLOC (DIR, sizeof (DIR));
   if (entry != (DIR *) 0)
     {
       entry->firsttime = TRUE;
-      entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+      entry->hSearch =
+        FindFirstFile (file_specification, &entry->Win32FindData);
     }
   if (entry->hSearch == INVALID_HANDLE_VALUE)
     {
-      (void) strcat(file_specification,"\\*.*");
-      entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData);
+      (void) strcat (file_specification, "\\*.*");
+      entry->hSearch =
+        FindFirstFile (file_specification, &entry->Win32FindData);
       if (entry->hSearch == INVALID_HANDLE_VALUE)
         {
           LT_DLFREE (entry);
           return (DIR *) 0;
         }
     }
-  return(entry);
+  return (entry);
 }
 
 
-static struct dirent *readdir LT_PARAMS((DIR *entry));
+static struct dirent *readdir LT_PARAMS ((DIR * entry));
 
-static struct dirent *readdir(entry)
-  DIR *entry;
+static struct dirent *
+readdir (entry)
+     DIR *entry;
 {
-  int
-    status;
+  int status;
 
   if (entry == (DIR *) 0)
-    return((struct dirent *) 0);
+    return ((struct dirent *) 0);
   if (!entry->firsttime)
     {
-      status = FindNextFile(entry->hSearch,&entry->Win32FindData);
+      status = FindNextFile (entry->hSearch, &entry->Win32FindData);
       if (status == 0)
-        return((struct dirent *) 0);
+        return ((struct dirent *) 0);
     }
   entry->firsttime = FALSE;
-  (void) strncpy(entry->file_info.d_name,entry->Win32FindData.cFileName,
-    LT_FILENAME_MAX-1);
-  entry->file_info.d_namlen = strlen(entry->file_info.d_name);
-  return(&entry->file_info);
+  (void) strncpy (entry->file_info.d_name, entry->Win32FindData.cFileName,
+                  LT_FILENAME_MAX - 1);
+  entry->file_info.d_namlen = strlen (entry->file_info.d_name);
+  return (&entry->file_info);
 }
 
 #endif /* LT_USE_WINDOWS_DIRENT_EMULATION */
@@ -524,9 +528,9 @@ realloc (ptr, size)
     {
       /* For zero or less bytes, free the original memory */
       if (ptr != 0)
-        {
-          lt_dlfree (ptr);
-        }
+        {
+          lt_dlfree (ptr);
+        }
 
       return (lt_ptr) 0;
     }
@@ -541,13 +545,13 @@ realloc (ptr, size)
       lt_ptr mem = lt_dlmalloc (size);
 
       if (mem)
-        {
-          memcpy (mem, ptr, size);
-          lt_dlfree (ptr);
-        }
+        {
+          memcpy (mem, ptr, size);
+          lt_dlfree (ptr);
+        }
 
       /* Note that the contents of PTR are not damaged if there is
-         insufficient memory to realloc.  */
+         insufficient memory to realloc.  */
       return mem;
     }
 }
@@ -557,8 +561,8 @@ realloc (ptr, size)
 #if ! HAVE_ARGZ_APPEND
 #  define argz_append rpl_argz_append
 
-static error_t argz_append LT_PARAMS((char **pargz, size_t *pargz_len,
-                                        const char *buf, size_t buf_len));
+static error_t argz_append LT_PARAMS ((char **pargz, size_t * pargz_len,
+                                       const char *buf, size_t buf_len));
 
 static error_t
 argz_append (pargz, pargz_len, buf, buf_len)
@@ -568,7 +572,7 @@ argz_append (pargz, pargz_len, buf, buf_len)
      size_t buf_len;
 {
   size_t argz_len;
-  char  *argz;
+  char *argz;
 
   assert (pargz);
   assert (pargz_len);
@@ -599,8 +603,8 @@ argz_append (pargz, pargz_len, buf, buf_len)
 #if ! HAVE_ARGZ_CREATE_SEP
 #  define argz_create_sep rpl_argz_create_sep
 
-static error_t argz_create_sep LT_PARAMS((const char *str, int delim,
-                                            char **pargz, size_t *pargz_len));
+static error_t argz_create_sep LT_PARAMS ((const char *str, int delim,
+                                           char **pargz, size_t * pargz_len));
 
 static error_t
 argz_create_sep (str, delim, pargz, pargz_len)
@@ -618,7 +622,7 @@ argz_create_sep (str, delim, pargz, pargz_len)
 
   /* Make a copy of STR, but replacing each occurence of
      DELIM with '\0'.  */
-  argz_len = 1+ LT_STRLEN (str);
+  argz_len = 1 + LT_STRLEN (str);
   if (argz_len)
     {
       const char *p;
@@ -626,22 +630,22 @@ argz_create_sep (str, delim, pargz, pargz_len)
 
       argz = LT_DLMALLOC (char, argz_len);
       if (!argz)
-        return ENOMEM;
+        return ENOMEM;
 
       for (p = str, q = argz; *p != LT_EOS_CHAR; ++p)
-        {
-          if (*p == delim)
-            {
-              /* Ignore leading delimiters, and fold consecutive
-                 delimiters in STR into a single '\0' in ARGZ.  */
-              if ((q > argz) && (q[-1] != LT_EOS_CHAR))
-                *q++ = LT_EOS_CHAR;
-              else
-                --argz_len;
-            }
-          else
-            *q++ = *p;
-        }
+        {
+          if (*p == delim)
+            {
+              /* Ignore leading delimiters, and fold consecutive
+                 delimiters in STR into a single '\0' in ARGZ.  */
+              if ((q > argz) && (q[-1] != LT_EOS_CHAR))
+                *q++ = LT_EOS_CHAR;
+              else
+                --argz_len;
+            }
+          else
+            *q++ = *p;
+        }
       /* Copy terminating LT_EOS_CHAR.  */
       *q = *p;
     }
@@ -662,8 +666,8 @@ argz_create_sep (str, delim, pargz, pargz_len)
 #if ! HAVE_ARGZ_INSERT
 #  define argz_insert rpl_argz_insert
 
-static error_t argz_insert LT_PARAMS((char **pargz, size_t *pargz_len,
-                                        char *before, const char *entry));
+static error_t argz_insert LT_PARAMS ((char **pargz, size_t * pargz_len,
+                                       char *before, const char *entry));
 
 static error_t
 argz_insert (pargz, pargz_len, before, entry)
@@ -679,7 +683,7 @@ argz_insert (pargz, pargz_len, before, entry)
   /* No BEFORE address indicates ENTRY should be inserted after the
      current last element.  */
   if (!before)
-    return argz_append (pargz, pargz_len, entry, 1+ LT_STRLEN (entry));
+    return argz_append (pargz, pargz_len, entry, 1 + LT_STRLEN (entry));
 
   /* This probably indicates a programmer error, but to preserve
      semantics, scan back to the start of an entry if BEFORE points
@@ -688,10 +692,10 @@ argz_insert (pargz, pargz_len, before, entry)
     --before;
 
   {
-    size_t entry_len    = 1+ LT_STRLEN (entry);
-    size_t argz_len     = *pargz_len + entry_len;
-    size_t offset       = before - *pargz;
-    char   *argz        = LT_DLREALLOC (char, *pargz, argz_len);
+    size_t entry_len = 1 + LT_STRLEN (entry);
+    size_t argz_len = *pargz_len + entry_len;
+    size_t offset = before - *pargz;
+    char *argz = LT_DLREALLOC (char, *pargz, argz_len);
 
     if (!argz)
       return ENOMEM;
@@ -704,7 +708,7 @@ argz_insert (pargz, pargz_len, before, entry)
        space at the end -- making room to copy ENTRY into the
        resulting gap.  */
     memmove (before + entry_len, before, *pargz_len - offset);
-    memcpy  (before, entry, entry_len);
+    memcpy (before, entry, entry_len);
 
     /* Assign new values.  */
     *pargz = argz;
@@ -719,8 +723,8 @@ argz_insert (pargz, pargz_len, before, entry)
 #if ! HAVE_ARGZ_NEXT
 #  define argz_next rpl_argz_next
 
-static char *argz_next LT_PARAMS((char *argz, size_t argz_len,
-                                    const char *entry));
+static char *argz_next LT_PARAMS ((char *argz, size_t argz_len,
+                                   const char *entry));
 
 static char *
 argz_next (argz, argz_len, entry)
@@ -733,28 +737,28 @@ argz_next (argz, argz_len, entry)
   if (entry)
     {
       /* Either ARGZ/ARGZ_LEN is empty, or ENTRY points into an address
-         within the ARGZ vector.  */
+         within the ARGZ vector.  */
       assert ((!argz && !argz_len)
-              || ((argz <= entry) && (entry < (argz + argz_len))));
+              || ((argz <= entry) && (entry < (argz + argz_len))));
 
       /* Move to the char immediately after the terminating
-         '\0' of ENTRY.  */
-      entry = 1+ strchr (entry, LT_EOS_CHAR);
+         '\0' of ENTRY.  */
+      entry = 1 + strchr (entry, LT_EOS_CHAR);
 
       /* Return either the new ENTRY, or else NULL if ARGZ is
-         exhausted.  */
+         exhausted.  */
       return (entry >= argz + argz_len) ? 0 : (char *) entry;
     }
   else
     {
       /* This should probably be flagged as a programmer error,
-         since starting an argz_next loop with the iterator set
-         to ARGZ is safer.  To preserve semantics, handle the NULL
-         case by returning the start of ARGZ (if any).  */
+         since starting an argz_next loop with the iterator set
+         to ARGZ is safer.  To preserve semantics, handle the NULL
+         case by returning the start of ARGZ (if any).  */
       if (argz_len > 0)
-        return argz;
+        return argz;
       else
-        return 0;
+        return 0;
     }
 }
 #endif /* !HAVE_ARGZ_NEXT */
@@ -764,8 +768,7 @@ argz_next (argz, argz_len, entry)
 #if ! HAVE_ARGZ_STRINGIFY
 #  define argz_stringify rpl_argz_stringify
 
-static void argz_stringify LT_PARAMS((char *argz, size_t argz_len,
-                                       int sep));
+static void argz_stringify LT_PARAMS ((char *argz, size_t argz_len, int sep));
 
 static void
 argz_stringify (argz, argz_len, sep)
@@ -777,68 +780,69 @@ argz_stringify (argz, argz_len, sep)
 
   if (sep)
     {
-      --argz_len;               /* don't stringify the terminating EOS */
+      --argz_len;               /* don't stringify the terminating EOS */
       while (--argz_len > 0)
-        {
-          if (argz[argz_len] == LT_EOS_CHAR)
-            argz[argz_len] = sep;
-        }
+        {
+          if (argz[argz_len] == LT_EOS_CHAR)
+            argz[argz_len] = sep;
+        }
     }
 }
 #endif /* !HAVE_ARGZ_STRINGIFY */
+
 
 
 
-
 /* --- TYPE DEFINITIONS -- */
 
 
 /* This type is used for the array of caller data sets in each handler. */
-typedef struct {
-  lt_dlcaller_id        key;
-  lt_ptr                data;
+typedef struct
+{
+  lt_dlcaller_id key;
+  lt_ptr data;
 } lt_caller_data;
+
 
 
 
-
 /* --- OPAQUE STRUCTURES DECLARED IN LTDL.H --- */
 
 
 /* Extract the diagnostic strings from the error table macro in the same
    order as the enumerated indices in ltdl.h. */
 
-static const char *lt_dlerror_strings[] =
-  {
+static const char *lt_dlerror_strings[] = {
 #define LT_ERROR(name, diagnostic)      (diagnostic),
-    lt_dlerror_table
+  lt_dlerror_table
 #undef LT_ERROR
-
-    0
-  };
+  0
+};
 
 /* This structure is used for the list of registered loaders. */
-struct lt_dlloader {
-  struct lt_dlloader   *next;
-  const char           *loader_name;    /* identifying name for each loader */
-  const char           *sym_prefix;     /* prefix for symbols */
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym          *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data          dlloader_data;
+struct lt_dlloader
+{
+  struct lt_dlloader *next;
+  const char *loader_name;      /* identifying name for each loader */
+  const char *sym_prefix;       /* prefix for symbols */
+  lt_module_open *module_open;
+  lt_module_close *module_close;
+  lt_find_sym *find_sym;
+  lt_dlloader_exit *dlloader_exit;
+  lt_user_data dlloader_data;
 };
 
-struct lt_dlhandle_struct {
-  struct lt_dlhandle_struct   *next;
-  lt_dlloader          *loader;         /* dlopening interface */
-  lt_dlinfo             info;
-  int                   depcount;       /* number of dependencies */
-  lt_dlhandle          *deplibs;        /* dependencies */
-  lt_module             module;         /* system module handle */
-  lt_ptr                system;         /* system specific data */
-  lt_caller_data       *caller_data;    /* per caller associated data */
-  int                   flags;          /* various boolean stats */
+struct lt_dlhandle_struct
+{
+  struct lt_dlhandle_struct *next;
+  lt_dlloader *loader;          /* dlopening interface */
+  lt_dlinfo info;
+  int depcount;                 /* number of dependencies */
+  lt_dlhandle *deplibs;         /* dependencies */
+  lt_module module;             /* system module handle */
+  lt_ptr system;                /* system specific data */
+  lt_caller_data *caller_data;  /* per caller associated data */
+  int flags;                    /* various boolean stats */
 };
 
 /* Various boolean flags can be stored in the flags field of an
@@ -854,18 +858,18 @@ struct lt_dlhandle_struct {
 
 #define LT_DLSTRERROR(name)     lt_dlerror_strings[LT_CONC(LT_ERROR_,name)]
 
-static  const char      objdir[]                = LTDL_OBJDIR;
-static  const char      archive_ext[]           = LTDL_ARCHIVE_EXT;
+static const char objdir[] = LTDL_OBJDIR;
+static const char archive_ext[] = LTDL_ARCHIVE_EXT;
 #ifdef  LTDL_SHLIB_EXT
-static  const char      shlib_ext[]             = LTDL_SHLIB_EXT;
+static const char shlib_ext[] = LTDL_SHLIB_EXT;
 #endif
 #ifdef  LTDL_SYSSEARCHPATH
-static  const char      sys_search_path[]       = LTDL_SYSSEARCHPATH;
+static const char sys_search_path[] = LTDL_SYSSEARCHPATH;
 #endif
+
 
 
 
-
 /* --- MUTEX LOCKING --- */
 
 
@@ -891,11 +895,11 @@ static	const char	sys_search_path[]	= LTDL_SYSSEARCHPATH;
 
 /* The mutex functions stored here are global, and are necessarily the
    same for all threads that wish to share access to libltdl.  */
-static  lt_dlmutex_lock     *lt_dlmutex_lock_func     = 0;
-static  lt_dlmutex_unlock   *lt_dlmutex_unlock_func   = 0;
-static  lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
-static  lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
-static  const char          *lt_dllast_error          = 0;
+static lt_dlmutex_lock *lt_dlmutex_lock_func = 0;
+static lt_dlmutex_unlock *lt_dlmutex_unlock_func = 0;
+static lt_dlmutex_seterror *lt_dlmutex_seterror_func = 0;
+static lt_dlmutex_geterror *lt_dlmutex_geterror_func = 0;
+static const char *lt_dllast_error = 0;
 
 
 /* Either set or reset the mutex functions.  Either all the arguments must
@@ -910,7 +914,7 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
      lt_dlmutex_geterror *geterror;
 {
   lt_dlmutex_unlock *old_unlock = unlock;
-  int                errors     = 0;
+  int errors = 0;
 
   /* Lock using the old lock() callback, if any.  */
   LT_DLMUTEX_LOCK ();
@@ -918,8 +922,8 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
   if ((lock && unlock && seterror && geterror)
       || !(lock || unlock || seterror || geterror))
     {
-      lt_dlmutex_lock_func     = lock;
-      lt_dlmutex_unlock_func   = unlock;
+      lt_dlmutex_lock_func = lock;
+      lt_dlmutex_unlock_func = unlock;
       lt_dlmutex_geterror_func = geterror;
     }
   else
@@ -937,23 +941,23 @@ lt_dlmutex_register (lock, unlock, seterror, geterror)
      this function.  */
   return errors;
 }
+
 
 
 
-
 /* --- ERROR HANDLING --- */
 
 
-static  const char    **user_error_strings      = 0;
-static  int             errorcount              = LT_ERROR_MAX;
+static const char **user_error_strings = 0;
+static int errorcount = LT_ERROR_MAX;
 
 int
 lt_dladderror (diagnostic)
      const char *diagnostic;
 {
-  int           errindex = 0;
-  int           result   = -1;
-  const char  **temp     = (const char **) 0;
+  int errindex = 0;
+  int result = -1;
+  const char **temp = (const char **) 0;
 
   assert (diagnostic);
 
@@ -963,9 +967,9 @@ lt_dladderror (diagnostic)
   temp = LT_EREALLOC (const char *, user_error_strings, 1 + errindex);
   if (temp)
     {
-      user_error_strings                = temp;
-      user_error_strings[errindex]      = diagnostic;
-      result                            = errorcount++;
+      user_error_strings = temp;
+      user_error_strings[errindex] = diagnostic;
+      result = errorcount++;
     }
 
   LT_DLMUTEX_UNLOCK ();
@@ -977,7 +981,7 @@ int
 lt_dlseterror (errindex)
      int errindex;
 {
-  int           errors   = 0;
+  int errors = 0;
 
   LT_DLMUTEX_LOCK ();
 
@@ -1033,10 +1037,10 @@ lt_estrdup (str)
     LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
   return copy;
 }
+
 
 
 
-
 /* --- DLOPEN() INTERFACE LOADER --- */
 
 
@@ -1087,7 +1091,7 @@ sys_dl_open (loader_data, filename)
      lt_user_data loader_data;
      const char *filename;
 {
-  lt_module   module   = dlopen (filename, LT_LAZY_OR_NOW);
+  lt_module module = dlopen (filename, LT_LAZY_OR_NOW);
 
   if (!module)
     {
@@ -1129,20 +1133,20 @@ sys_dl_sym (loader_data, module, symbol)
   return address;
 }
 
-static struct lt_user_dlloader sys_dl =
-  {
+static struct lt_user_dlloader sys_dl = {
 #  ifdef NEED_USCORE
-    "_",
+  "_",
 #  else
-    0,
+  0,
 #  endif
-    sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0 };
+  sys_dl_open, sys_dl_close, sys_dl_sym, 0, 0
+};
 
 
 #endif /* HAVE_LIBDL */
+
 
 
-
 /* --- SHL_LOAD() INTERFACE LOADER --- */
 
 #if HAVE_SHL_LOAD
@@ -1220,9 +1224,9 @@ sys_shl_open (loader_data, filename)
       module = shl_load (filename, LT_BIND_FLAGS, 0L);
 
       if (!module)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_OPEN));
+        }
     }
 
   return module;
@@ -1254,15 +1258,16 @@ sys_shl_sym (loader_data, module, symbol)
 
   /* sys_shl_open should never return a NULL module handle */
   if (module == (lt_module) 0)
-  {
-    LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
-  }
-  else if (!shl_findsym((shl_t*) &module, symbol, TYPE_UNDEFINED, &address))
+    {
+      LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_HANDLE));
+    }
+  else
+    if (!shl_findsym ((shl_t *) & module, symbol, TYPE_UNDEFINED, &address))
     {
       if (!address)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
+        }
     }
 
   return address;
@@ -1273,10 +1278,10 @@ static struct lt_user_dlloader sys_shl = {
 };
 
 #endif /* HAVE_SHL_LOAD */
+
 
 
 
-
 /* --- LOADLIBRARY() INTERFACE LOADER --- */
 
 #ifdef __WINDOWS__
@@ -1293,12 +1298,12 @@ sys_wll_open (loader_data, filename)
      lt_user_data loader_data;
      const char *filename;
 {
-  lt_dlhandle   cur;
-  lt_module     module     = 0;
-  const char   *errormsg   = 0;
-  char         *searchname = 0;
-  char         *ext;
-  char          self_name_buf[MAX_PATH];
+  lt_dlhandle cur;
+  lt_module module = 0;
+  const char *errormsg = 0;
+  char *searchname = 0;
+  char *ext;
+  char self_name_buf[MAX_PATH];
 
   if (!filename)
     {
@@ -1320,10 +1325,10 @@ sys_wll_open (loader_data, filename)
   else
     {
       /* Append a `.' to stop Windows from adding an
-         implicit `.dll' extension. */
-      searchname = LT_EMALLOC (char, 2+ LT_STRLEN (filename));
+         implicit `.dll' extension. */
+      searchname = LT_EMALLOC (char, 2 + LT_STRLEN (filename));
       if (searchname)
-        sprintf (searchname, "%s.", filename);
+        sprintf (searchname, "%s.", filename);
     }
   if (!searchname)
     return 0;
@@ -1331,8 +1336,8 @@ sys_wll_open (loader_data, filename)
 #if __CYGWIN__
   {
     char wpath[MAX_PATH];
-    cygwin_conv_to_full_win32_path(searchname, wpath);
-    module = LoadLibrary(wpath);
+    cygwin_conv_to_full_win32_path (searchname, wpath);
+    module = LoadLibrary (wpath);
   }
 #else
   module = LoadLibrary (searchname);
@@ -1352,18 +1357,18 @@ sys_wll_open (loader_data, filename)
   while (cur)
     {
       if (!cur->module)
-        {
-          cur = 0;
-          break;
-        }
+        {
+          cur = 0;
+          break;
+        }
 
       if (cur->module == module)
-        {
-          break;
-        }
+        {
+          break;
+        }
 
       cur = cur->next;
-  }
+    }
   LT_DLMUTEX_UNLOCK ();
 
   if (cur || !module)
@@ -1380,9 +1385,9 @@ sys_wll_close (loader_data, module)
      lt_user_data loader_data;
      lt_module module;
 {
-  int         errors   = 0;
+  int errors = 0;
 
-  if (FreeLibrary(module) == 0)
+  if (FreeLibrary (module) == 0)
     {
       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
       ++errors;
@@ -1397,7 +1402,7 @@ sys_wll_sym (loader_data, module, symbol)
      lt_module module;
      const char *symbol;
 {
-  lt_ptr      address  = GetProcAddress (module, symbol);
+  lt_ptr address = GetProcAddress (module, symbol);
 
   if (!address)
     {
@@ -1412,10 +1417,10 @@ static struct lt_user_dlloader sys_wll = {
 };
 
 #endif /* __WINDOWS__ */
+
 
 
 
-
 /* --- LOAD_ADD_ON() INTERFACE LOADER --- */
 
 
@@ -1441,7 +1446,7 @@ sys_bedl_open (loader_data, filename)
       image_info info;
       int32 cookie = 0;
       if (get_next_image_info (0, &cookie, &info) == B_OK)
-        image = load_add_on (info.name);
+        image = load_add_on (info.name);
     }
 
   if (image <= 0)
@@ -1492,10 +1497,10 @@ static struct lt_user_dlloader sys_bedl = {
 };
 
 #endif /* __BEOS__ */
+
 
 
 
-
 /* --- DLD_LINK() INTERFACE LOADER --- */
 
 
@@ -1531,7 +1536,7 @@ sys_dld_close (loader_data, module)
 {
   int errors = 0;
 
-  if (dld_unlink_by_file ((char*)(module), 1) != 0)
+  if (dld_unlink_by_file ((char *) (module), 1) != 0)
     {
       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (CANNOT_CLOSE));
       ++errors;
@@ -1584,10 +1589,11 @@ static struct lt_user_dlloader sys_dld = {
 # define ENUM_DYLD_BOOL
 # undef FALSE
 # undef TRUE
- enum DYLD_BOOL {
-    FALSE,
-    TRUE
- };
+enum DYLD_BOOL
+{
+  FALSE,
+  TRUE
+};
 #endif
 #ifndef LC_REQ_DYLD
 # define LC_REQ_DYLD 0x80000000
@@ -1595,10 +1601,18 @@ static struct lt_user_dlloader sys_dld = {
 #ifndef LC_LOAD_WEAK_DYLIB
 # define LC_LOAD_WEAK_DYLIB (0x18 | LC_REQ_DYLD)
 #endif
-static const struct mach_header * (*ltdl_NSAddImage)(const char *image_name, unsigned long options) = 0;
-static NSSymbol (*ltdl_NSLookupSymbolInImage)(const struct mach_header *image,const char *symbolName, unsigned long options) = 0;
-static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage)(const struct mach_header *image, const char *symbolName) = 0;
-static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
+static const struct mach_header *(*ltdl_NSAddImage) (const char *image_name,
+                                                     unsigned long options) =
+  0;
+static NSSymbol (*ltdl_NSLookupSymbolInImage) (const struct mach_header *
+                                               image, const char *symbolName,
+                                               unsigned long options) = 0;
+static enum DYLD_BOOL (*ltdl_NSIsSymbolNameDefinedInImage) (const struct
+                                                            mach_header *
+                                                            image,
+                                                            const char
+                                                            *symbolName) = 0;
+static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic) (NSModule module) = 0;
 
 #ifndef NSADDIMAGE_OPTION_NONE
 #define NSADDIMAGE_OPTION_NONE                          0x0
@@ -1630,144 +1644,170 @@ static enum DYLD_BOOL (*ltdl_NSMakePrivateModulePublic)(NSModule module) = 0;
 
 
 static const char *
-lt_int_dyld_error(othererror)
-        char* othererror;
+lt_int_dyld_error (othererror)
+     char *othererror;
 {
 /* return the dyld error string, or the passed in error string if none */
-        NSLinkEditErrors ler;
-        int lerno;
-        const char *errstr;
-        const char *file;
-        NSLinkEditError(&ler,&lerno,&file,&errstr);
-        if (!errstr || !strlen(errstr)) errstr = othererror;
-        return errstr;
+  NSLinkEditErrors ler;
+  int lerno;
+  const char *errstr;
+  const char *file;
+  NSLinkEditError (&ler, &lerno, &file, &errstr);
+  if (!errstr || !strlen (errstr))
+    errstr = othererror;
+  return errstr;
 }
 
 static const struct mach_header *
-lt_int_dyld_get_mach_header_from_nsmodule(module)
-        NSModule module;
+lt_int_dyld_get_mach_header_from_nsmodule (module)
+     NSModule module;
 {
 /* There should probably be an apple dyld api for this */
-        int i=_dyld_image_count();
-        int j;
-        const char *modname=NSNameOfModule(module);
-        const struct mach_header *mh=NULL;
-        if (!modname) return NULL;
-        for (j = 0; j < i; j++)
-        {
-                if (!strcmp(_dyld_get_image_name(j),modname))
-                {
-                        mh=_dyld_get_image_header(j);
-                        break;
-                }
-        }
-        return mh;
+  int i = _dyld_image_count ();
+  int j;
+  const char *modname = NSNameOfModule (module);
+  const struct mach_header *mh = NULL;
+  if (!modname)
+    return NULL;
+  for (j = 0; j < i; j++)
+    {
+      if (!strcmp (_dyld_get_image_name (j), modname))
+        {
+          mh = _dyld_get_image_header (j);
+          break;
+        }
+    }
+  return mh;
 }
 
-static const char* lt_int_dyld_lib_install_name(mh)
-        const struct mach_header *mh;
+static const char *
+lt_int_dyld_lib_install_name (mh)
+     const struct mach_header *mh;
 {
 /* NSAddImage is also used to get the loaded image, but it only works if the lib
    is installed, for uninstalled libs we need to check the install_names against
    each other. Note that this is still broken if DYLD_IMAGE_SUFFIX is set and a
    different lib was loaded as a result
 */
-        int j;
-        struct load_command *lc;
-        unsigned long offset = sizeof(struct mach_header);
-        const char* retStr=NULL;
-        for (j = 0; j < mh->ncmds; j++)
-        {
-                lc = (struct load_command*)(((unsigned long)mh) + offset);
-                if (LC_ID_DYLIB == lc->cmd)
-                {
-                        retStr=(char*)(((struct dylib_command*)lc)->dylib.name.offset +
-                                                                        (unsigned long)lc);
-                }
-                offset += lc->cmdsize;
-        }
-        return retStr;
+  int j;
+  struct load_command *lc;
+  unsigned long offset = sizeof (struct mach_header);
+  const char *retStr = NULL;
+  for (j = 0; j < mh->ncmds; j++)
+    {
+      lc = (struct load_command *) (((unsigned long) mh) + offset);
+      if (LC_ID_DYLIB == lc->cmd)
+        {
+          retStr =
+            (char *) (((struct dylib_command *) lc)->dylib.name.offset +
+                      (unsigned long) lc);
+        }
+      offset += lc->cmdsize;
+    }
+  return retStr;
 }
 
 static const struct mach_header *
-lt_int_dyld_match_loaded_lib_by_install_name(const char *name)
+lt_int_dyld_match_loaded_lib_by_install_name (const char *name)
 {
-        int i=_dyld_image_count();
-        int j;
-        const struct mach_header *mh=NULL;
-        const char *id=NULL;
-        for (j = 0; j < i; j++)
-        {
-                id=lt_int_dyld_lib_install_name(_dyld_get_image_header(j));
-                if ((id) && (!strcmp(id,name)))
-                {
-                        mh=_dyld_get_image_header(j);
-                        break;
-                }
-        }
-        return mh;
+  int i = _dyld_image_count ();
+  int j;
+  const struct mach_header *mh = NULL;
+  const char *id = NULL;
+  for (j = 0; j < i; j++)
+    {
+      id = lt_int_dyld_lib_install_name (_dyld_get_image_header (j));
+      if ((id) && (!strcmp (id, name)))
+        {
+          mh = _dyld_get_image_header (j);
+          break;
+        }
+    }
+  return mh;
 }
 
 static NSSymbol
-lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh)
-        const char *symbol;
-        const struct mach_header *mh;
+lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
+     const char *symbol;
+     const struct mach_header *mh;
 {
-        /* Safe to assume our mh is good */
-        int j;
-        struct load_command *lc;
-        unsigned long offset = sizeof(struct mach_header);
-        NSSymbol retSym = 0;
-        const struct mach_header *mh1;
-        if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined(symbol) )
-        {
-                for (j = 0; j < mh->ncmds; j++)
-                {
-                        lc = (struct load_command*)(((unsigned long)mh) + offset);
-                        if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
-                        {
-                                mh1=lt_int_dyld_match_loaded_lib_by_install_name((char*)(((struct dylib_command*)lc)->dylib.name.offset +
-                                                                                (unsigned long)lc));
-                                if (!mh1)
-                                {
-                                        /* Maybe NSAddImage can find it */
-                                        mh1=ltdl_NSAddImage((char*)(((struct dylib_command*)lc)->dylib.name.offset +
-                                                                                (unsigned long)lc),
-                                                                                NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
-                                                                                NSADDIMAGE_OPTION_WITH_SEARCHING +
-                                                                                NSADDIMAGE_OPTION_RETURN_ON_ERROR );
-                                }
-                                if (mh1)
-                                {
-                                        retSym = ltdl_NSLookupSymbolInImage(mh1,
-                                                                                        symbol,
-                                                                                        NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-                                                                                        | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-                                                                                        );
-                                        if (retSym) break;
-                                }
-                        }
-                        offset += lc->cmdsize;
-                }
-        }
-        return retSym;
+  /* Safe to assume our mh is good */
+  int j;
+  struct load_command *lc;
+  unsigned long offset = sizeof (struct mach_header);
+  NSSymbol retSym = 0;
+  const struct mach_header *mh1;
+  if ((ltdl_NSLookupSymbolInImage) && NSIsSymbolNameDefined (symbol))
+    {
+      for (j = 0; j < mh->ncmds; j++)
+        {
+          lc = (struct load_command *) (((unsigned long) mh) + offset);
+          if ((LC_LOAD_DYLIB == lc->cmd) || (LC_LOAD_WEAK_DYLIB == lc->cmd))
+            {
+              mh1 =
+                lt_int_dyld_match_loaded_lib_by_install_name ((char
+                                                               *) (((struct
+                                                                     dylib_command
+                                                                     *) lc)->
+                                                                   dylib.name.
+                                                                   offset +
+                                                                   (unsigned
+                                                                    long)
+                                                                   lc));
+              if (!mh1)
+                {
+                  /* Maybe NSAddImage can find it */
+                  mh1 =
+                    ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
+                                               dylib.name.offset +
+                                               (unsigned long) lc),
+                                     NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED +
+                                     NSADDIMAGE_OPTION_WITH_SEARCHING +
+                                     NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+                }
+              if (mh1)
+                {
+                  retSym = ltdl_NSLookupSymbolInImage (mh1,
+                                                       symbol,
+                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+                                                       |
+                                                       NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+                  if (retSym)
+                    break;
+                }
+            }
+          offset += lc->cmdsize;
+        }
+    }
+  return retSym;
 }
 
 static int
-sys_dyld_init()
+sys_dyld_init ()
 {
-        int retCode = 0;
-        int err = 0;
-        if (!_dyld_present()) {
-                retCode=1;
-        }
-        else {
-      err = _dyld_func_lookup("__dyld_NSAddImage",(unsigned long*)&ltdl_NSAddImage);
-      err = _dyld_func_lookup("__dyld_NSLookupSymbolInImage",(unsigned long*)&ltdl_NSLookupSymbolInImage);
-      err = _dyld_func_lookup("__dyld_NSIsSymbolNameDefinedInImage",(unsigned long*)&ltdl_NSIsSymbolNameDefinedInImage);
-      err = _dyld_func_lookup("__dyld_NSMakePrivateModulePublic",(unsigned long*)&ltdl_NSMakePrivateModulePublic);
-    }
- return retCode;
+  int retCode = 0;
+  int err = 0;
+  if (!_dyld_present ())
+    {
+      retCode = 1;
+    }
+  else
+    {
+      err =
+        _dyld_func_lookup ("__dyld_NSAddImage",
+                           (unsigned long *) &ltdl_NSAddImage);
+      err =
+        _dyld_func_lookup ("__dyld_NSLookupSymbolInImage",
+                           (unsigned long *) &ltdl_NSLookupSymbolInImage);
+      err =
+        _dyld_func_lookup ("__dyld_NSIsSymbolNameDefinedInImage",
+                           (unsigned long *)
+                           &ltdl_NSIsSymbolNameDefinedInImage);
+      err =
+        _dyld_func_lookup ("__dyld_NSMakePrivateModulePublic",
+                           (unsigned long *) &ltdl_NSMakePrivateModulePublic);
+    }
+  return retCode;
 }
 
 static lt_module
@@ -1775,35 +1815,38 @@ sys_dyld_open (loader_data, filename)
      lt_user_data loader_data;
      const char *filename;
 {
-        lt_module   module   = 0;
-        NSObjectFileImage ofi = 0;
-        NSObjectFileImageReturnCode ofirc;
-
-        if (!filename)
-                return (lt_module)-1;
-        ofirc = NSCreateObjectFileImageFromFile(filename, &ofi);
-        switch (ofirc)
-        {
-                case NSObjectFileImageSuccess:
-                        module = NSLinkModule(ofi, filename,
-                                                NSLINKMODULE_OPTION_RETURN_ON_ERROR
-                                                 | NSLINKMODULE_OPTION_PRIVATE
-                                                 | NSLINKMODULE_OPTION_BINDNOW);
-                        NSDestroyObjectFileImage(ofi);
-                        if (module)
-                                ltdl_NSMakePrivateModulePublic(module);
-                        break;
-                case NSObjectFileImageInappropriateFile:
-                    if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-                    {
-                                module = (lt_module)ltdl_NSAddImage(filename, NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-                                break;
-                        }
-                default:
-                        LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
-                        return 0;
-        }
-        if (!module) LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_OPEN)));
+  lt_module module = 0;
+  NSObjectFileImage ofi = 0;
+  NSObjectFileImageReturnCode ofirc;
+
+  if (!filename)
+    return (lt_module) - 1;
+  ofirc = NSCreateObjectFileImageFromFile (filename, &ofi);
+  switch (ofirc)
+    {
+    case NSObjectFileImageSuccess:
+      module = NSLinkModule (ofi, filename,
+                             NSLINKMODULE_OPTION_RETURN_ON_ERROR
+                             | NSLINKMODULE_OPTION_PRIVATE
+                             | NSLINKMODULE_OPTION_BINDNOW);
+      NSDestroyObjectFileImage (ofi);
+      if (module)
+        ltdl_NSMakePrivateModulePublic (module);
+      break;
+    case NSObjectFileImageInappropriateFile:
+      if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
+        {
+          module =
+            (lt_module) ltdl_NSAddImage (filename,
+                                         NSADDIMAGE_OPTION_RETURN_ON_ERROR);
+          break;
+        }
+    default:
+      LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
+      return 0;
+    }
+  if (!module)
+    LT_DLMUTEX_SETERROR (lt_int_dyld_error (LT_DLSTRERROR (CANNOT_OPEN)));
   return module;
 }
 
@@ -1812,43 +1855,45 @@ sys_dyld_close (loader_data, module)
      lt_user_data loader_data;
      lt_module module;
 {
-        int retCode = 0;
-        int flags = 0;
-        if (module == (lt_module)-1) return 0;
+  int retCode = 0;
+  int flags = 0;
+  if (module == (lt_module) - 1)
+    return 0;
 #ifdef __BIG_ENDIAN__
-        if (((struct mach_header *)module)->magic == MH_MAGIC)
+  if (((struct mach_header *) module)->magic == MH_MAGIC)
 #else
-    if (((struct mach_header *)module)->magic == MH_CIGAM)
+  if (((struct mach_header *) module)->magic == MH_CIGAM)
 #endif
-        {
-          LT_DLMUTEX_SETERROR("Can not close a dylib");
-          retCode = 1;
-        }
-        else
-        {
+    {
+      LT_DLMUTEX_SETERROR ("Can not close a dylib");
+      retCode = 1;
+    }
+  else
+    {
 #if 1
 /* Currently, if a module contains c++ static destructors and it is unloaded, we
    get a segfault in atexit(), due to compiler and dynamic loader differences of
    opinion, this works around that.
 */
-                if ((const struct section *)NULL !=
-                   getsectbynamefromheader(lt_int_dyld_get_mach_header_from_nsmodule(module),
-                   "__DATA","__mod_term_func"))
-                {
-                        flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
-                }
+      if ((const struct section *) NULL !=
+          getsectbynamefromheader (lt_int_dyld_get_mach_header_from_nsmodule
+                                   (module), "__DATA", "__mod_term_func"))
+        {
+          flags += NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED;
+        }
 #endif
 #ifdef __ppc__
-                        flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
+      flags += NSUNLINKMODULE_OPTION_RESET_LAZY_REFERENCES;
 #endif
-                if (!NSUnLinkModule(module,flags))
-                {
-                        retCode=1;
-                        LT_DLMUTEX_SETERROR (lt_int_dyld_error(LT_DLSTRERROR(CANNOT_CLOSE)));
-                }
-        }
-
- return retCode;
+      if (!NSUnLinkModule (module, flags))
+        {
+          retCode = 1;
+          LT_DLMUTEX_SETERROR (lt_int_dyld_error
+                               (LT_DLSTRERROR (CANNOT_CLOSE)));
+        }
+    }
+
+  return retCode;
 }
 
 static lt_ptr
@@ -1857,52 +1902,57 @@ sys_dyld_sym (loader_data, module, symbol)
      lt_module module;
      const char *symbol;
 {
-        lt_ptr address = 0;
-        NSSymbol *nssym = 0;
-        void *unused;
-        const struct mach_header *mh=NULL;
-        char saveError[256] = "Symbol not found";
-        if (module == (lt_module)-1)
-        {
-                _dyld_lookup_and_bind(symbol,(unsigned long*)&address,&unused);
-                return address;
-        }
+  lt_ptr address = 0;
+  NSSymbol *nssym = 0;
+  void *unused;
+  const struct mach_header *mh = NULL;
+  char saveError[256] = "Symbol not found";
+  if (module == (lt_module) - 1)
+    {
+      _dyld_lookup_and_bind (symbol, (unsigned long *) &address, &unused);
+      return address;
+    }
 #ifdef __BIG_ENDIAN__
-        if (((struct mach_header *)module)->magic == MH_MAGIC)
+  if (((struct mach_header *) module)->magic == MH_MAGIC)
 #else
-    if (((struct mach_header *)module)->magic == MH_CIGAM)
+  if (((struct mach_header *) module)->magic == MH_CIGAM)
 #endif
-        {
-            if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
-            {
-                mh=module;
-                        if (ltdl_NSIsSymbolNameDefinedInImage((struct mach_header*)module,symbol))
-                        {
-                                nssym = ltdl_NSLookupSymbolInImage((struct mach_header*)module,
-                                                                                        symbol,
-                                                                                        NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
-                                                                                        | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR
-                                                                                        );
-                        }
-            }
-
-        }
-  else {
-        nssym = NSLookupSymbolInModule(module, symbol);
-        }
-        if (!nssym)
-        {
-                strncpy(saveError, lt_int_dyld_error(LT_DLSTRERROR(SYMBOL_NOT_FOUND)), 255);
-                saveError[255] = 0;
-                if (!mh) mh=lt_int_dyld_get_mach_header_from_nsmodule(module);
-                nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs(symbol,mh);
-        }
-        if (!nssym)
-        {
-                LT_DLMUTEX_SETERROR (saveError);
-                return NULL;
-        }
-        return NSAddressOfSymbol(nssym);
+    {
+      if (ltdl_NSIsSymbolNameDefinedInImage && ltdl_NSLookupSymbolInImage)
+        {
+          mh = module;
+          if (ltdl_NSIsSymbolNameDefinedInImage
+              ((struct mach_header *) module, symbol))
+            {
+              nssym =
+                ltdl_NSLookupSymbolInImage ((struct mach_header *) module,
+                                            symbol,
+                                            NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_NOW
+                                            |
+                                            NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+            }
+        }
+
+    }
+  else
+    {
+      nssym = NSLookupSymbolInModule (module, symbol);
+    }
+  if (!nssym)
+    {
+      strncpy (saveError,
+               lt_int_dyld_error (LT_DLSTRERROR (SYMBOL_NOT_FOUND)), 255);
+      saveError[255] = 0;
+      if (!mh)
+        mh = lt_int_dyld_get_mach_header_from_nsmodule (module);
+      nssym = lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh);
+    }
+  if (!nssym)
+    {
+      LT_DLMUTEX_SETERROR (saveError);
+      return NULL;
+    }
+  return NSAddressOfSymbol (nssym);
 }
 
 static struct lt_user_dlloader sys_dyld =
@@ -1910,8 +1960,8 @@ static struct lt_user_dlloader sys_dyld =
 
 
 #endif /* HAVE_DYLD */
-
 
+
 /* --- DLPREOPEN() INTERFACE LOADER --- */
 
 
@@ -1919,12 +1969,12 @@ static struct lt_user_dlloader sys_dyld =
 
 typedef struct lt_dlsymlists_t
 {
-  struct lt_dlsymlists_t       *next;
-  const lt_dlsymlist           *syms;
+  struct lt_dlsymlists_t *next;
+  const lt_dlsymlist *syms;
 } lt_dlsymlists_t;
 
-static  const lt_dlsymlist     *default_preloaded_symbols       = 0;
-static  lt_dlsymlists_t        *preloaded_symbols               = 0;
+static const lt_dlsymlist *default_preloaded_symbols = 0;
+static lt_dlsymlists_t *preloaded_symbols = 0;
 
 static int
 presym_init (loader_data)
@@ -1955,7 +2005,7 @@ presym_free_symlists ()
   lists = preloaded_symbols;
   while (lists)
     {
-      lt_dlsymlists_t   *tmp = lists;
+      lt_dlsymlists_t *tmp = lists;
 
       lists = lists->next;
       LT_DLFREE (tmp);
@@ -1981,7 +2031,7 @@ presym_add_symlist (preloaded)
 {
   lt_dlsymlists_t *tmp;
   lt_dlsymlists_t *lists;
-  int              errors   = 0;
+  int errors = 0;
 
   LT_DLMUTEX_LOCK ();
 
@@ -1989,16 +2039,16 @@ presym_add_symlist (preloaded)
   while (lists)
     {
       if (lists->syms == preloaded)
-        {
-          goto done;
-        }
+        {
+          goto done;
+        }
       lists = lists->next;
     }
 
   tmp = LT_EMALLOC (lt_dlsymlists_t, 1);
   if (tmp)
     {
-      memset (tmp, 0, sizeof(lt_dlsymlists_t));
+      memset (tmp, 0, sizeof (lt_dlsymlists_t));
       tmp->syms = preloaded;
       tmp->next = preloaded_symbols;
       preloaded_symbols = tmp;
@@ -2008,7 +2058,7 @@ presym_add_symlist (preloaded)
       ++errors;
     }
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
   return errors;
 }
@@ -2019,7 +2069,7 @@ presym_open (loader_data, filename)
      const char *filename;
 {
   lt_dlsymlists_t *lists;
-  lt_module        module = (lt_module) 0;
+  lt_module module = (lt_module) 0;
 
   LT_DLMUTEX_LOCK ();
   lists = preloaded_symbols;
@@ -2044,21 +2094,21 @@ presym_open (loader_data, filename)
       const lt_dlsymlist *syms = lists->syms;
 
       while (syms->name)
-        {
-          if (!syms->address && strcmp(syms->name, filename) == 0)
-            {
-              module = (lt_module) syms;
-              goto done;
-            }
-          ++syms;
-        }
+        {
+          if (!syms->address && strcmp (syms->name, filename) == 0)
+            {
+              module = (lt_module) syms;
+              goto done;
+            }
+          ++syms;
+        }
 
       lists = lists->next;
     }
 
   LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
   return module;
 }
@@ -2079,18 +2129,18 @@ presym_sym (loader_data, module, symbol)
      lt_module module;
      const char *symbol;
 {
-  lt_dlsymlist *syms = (lt_dlsymlist*) module;
+  lt_dlsymlist *syms = (lt_dlsymlist *) module;
 
   ++syms;
   while (syms->address)
     {
-      if (strcmp(syms->name, symbol) == 0)
-        {
-          return syms->address;
-        }
+      if (strcmp (syms->name, symbol) == 0)
+        {
+          return syms->address;
+        }
 
-    ++syms;
-  }
+      ++syms;
+    }
 
   LT_DLMUTEX_SETERROR (LT_DLSTRERROR (SYMBOL_NOT_FOUND));
 
@@ -2100,88 +2150,80 @@ presym_sym (loader_data, module, symbol)
 static struct lt_user_dlloader presym = {
   0, presym_open, presym_close, presym_sym, presym_exit, 0
 };
+
 
 
 
 
-
 /* --- DYNAMIC MODULE LOADING --- */
 
 
 /* The type of a function used at each iteration of  foreach_dirinpath().  */
-typedef int     foreach_callback_func LT_PARAMS((char *filename, lt_ptr data1,
-                                                 lt_ptr data2));
-
-static  int     foreach_dirinpath     LT_PARAMS((const char *search_path,
-                                                 const char *base_name,
-                                                 foreach_callback_func *func,
-                                                 lt_ptr data1, lt_ptr data2));
-
-static  int     find_file_callback    LT_PARAMS((char *filename, lt_ptr data,
-                                                 lt_ptr ignored));
-static  int     find_handle_callback  LT_PARAMS((char *filename, lt_ptr data,
-                                                 lt_ptr ignored));
-static  int     foreachfile_callback  LT_PARAMS((char *filename, lt_ptr data1,
-                                                 lt_ptr data2));
-
-
-static  int     canonicalize_path     LT_PARAMS((const char *path,
-                                                 char **pcanonical));
-static  int     argzize_path          LT_PARAMS((const char *path,
-                                                 char **pargz,
-                                                 size_t *pargz_len));
-static  FILE   *find_file             LT_PARAMS((const char *search_path,
-                                                 const char *base_name,
-                                                 char **pdir));
-static  lt_dlhandle *find_handle      LT_PARAMS((const char *search_path,
-                                                 const char *base_name,
-                                                 lt_dlhandle *handle));
-static  int     find_module           LT_PARAMS((lt_dlhandle *handle,
-                                                 const char *dir,
-                                                 const char *libdir,
-                                                 const char *dlname,
-                                                 const char *old_name,
-                                                 int installed));
-static  int     free_vars             LT_PARAMS((char *dlname, char *oldname,
-                                                 char *libdir, char *deplibs));
-static  int     load_deplibs          LT_PARAMS((lt_dlhandle handle,
-                                                 char *deplibs));
-static  int     trim                  LT_PARAMS((char **dest,
-                                                 const char *str));
-static  int     try_dlopen            LT_PARAMS((lt_dlhandle *handle,
-                                                 const char *filename));
-static  int     tryall_dlopen         LT_PARAMS((lt_dlhandle *handle,
-                                                 const char *filename));
-static  int     unload_deplibs        LT_PARAMS((lt_dlhandle handle));
-static  int     lt_argz_insert        LT_PARAMS((char **pargz,
-                                                 size_t *pargz_len,
-                                                 char *before,
-                                                 const char *entry));
-static  int     lt_argz_insertinorder LT_PARAMS((char **pargz,
-                                                 size_t *pargz_len,
-                                                 const char *entry));
-static  int     lt_argz_insertdir     LT_PARAMS((char **pargz,
-                                                 size_t *pargz_len,
-                                                 const char *dirnam,
-                                                 struct dirent *dp));
-static  int     lt_dlpath_insertdir   LT_PARAMS((char **ppath,
-                                                 char *before,
-                                                 const char *dir));
-static  int     list_files_by_dir     LT_PARAMS((const char *dirnam,
-                                                 char **pargz,
-                                                 size_t *pargz_len));
-static  int     file_not_found        LT_PARAMS((void));
-
-static  char           *user_search_path= 0;
-static  lt_dlloader    *loaders         = 0;
-static  lt_dlhandle     handles         = 0;
-static  int             initialized     = 0;
+typedef int foreach_callback_func LT_PARAMS ((char *filename, lt_ptr data1,
+                                              lt_ptr data2));
+
+static int foreach_dirinpath LT_PARAMS ((const char *search_path,
+                                         const char *base_name,
+                                         foreach_callback_func * func,
+                                         lt_ptr data1, lt_ptr data2));
+
+static int find_file_callback LT_PARAMS ((char *filename, lt_ptr data,
+                                          lt_ptr ignored));
+static int find_handle_callback LT_PARAMS ((char *filename, lt_ptr data,
+                                            lt_ptr ignored));
+static int foreachfile_callback LT_PARAMS ((char *filename, lt_ptr data1,
+                                            lt_ptr data2));
+
+
+static int canonicalize_path LT_PARAMS ((const char *path,
+                                         char **pcanonical));
+static int argzize_path LT_PARAMS ((const char *path,
+                                    char **pargz, size_t * pargz_len));
+static FILE *find_file LT_PARAMS ((const char *search_path,
+                                   const char *base_name, char **pdir));
+static lt_dlhandle *find_handle LT_PARAMS ((const char *search_path,
+                                            const char *base_name,
+                                            lt_dlhandle * handle));
+static int find_module LT_PARAMS ((lt_dlhandle * handle,
+                                   const char *dir,
+                                   const char *libdir,
+                                   const char *dlname,
+                                   const char *old_name, int installed));
+static int free_vars LT_PARAMS ((char *dlname, char *oldname,
+                                 char *libdir, char *deplibs));
+static int load_deplibs LT_PARAMS ((lt_dlhandle handle, char *deplibs));
+static int trim LT_PARAMS ((char **dest, const char *str));
+static int try_dlopen LT_PARAMS ((lt_dlhandle * handle,
+                                  const char *filename));
+static int tryall_dlopen LT_PARAMS ((lt_dlhandle * handle,
+                                     const char *filename));
+static int unload_deplibs LT_PARAMS ((lt_dlhandle handle));
+static int lt_argz_insert LT_PARAMS ((char **pargz,
+                                      size_t * pargz_len,
+                                      char *before, const char *entry));
+static int lt_argz_insertinorder LT_PARAMS ((char **pargz,
+                                             size_t * pargz_len,
+                                             const char *entry));
+static int lt_argz_insertdir LT_PARAMS ((char **pargz,
+                                         size_t * pargz_len,
+                                         const char *dirnam,
+                                         struct dirent * dp));
+static int lt_dlpath_insertdir LT_PARAMS ((char **ppath,
+                                           char *before, const char *dir));
+static int list_files_by_dir LT_PARAMS ((const char *dirnam,
+                                         char **pargz, size_t * pargz_len));
+static int file_not_found LT_PARAMS ((void));
+
+static char *user_search_path = 0;
+static lt_dlloader *loaders = 0;
+static lt_dlhandle handles = 0;
+static int initialized = 0;
 
 /* Initialize libltdl. */
 int
 lt_dlinit ()
 {
-  int         errors   = 0;
+  int errors = 0;
 
   LT_DLMUTEX_LOCK ();
 
@@ -2189,7 +2231,7 @@ lt_dlinit ()
   if (++initialized == 1)
     {
       handles = 0;
-      user_search_path = 0; /* empty search path */
+      user_search_path = 0;     /* empty search path */
 
 #if HAVE_LIBDL
       errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dl, "dlopen");
@@ -2207,21 +2249,21 @@ lt_dlinit ()
       errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dld, "dld");
 #endif
 #if HAVE_DYLD
-       errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
-       errors += sys_dyld_init();
+      errors += lt_dlloader_add (lt_dlloader_next (0), &sys_dyld, "dyld");
+      errors += sys_dyld_init ();
 #endif
       errors += lt_dlloader_add (lt_dlloader_next (0), &presym, "dlpreload");
 
       if (presym_init (presym.dlloader_data))
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
-          ++errors;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INIT_LOADER));
+          ++errors;
+        }
       else if (errors != 0)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
-          ++errors;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (DLOPEN_NOT_SUPPORTED));
+          ++errors;
+        }
     }
 
   LT_DLMUTEX_UNLOCK ();
@@ -2241,13 +2283,13 @@ lt_dlpreload (preloaded)
     }
   else
     {
-      presym_free_symlists();
+      presym_free_symlists ();
 
       LT_DLMUTEX_LOCK ();
       if (default_preloaded_symbols)
-        {
-          errors = lt_dlpreload (default_preloaded_symbols);
-        }
+        {
+          errors = lt_dlpreload (default_preloaded_symbols);
+        }
       LT_DLMUTEX_UNLOCK ();
     }
 
@@ -2269,7 +2311,7 @@ lt_dlexit ()
 {
   /* shut down libltdl */
   lt_dlloader *loader;
-  int          errors   = 0;
+  int errors = 0;
 
   LT_DLMUTEX_LOCK ();
   loader = loaders;
@@ -2284,54 +2326,54 @@ lt_dlexit ()
   /* shut down only at last call. */
   if (--initialized == 0)
     {
-      int       level;
+      int level;
 
       while (handles && LT_DLIS_RESIDENT (handles))
-        {
-          handles = handles->next;
-        }
+        {
+          handles = handles->next;
+        }
 
       /* close all modules */
       for (level = 1; handles; ++level)
-        {
-          lt_dlhandle cur = handles;
-          int saw_nonresident = 0;
-
-          while (cur)
-            {
-              lt_dlhandle tmp = cur;
-              cur = cur->next;
-              if (!LT_DLIS_RESIDENT (tmp))
-                saw_nonresident = 1;
-              if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
-                {
-                  if (lt_dlclose (tmp))
-                    {
-                      ++errors;
-                    }
-                }
-            }
-          /* done if only resident modules are left */
-          if (!saw_nonresident)
-            break;
-        }
+        {
+          lt_dlhandle cur = handles;
+          int saw_nonresident = 0;
+
+          while (cur)
+            {
+              lt_dlhandle tmp = cur;
+              cur = cur->next;
+              if (!LT_DLIS_RESIDENT (tmp))
+                saw_nonresident = 1;
+              if (!LT_DLIS_RESIDENT (tmp) && tmp->info.ref_count <= level)
+                {
+                  if (lt_dlclose (tmp))
+                    {
+                      ++errors;
+                    }
+                }
+            }
+          /* done if only resident modules are left */
+          if (!saw_nonresident)
+            break;
+        }
 
       /* close all loaders */
       while (loader)
-        {
-          lt_dlloader *next = loader->next;
-          lt_user_data data = loader->dlloader_data;
-          if (loader->dlloader_exit && loader->dlloader_exit (data))
-            {
-              ++errors;
-            }
-
-          LT_DLMEM_REASSIGN (loader, next);
-        }
+        {
+          lt_dlloader *next = loader->next;
+          lt_user_data data = loader->dlloader_data;
+          if (loader->dlloader_exit && loader->dlloader_exit (data))
+            {
+              ++errors;
+            }
+
+          LT_DLMEM_REASSIGN (loader, next);
+        }
       loaders = 0;
     }
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
   return errors;
 }
@@ -2341,15 +2383,15 @@ tryall_dlopen (handle, filename)
      lt_dlhandle *handle;
      const char *filename;
 {
-  lt_dlhandle    cur;
-  lt_dlloader   *loader;
-  const char    *saved_error;
-  int            errors         = 0;
+  lt_dlhandle cur;
+  lt_dlloader *loader;
+  const char *saved_error;
+  int errors = 0;
 
   LT_DLMUTEX_GETERROR (saved_error);
   LT_DLMUTEX_LOCK ();
 
-  cur    = handles;
+  cur = handles;
   loader = loaders;
 
   /* check whether the module was already opened */
@@ -2357,15 +2399,15 @@ tryall_dlopen (handle, filename)
     {
       /* try to dlopen the program itself? */
       if (!cur->info.filename && !filename)
-        {
-          break;
-        }
+        {
+          break;
+        }
 
       if (cur->info.filename && filename
-          && strcmp (cur->info.filename, filename) == 0)
-        {
-          break;
-        }
+          && strcmp (cur->info.filename, filename) == 0)
+        {
+          break;
+        }
 
       cur = cur->next;
     }
@@ -2381,23 +2423,23 @@ tryall_dlopen (handle, filename)
   if (filename)
     {
       /* Comment out the check of file permissions using access.
-         This call seems to always return -1 with error EACCES.
-      */
+         This call seems to always return -1 with error EACCES.
+       */
       /* We need to catch missing file errors early so that
-         file_not_found() can detect what happened.
-      if (access (filename, R_OK) != 0)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-          ++errors;
-          goto done;
-        } */
+         file_not_found() can detect what happened.
+         if (access (filename, R_OK) != 0)
+         {
+         LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+         ++errors;
+         goto done;
+         } */
 
       cur->info.filename = lt_estrdup (filename);
       if (!cur->info.filename)
-        {
-          ++errors;
-          goto done;
-        }
+        {
+          ++errors;
+          goto done;
+        }
     }
   else
     {
@@ -2411,9 +2453,9 @@ tryall_dlopen (handle, filename)
       cur->module = loader->module_open (data, filename);
 
       if (cur->module != 0)
-        {
-          break;
-        }
+        {
+          break;
+        }
       loader = loader->next;
     }
 
@@ -2424,10 +2466,10 @@ tryall_dlopen (handle, filename)
       goto done;
     }
 
-  cur->loader   = loader;
+  cur->loader = loader;
   LT_DLMUTEX_SETERROR (saved_error);
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
 
   return errors;
@@ -2440,10 +2482,10 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
      const char *dirname;
      const char *dlname;
 {
-  int      error        = 0;
-  char     *filename    = 0;
-  size_t   filename_len = 0;
-  size_t   dirname_len  = LT_STRLEN (dirname);
+  int error = 0;
+  char *filename = 0;
+  size_t filename_len = 0;
+  size_t dirname_len = LT_STRLEN (dirname);
 
   assert (handle);
   assert (dirname);
@@ -2455,13 +2497,13 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
 #endif
 
   if (dirname_len > 0)
-    if (dirname[dirname_len -1] == '/')
+    if (dirname[dirname_len - 1] == '/')
       --dirname_len;
   filename_len = dirname_len + 1 + LT_STRLEN (dlname);
 
   /* Allocate memory, and combine DIRNAME and MODULENAME into it.
      The PREFIX (if any) is handled below.  */
-  filename  = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
+  filename = LT_EMALLOC (char, dirname_len + 1 + filename_len + 1);
   if (!filename)
     return 1;
 
@@ -2473,7 +2515,7 @@ tryall_dlopen_module (handle, prefix, dirname, dlname)
   if (prefix)
     {
       error += tryall_dlopen_module (handle,
-                                     (const char *) 0, prefix, filename);
+                                     (const char *) 0, prefix, filename);
     }
   else if (tryall_dlopen (handle, filename) != 0)
     {
@@ -2506,24 +2548,23 @@ find_module (handle, dir, libdir, dlname, old_name, installed)
     {
       /* try to open the installed module */
       if (installed && libdir)
-        {
-          if (tryall_dlopen_module (handle,
-                                    (const char *) 0, libdir, dlname) == 0)
-            return 0;
-        }
+        {
+          if (tryall_dlopen_module (handle,
+                                    (const char *) 0, libdir, dlname) == 0)
+            return 0;
+        }
 
       /* try to open the not-installed module */
       if (!installed)
-        {
-          if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
-            return 0;
-        }
+        {
+          if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
+            return 0;
+        }
 
       /* maybe it was moved to another directory */
       {
-          if (tryall_dlopen_module (handle,
-                                    (const char *) 0, dir, dlname) == 0)
-            return 0;
+        if (tryall_dlopen_module (handle, (const char *) 0, dir, dlname) == 0)
+          return 0;
       }
     }
 
@@ -2541,7 +2582,7 @@ canonicalize_path (path, pcanonical)
   assert (path && *path);
   assert (pcanonical);
 
-  canonical = LT_EMALLOC (char, 1+ LT_STRLEN (path));
+  canonical = LT_EMALLOC (char, 1 + LT_STRLEN (path));
   if (!canonical)
     return 1;
 
@@ -2550,38 +2591,38 @@ canonicalize_path (path, pcanonical)
     size_t src;
     for (src = 0; path[src] != LT_EOS_CHAR; ++src)
       {
-        /* Path separators are not copied to the beginning or end of
-           the destination, or if another separator would follow
-           immediately.  */
-        if (path[src] == LT_PATHSEP_CHAR)
-          {
-            if ((dest == 0)
-                || (path[1+ src] == LT_PATHSEP_CHAR)
-                || (path[1+ src] == LT_EOS_CHAR))
-              continue;
-          }
-
-        /* Anything other than a directory separator is copied verbatim.  */
-        if ((path[src] != '/')
+        /* Path separators are not copied to the beginning or end of
+           the destination, or if another separator would follow
+           immediately.  */
+        if (path[src] == LT_PATHSEP_CHAR)
+          {
+            if ((dest == 0)
+                || (path[1 + src] == LT_PATHSEP_CHAR)
+                || (path[1 + src] == LT_EOS_CHAR))
+              continue;
+          }
+
+        /* Anything other than a directory separator is copied verbatim.  */
+        if ((path[src] != '/')
 #ifdef LT_DIRSEP_CHAR
-            && (path[src] != LT_DIRSEP_CHAR)
+            && (path[src] != LT_DIRSEP_CHAR)
 #endif
-            )
-          {
-            canonical[dest++] = path[src];
-          }
-        /* Directory separators are converted and copied only if they are
-           not at the end of a path -- i.e. before a path separator or
-           NULL terminator.  */
-        else if ((path[1+ src] != LT_PATHSEP_CHAR)
-                 && (path[1+ src] != LT_EOS_CHAR)
+          )
+          {
+            canonical[dest++] = path[src];
+          }
+        /* Directory separators are converted and copied only if they are
+           not at the end of a path -- i.e. before a path separator or
+           NULL terminator.  */
+        else if ((path[1 + src] != LT_PATHSEP_CHAR)
+                 && (path[1 + src] != LT_EOS_CHAR)
 #ifdef LT_DIRSEP_CHAR
-                 && (path[1+ src] != LT_DIRSEP_CHAR)
+                 && (path[1 + src] != LT_DIRSEP_CHAR)
 #endif
-                 && (path[1+ src] != '/'))
-          {
-            canonical[dest++] = '/';
-          }
+                 && (path[1 + src] != '/'))
+          {
+            canonical[dest++] = '/';
+          }
       }
 
     /* Add an end-of-string marker at the end.  */
@@ -2609,14 +2650,14 @@ argzize_path (path, pargz, pargz_len)
   if ((error = argz_create_sep (path, LT_PATHSEP_CHAR, pargz, pargz_len)))
     {
       switch (error)
-        {
-        case ENOMEM:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-          break;
-        default:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-          break;
-        }
+        {
+        case ENOMEM:
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+          break;
+        default:
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+          break;
+        }
 
       return 1;
     }
@@ -2636,13 +2677,13 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
      lt_ptr data1;
      lt_ptr data2;
 {
-  int    result         = 0;
-  int    filenamesize   = 0;
-  size_t lenbase        = LT_STRLEN (base_name);
-  size_t argz_len       = 0;
-  char *argz            = 0;
-  char *filename        = 0;
-  char *canonical       = 0;
+  int result = 0;
+  int filenamesize = 0;
+  size_t lenbase = LT_STRLEN (base_name);
+  size_t argz_len = 0;
+  char *argz = 0;
+  char *filename = 0;
+  char *canonical = 0;
 
   LT_DLMUTEX_LOCK ();
 
@@ -2662,35 +2703,35 @@ foreach_dirinpath (search_path, base_name, func, data1, data2)
     char *dir_name = 0;
     while ((dir_name = argz_next (argz, argz_len, dir_name)))
       {
-        size_t lendir = LT_STRLEN (dir_name);
-
-        if (lendir +1 +lenbase >= filenamesize)
-        {
-          LT_DLFREE (filename);
-          filenamesize  = lendir +1 +lenbase +1; /* "/d" + '/' + "f" + '\0' */
-          filename      = LT_EMALLOC (char, filenamesize);
-          if (!filename)
-            goto cleanup;
-        }
-
-        assert (filenamesize > lendir);
-        strcpy (filename, dir_name);
-
-        if (base_name && *base_name)
-          {
-            if (filename[lendir -1] != '/')
-              filename[lendir++] = '/';
-            strcpy (filename +lendir, base_name);
-          }
-
-        if ((result = (*func) (filename, data1, data2)))
-          {
-            break;
-          }
+        size_t lendir = LT_STRLEN (dir_name);
+
+        if (lendir + 1 + lenbase >= filenamesize)
+          {
+            LT_DLFREE (filename);
+            filenamesize = lendir + 1 + lenbase + 1;    /* "/d" + '/' + "f" + '\0' */
+            filename = LT_EMALLOC (char, filenamesize);
+            if (!filename)
+              goto cleanup;
+          }
+
+        assert (filenamesize > lendir);
+        strcpy (filename, dir_name);
+
+        if (base_name && *base_name)
+          {
+            if (filename[lendir - 1] != '/')
+              filename[lendir++] = '/';
+            strcpy (filename + lendir, base_name);
+          }
+
+        if ((result = (*func) (filename, data1, data2)))
+          {
+            break;
+          }
       }
   }
 
- cleanup:
+cleanup:
   LT_DLFREE (argz);
   LT_DLFREE (canonical);
   LT_DLFREE (filename);
@@ -2709,9 +2750,9 @@ find_file_callback (filename, data1, data2)
      lt_ptr data1;
      lt_ptr data2;
 {
-  char       **pdir     = (char **) data1;
-  FILE       **pfile    = (FILE **) data2;
-  int        is_done    = 0;
+  char **pdir = (char **) data1;
+  FILE **pfile = (FILE **) data2;
+  int is_done = 0;
 
   assert (filename && *filename);
   assert (pdir);
@@ -2722,10 +2763,10 @@ find_file_callback (filename, data1, data2)
       char *dirend = strrchr (filename, '/');
 
       if (dirend > filename)
-        *dirend   = LT_EOS_CHAR;
+        *dirend = LT_EOS_CHAR;
 
       LT_DLFREE (*pdir);
-      *pdir   = lt_estrdup (filename);
+      *pdir = lt_estrdup (filename);
       is_done = (*pdir == 0) ? -1 : 1;
     }
 
@@ -2751,8 +2792,8 @@ find_handle_callback (filename, data, ignored)
      lt_ptr data;
      lt_ptr ignored;
 {
-  lt_dlhandle  *handle          = (lt_dlhandle *) data;
-  int           notfound        = access (filename, R_OK);
+  lt_dlhandle *handle = (lt_dlhandle *) data;
+  int notfound = access (filename, R_OK);
 
   /* Bail out if file cannot be read...  */
   if (notfound)
@@ -2778,7 +2819,7 @@ find_handle (search_path, base_name, handle)
     return 0;
 
   if (!foreach_dirinpath (search_path, base_name, find_handle_callback,
-                          handle, 0))
+                          handle, 0))
     return 0;
 
   return handle;
@@ -2790,12 +2831,12 @@ load_deplibs (handle, deplibs)
      char *deplibs;
 {
 #if LTDL_DLOPEN_DEPLIBS
-  char  *p, *save_search_path = 0;
-  int   depcount = 0;
-  int   i;
-  char  **names = 0;
+  char *p, *save_search_path = 0;
+  int depcount = 0;
+  int i;
+  char **names = 0;
 #endif
-  int   errors = 0;
+  int errors = 0;
 
   handle->depcount = 0;
 
@@ -2811,7 +2852,7 @@ load_deplibs (handle, deplibs)
     {
       save_search_path = lt_estrdup (user_search_path);
       if (!save_search_path)
-        goto cleanup;
+        goto cleanup;
     }
 
   /* extract search paths and count deplibs */
@@ -2819,34 +2860,34 @@ load_deplibs (handle, deplibs)
   while (*p)
     {
       if (!isspace ((int) *p))
-        {
-          char *end = p+1;
-          while (*end && !isspace((int) *end))
-            {
-              ++end;
-            }
-
-          if (strncmp(p, "-L", 2) == 0 || strncmp(p, "-R", 2) == 0)
-            {
-              char save = *end;
-              *end = 0; /* set a temporary string terminator */
-              if (lt_dladdsearchdir(p+2))
-                {
-                  goto cleanup;
-                }
-              *end = save;
-            }
-          else
-            {
-              ++depcount;
-            }
-
-          p = end;
-        }
+        {
+          char *end = p + 1;
+          while (*end && !isspace ((int) *end))
+            {
+              ++end;
+            }
+
+          if (strncmp (p, "-L", 2) == 0 || strncmp (p, "-R", 2) == 0)
+            {
+              char save = *end;
+              *end = 0;         /* set a temporary string terminator */
+              if (lt_dladdsearchdir (p + 2))
+                {
+                  goto cleanup;
+                }
+              *end = save;
+            }
+          else
+            {
+              ++depcount;
+            }
+
+          p = end;
+        }
       else
-        {
-          ++p;
-        }
+        {
+          ++p;
+        }
     }
 
   /* restore the old search path */
@@ -2861,7 +2902,7 @@ load_deplibs (handle, deplibs)
       goto cleanup;
     }
 
-  names = LT_EMALLOC (char *, depcount * sizeof (char*));
+  names = LT_EMALLOC (char *, depcount * sizeof (char *));
   if (!names)
     goto cleanup;
 
@@ -2871,40 +2912,40 @@ load_deplibs (handle, deplibs)
   while (*p)
     {
       if (isspace ((int) *p))
-        {
-          ++p;
-        }
+        {
+          ++p;
+        }
       else
-        {
-          char *end = p+1;
-          while (*end && !isspace ((int) *end))
-            {
-              ++end;
-            }
-
-          if (strncmp(p, "-L", 2) != 0 && strncmp(p, "-R", 2) != 0)
-            {
-              char *name;
-              char save = *end;
-              *end = 0; /* set a temporary string terminator */
-              if (strncmp(p, "-l", 2) == 0)
-                {
-                  size_t name_len = 3+ /* "lib" */ LT_STRLEN (p + 2);
-                  name = LT_EMALLOC (char, 1+ name_len);
-                  if (name)
-                    sprintf (name, "lib%s", p+2);
-                }
-              else
-                name = lt_estrdup(p);
-
-              if (!name)
-                goto cleanup_names;
-
-              names[depcount++] = name;
-              *end = save;
-            }
-          p = end;
-        }
+        {
+          char *end = p + 1;
+          while (*end && !isspace ((int) *end))
+            {
+              ++end;
+            }
+
+          if (strncmp (p, "-L", 2) != 0 && strncmp (p, "-R", 2) != 0)
+            {
+              char *name;
+              char save = *end;
+              *end = 0;         /* set a temporary string terminator */
+              if (strncmp (p, "-l", 2) == 0)
+                {
+                  size_t name_len = 3 + /* "lib" */ LT_STRLEN (p + 2);
+                  name = LT_EMALLOC (char, 1 + name_len);
+                  if (name)
+                    sprintf (name, "lib%s", p + 2);
+                }
+              else
+                name = lt_estrdup (p);
+
+              if (!name)
+                goto cleanup_names;
+
+              names[depcount++] = name;
+              *end = save;
+            }
+          p = end;
+        }
     }
 
   /* load the deplibs (in reverse order)
@@ -2914,32 +2955,32 @@ load_deplibs (handle, deplibs)
      later on if the loaded module cannot resolve all of its symbols.  */
   if (depcount)
     {
-      int       j = 0;
+      int j = 0;
 
-      handle->deplibs = (lt_dlhandle*) LT_EMALLOC (lt_dlhandle *, depcount);
+      handle->deplibs = (lt_dlhandle *) LT_EMALLOC (lt_dlhandle *, depcount);
       if (!handle->deplibs)
-        goto cleanup;
+        goto cleanup;
 
       for (i = 0; i < depcount; ++i)
-        {
-          handle->deplibs[j] = lt_dlopenext(names[depcount-1-i]);
-          if (handle->deplibs[j])
-            {
-              ++j;
-            }
-        }
+        {
+          handle->deplibs[j] = lt_dlopenext (names[depcount - 1 - i]);
+          if (handle->deplibs[j])
+            {
+              ++j;
+            }
+        }
 
-      handle->depcount  = j;    /* Number of successfully loaded deplibs */
-      errors            = 0;
+      handle->depcount = j;     /* Number of successfully loaded deplibs */
+      errors = 0;
     }
 
- cleanup_names:
+cleanup_names:
   for (i = 0; i < depcount; ++i)
     {
       LT_DLFREE (names[i]);
     }
 
- cleanup:
+cleanup:
   LT_DLFREE (names);
 #endif
 
@@ -2956,12 +2997,12 @@ unload_deplibs (handle)
   if (handle->depcount)
     {
       for (i = 0; i < handle->depcount; ++i)
-        {
-          if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
-            {
-              errors += lt_dlclose (handle->deplibs[i]);
-            }
-        }
+        {
+          if (!LT_DLIS_RESIDENT (handle->deplibs[i]))
+            {
+              errors += lt_dlclose (handle->deplibs[i]);
+            }
+        }
     }
 
   return errors;
@@ -2974,8 +3015,8 @@ trim (dest, str)
 {
   /* remove the leading and trailing "'" from str
      and store the result in dest */
-  const char *end   = strrchr (str, '\'');
-  size_t len        = LT_STRLEN (str);
+  const char *end = strrchr (str, '\'');
+  size_t len = LT_STRLEN (str);
   char *tmp;
 
   LT_DLFREE (*dest);
@@ -2984,10 +3025,10 @@ trim (dest, str)
     {
       tmp = LT_EMALLOC (char, end - str);
       if (!tmp)
-        return 1;
+        return 1;
 
-      strncpy(tmp, &str[1], (end - str) - 1);
-      tmp[len-3] = LT_EOS_CHAR;
+      strncpy (tmp, &str[1], (end - str) - 1);
+      tmp[len - 3] = LT_EOS_CHAR;
       *dest = tmp;
     }
   else
@@ -3018,14 +3059,14 @@ try_dlopen (phandle, filename)
      lt_dlhandle *phandle;
      const char *filename;
 {
-  const char *  ext             = 0;
-  const char *  saved_error     = 0;
-  char *        canonical       = 0;
-  char *        base_name       = 0;
-  char *        dir             = 0;
-  char *        name            = 0;
-  int           errors          = 0;
-  lt_dlhandle   newhandle;
+  const char *ext = 0;
+  const char *saved_error = 0;
+  char *canonical = 0;
+  char *base_name = 0;
+  char *dir = 0;
+  char *name = 0;
+  int errors = 0;
+  lt_dlhandle newhandle;
 
   assert (phandle);
   assert (*phandle == 0);
@@ -3037,19 +3078,19 @@ try_dlopen (phandle, filename)
     {
       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
-        return 1;
+        return 1;
 
-      memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
-      newhandle = *phandle;
+      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
+      newhandle = *phandle;
 
       /* lt_dlclose()ing yourself is very bad!  Disallow it.  */
       LT_DLSET_FLAG (*phandle, LT_DLRESIDENT_FLAG);
 
       if (tryall_dlopen (&newhandle, 0) != 0)
-        {
-          LT_DLFREE (*phandle);
-          return 1;
-        }
+        {
+          LT_DLFREE (*phandle);
+          return 1;
+        }
 
       goto register_handle;
     }
@@ -3069,14 +3110,14 @@ try_dlopen (phandle, filename)
   base_name = strrchr (canonical, '/');
   if (base_name)
     {
-      size_t dirlen = (1+ base_name) - canonical;
+      size_t dirlen = (1 + base_name) - canonical;
 
-      dir = LT_EMALLOC (char, 1+ dirlen);
+      dir = LT_EMALLOC (char, 1 + dirlen);
       if (!dir)
-        {
-          ++errors;
-          goto cleanup;
-        }
+        {
+          ++errors;
+          goto cleanup;
+        }
 
       strncpy (dir, canonical, dirlen);
       dir[dirlen] = LT_EOS_CHAR;
@@ -3093,41 +3134,41 @@ try_dlopen (phandle, filename)
   if (ext && strcmp (ext, archive_ext) == 0)
     {
       /* this seems to be a libtool module */
-      FILE *    file     = 0;
-      char *    dlname   = 0;
-      char *    old_name = 0;
-      char *    libdir   = 0;
-      char *    deplibs  = 0;
-      char *    line     = 0;
-      size_t    line_len;
+      FILE *file = 0;
+      char *dlname = 0;
+      char *old_name = 0;
+      char *libdir = 0;
+      char *deplibs = 0;
+      char *line = 0;
+      size_t line_len;
 
       /* if we can't find the installed flag, it is probably an
-         installed libtool archive, produced with an old version
-         of libtool */
-      int       installed = 1;
+         installed libtool archive, produced with an old version
+         of libtool */
+      int installed = 1;
 
       /* extract the module name from the file name */
       name = LT_EMALLOC (char, ext - base_name + 1);
       if (!name)
-        {
-          ++errors;
-          goto cleanup;
-        }
+        {
+          ++errors;
+          goto cleanup;
+        }
 
       /* canonicalize the module name */
       {
         size_t i;
         for (i = 0; i < ext - base_name; ++i)
-          {
-            if (isalnum ((int)(base_name[i])))
-              {
-                name[i] = base_name[i];
-              }
-            else
-              {
-                name[i] = '_';
-              }
-          }
+          {
+            if (isalnum ((int) (base_name[i])))
+              {
+                name[i] = base_name[i];
+              }
+            else
+              {
+                name[i] = '_';
+              }
+          }
         name[ext - base_name] = LT_EOS_CHAR;
       }
 
@@ -3136,146 +3177,145 @@ try_dlopen (phandle, filename)
          prescribed paths.  Otherwise (or in any case if the module was not
          yet found) try opening just the module name as passed.  */
       if (!dir)
-        {
-          const char *search_path;
-
-          LT_DLMUTEX_LOCK ();
-          search_path = user_search_path;
-          if (search_path)
-            file = find_file (user_search_path, base_name, &dir);
-          LT_DLMUTEX_UNLOCK ();
-
-          if (!file)
-            {
-              search_path = getenv (LTDL_SEARCHPATH_VAR);
-              if (search_path)
-                file = find_file (search_path, base_name, &dir);
-            }
+        {
+          const char *search_path;
+
+          LT_DLMUTEX_LOCK ();
+          search_path = user_search_path;
+          if (search_path)
+            file = find_file (user_search_path, base_name, &dir);
+          LT_DLMUTEX_UNLOCK ();
+
+          if (!file)
+            {
+              search_path = getenv (LTDL_SEARCHPATH_VAR);
+              if (search_path)
+                file = find_file (search_path, base_name, &dir);
+            }
 
 #ifdef LTDL_SHLIBPATH_VAR
-          if (!file)
-            {
-              search_path = getenv (LTDL_SHLIBPATH_VAR);
-              if (search_path)
-                file = find_file (search_path, base_name, &dir);
-            }
+          if (!file)
+            {
+              search_path = getenv (LTDL_SHLIBPATH_VAR);
+              if (search_path)
+                file = find_file (search_path, base_name, &dir);
+            }
 #endif
 #ifdef LTDL_SYSSEARCHPATH
-          if (!file && sys_search_path)
-            {
-              file = find_file (sys_search_path, base_name, &dir);
-            }
+          if (!file && sys_search_path)
+            {
+              file = find_file (sys_search_path, base_name, &dir);
+            }
 #endif
-        }
+        }
       if (!file)
-        {
-          file = fopen (filename, LT_READTEXT_MODE);
-        }
+        {
+          file = fopen (filename, LT_READTEXT_MODE);
+        }
 
       /* If we didn't find the file by now, it really isn't there.  Set
-         the status flag, and bail out.  */
+         the status flag, and bail out.  */
       if (!file)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
-          ++errors;
-          goto cleanup;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (FILE_NOT_FOUND));
+          ++errors;
+          goto cleanup;
+        }
 
       line_len = LT_FILENAME_MAX;
       line = LT_EMALLOC (char, line_len);
       if (!line)
-        {
-          fclose (file);
-          ++errors;
-          goto cleanup;
-        }
+        {
+          fclose (file);
+          ++errors;
+          goto cleanup;
+        }
 
       /* read the .la file */
       while (!feof (file))
-        {
-          if (!fgets (line, (int) line_len, file))
-            {
-              break;
-            }
-
-          /* Handle the case where we occasionally need to read a line
-             that is longer than the initial buffer size.  */
-          while ((line[LT_STRLEN(line) -1] != '\n') && (!feof (file)))
-            {
-              line = LT_DLREALLOC (char, line, line_len *2);
-              if (!fgets (&line[line_len -1], (int) line_len +1, file))
-                {
-                  break;
-                }
-              line_len *= 2;
-            }
-
-          if (line[0] == '\n' || line[0] == '#')
-            {
-              continue;
-            }
+        {
+          if (!fgets (line, (int) line_len, file))
+            {
+              break;
+            }
+
+          /* Handle the case where we occasionally need to read a line
+             that is longer than the initial buffer size.  */
+          while ((line[LT_STRLEN (line) - 1] != '\n') && (!feof (file)))
+            {
+              line = LT_DLREALLOC (char, line, line_len * 2);
+              if (!fgets (&line[line_len - 1], (int) line_len + 1, file))
+                {
+                  break;
+                }
+              line_len *= 2;
+            }
+
+          if (line[0] == '\n' || line[0] == '#')
+            {
+              continue;
+            }
 
 #undef  STR_DLNAME
 #define STR_DLNAME      "dlname="
-          if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
-            {
-              errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
-            }
+          if (strncmp (line, STR_DLNAME, sizeof (STR_DLNAME) - 1) == 0)
+            {
+              errors += trim (&dlname, &line[sizeof (STR_DLNAME) - 1]);
+            }
 
 #undef  STR_OLD_LIBRARY
 #define STR_OLD_LIBRARY "old_library="
-          else if (strncmp (line, STR_OLD_LIBRARY,
-                            sizeof (STR_OLD_LIBRARY) - 1) == 0)
-            {
-              errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
-            }
+          else if (strncmp (line, STR_OLD_LIBRARY,
+                            sizeof (STR_OLD_LIBRARY) - 1) == 0)
+            {
+              errors += trim (&old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
+            }
 #undef  STR_LIBDIR
 #define STR_LIBDIR      "libdir="
-          else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
-            {
-              errors += trim (&libdir, &line[sizeof(STR_LIBDIR) - 1]);
-            }
+          else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
+            {
+              errors += trim (&libdir, &line[sizeof (STR_LIBDIR) - 1]);
+            }
 
 #undef  STR_DL_DEPLIBS
 #define STR_DL_DEPLIBS  "dependency_libs="
-          else if (strncmp (line, STR_DL_DEPLIBS,
-                            sizeof (STR_DL_DEPLIBS) - 1) == 0)
-            {
-              errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
-            }
-          else if (strcmp (line, "installed=yes\n") == 0)
-            {
-              installed = 1;
-            }
-          else if (strcmp (line, "installed=no\n") == 0)
-            {
-              installed = 0;
-            }
+          else if (strncmp (line, STR_DL_DEPLIBS,
+                            sizeof (STR_DL_DEPLIBS) - 1) == 0)
+            {
+              errors += trim (&deplibs, &line[sizeof (STR_DL_DEPLIBS) - 1]);
+            }
+          else if (strcmp (line, "installed=yes\n") == 0)
+            {
+              installed = 1;
+            }
+          else if (strcmp (line, "installed=no\n") == 0)
+            {
+              installed = 0;
+            }
 
 #undef  STR_LIBRARY_NAMES
 #define STR_LIBRARY_NAMES "library_names="
-          else if (! dlname && strncmp (line, STR_LIBRARY_NAMES,
-                                        sizeof (STR_LIBRARY_NAMES) - 1) == 0)
-            {
-              char *last_libname;
-              errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
-              if (!errors
-                  && dlname
-                  && (last_libname = strrchr (dlname, ' ')) != 0)
-                {
-                  last_libname = lt_estrdup (last_libname + 1);
-                  if (!last_libname)
-                    {
-                      ++errors;
-                      goto cleanup;
-                    }
-                  LT_DLMEM_REASSIGN (dlname, last_libname);
-                }
-            }
-
-          if (errors)
-            break;
-        }
+          else if (!dlname && strncmp (line, STR_LIBRARY_NAMES,
+                                       sizeof (STR_LIBRARY_NAMES) - 1) == 0)
+            {
+              char *last_libname;
+              errors += trim (&dlname, &line[sizeof (STR_LIBRARY_NAMES) - 1]);
+              if (!errors
+                  && dlname && (last_libname = strrchr (dlname, ' ')) != 0)
+                {
+                  last_libname = lt_estrdup (last_libname + 1);
+                  if (!last_libname)
+                    {
+                      ++errors;
+                      goto cleanup;
+                    }
+                  LT_DLMEM_REASSIGN (dlname, last_libname);
+                }
+            }
+
+          if (errors)
+            break;
+        }
 
       fclose (file);
       LT_DLFREE (line);
@@ -3283,105 +3323,106 @@ try_dlopen (phandle, filename)
       /* allocate the handle */
       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
-        ++errors;
+        ++errors;
 
       if (errors)
-        {
-          free_vars (dlname, old_name, libdir, deplibs);
-          LT_DLFREE (*phandle);
-          goto cleanup;
-        }
+        {
+          free_vars (dlname, old_name, libdir, deplibs);
+          LT_DLFREE (*phandle);
+          goto cleanup;
+        }
 
       assert (*phandle);
 
-      memset (*phandle, 0, sizeof(struct lt_dlhandle_struct));
+      memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
       if (load_deplibs (*phandle, deplibs) == 0)
-        {
-          newhandle = *phandle;
-          /* find_module may replace newhandle */
-          if (find_module (&newhandle, dir, libdir, dlname, old_name, installed))
-            {
-              unload_deplibs (*phandle);
-              ++errors;
-            }
-        }
+        {
+          newhandle = *phandle;
+          /* find_module may replace newhandle */
+          if (find_module
+              (&newhandle, dir, libdir, dlname, old_name, installed))
+            {
+              unload_deplibs (*phandle);
+              ++errors;
+            }
+        }
       else
-        {
-          ++errors;
-        }
+        {
+          ++errors;
+        }
 
       free_vars (dlname, old_name, libdir, deplibs);
       if (errors)
-        {
-          LT_DLFREE (*phandle);
-          goto cleanup;
-        }
+        {
+          LT_DLFREE (*phandle);
+          goto cleanup;
+        }
 
       if (*phandle != newhandle)
-        {
-          unload_deplibs (*phandle);
-        }
+        {
+          unload_deplibs (*phandle);
+        }
     }
   else
     {
       /* not a libtool module */
       *phandle = (lt_dlhandle) LT_EMALLOC (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
-        {
-          ++errors;
-          goto cleanup;
-        }
+        {
+          ++errors;
+          goto cleanup;
+        }
 
       memset (*phandle, 0, sizeof (struct lt_dlhandle_struct));
       newhandle = *phandle;
 
       /* If the module has no directory name component, try to find it
-         first in user_search_path and then other prescribed paths.
-         Otherwise (or in any case if the module was not yet found) try
-         opening just the module name as passed.  */
+         first in user_search_path and then other prescribed paths.
+         Otherwise (or in any case if the module was not yet found) try
+         opening just the module name as passed.  */
       if ((dir || (!find_handle (user_search_path, base_name, &newhandle)
-                   && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
-                                    &newhandle)
+                   && !find_handle (getenv (LTDL_SEARCHPATH_VAR), base_name,
+                                    &newhandle)
 #ifdef LTDL_SHLIBPATH_VAR
-                   && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
-                                    &newhandle)
+                   && !find_handle (getenv (LTDL_SHLIBPATH_VAR), base_name,
+                                    &newhandle)
 #endif
 #ifdef LTDL_SYSSEARCHPATH
-                   && !find_handle (sys_search_path, base_name, &newhandle)
+                   && !find_handle (sys_search_path, base_name, &newhandle)
 #endif
-                   )))
-        {
+           )))
+        {
           if (tryall_dlopen (&newhandle, filename) != 0)
             {
               newhandle = NULL;
             }
-        }
+        }
 
       if (!newhandle)
-        {
-          LT_DLFREE (*phandle);
-          ++errors;
-          goto cleanup;
-        }
+        {
+          LT_DLFREE (*phandle);
+          ++errors;
+          goto cleanup;
+        }
     }
 
- register_handle:
+register_handle:
   LT_DLMEM_REASSIGN (*phandle, newhandle);
 
   if ((*phandle)->info.ref_count == 0)
     {
-      (*phandle)->info.ref_count        = 1;
+      (*phandle)->info.ref_count = 1;
       LT_DLMEM_REASSIGN ((*phandle)->info.name, name);
 
       LT_DLMUTEX_LOCK ();
-      (*phandle)->next          = handles;
-      handles                   = *phandle;
+      (*phandle)->next = handles;
+      handles = *phandle;
       LT_DLMUTEX_UNLOCK ();
     }
 
   LT_DLMUTEX_SETERROR (saved_error);
 
- cleanup:
+cleanup:
   LT_DLFREE (dir);
   LT_DLFREE (name);
   LT_DLFREE (canonical);
@@ -3425,11 +3466,11 @@ lt_dlhandle
 lt_dlopenext (filename)
      const char *filename;
 {
-  lt_dlhandle   handle          = 0;
-  char *        tmp             = 0;
-  char *        ext             = 0;
-  size_t        len;
-  int           errors          = 0;
+  lt_dlhandle handle = 0;
+  char *tmp = 0;
+  char *ext = 0;
+  size_t len;
+  int errors = 0;
 
   if (!filename)
     {
@@ -3445,7 +3486,7 @@ lt_dlopenext (filename)
      to try appending additional extensions.  */
   if (ext && ((strcmp (ext, archive_ext) == 0)
 #ifdef LTDL_SHLIB_EXT
-              || (strcmp (ext, shlib_ext) == 0)
+              || (strcmp (ext, shlib_ext) == 0)
 #endif
       ))
     {
@@ -3479,7 +3520,7 @@ lt_dlopenext (filename)
       LT_DLFREE (tmp);
       tmp = LT_EMALLOC (char, len + LT_STRLEN (shlib_ext) + 1);
       if (!tmp)
-        return 0;
+        return 0;
 
       strcpy (tmp, filename);
     }
@@ -3488,7 +3529,7 @@ lt_dlopenext (filename)
       tmp[len] = LT_EOS_CHAR;
     }
 
-  strcat(tmp, shlib_ext);
+  strcat (tmp, shlib_ext);
   errors = try_dlopen (&handle, tmp);
 
   /* As before, if the file was found but loading failed, return now
@@ -3520,14 +3561,14 @@ lt_argz_insert (pargz, pargz_len, before, entry)
   if ((error = argz_insert (pargz, pargz_len, before, entry)))
     {
       switch (error)
-        {
-        case ENOMEM:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
-          break;
-        default:
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
-          break;
-        }
+        {
+        case ENOMEM:
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (NO_MEMORY));
+          break;
+        default:
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (UNKNOWN));
+          break;
+        }
       return 1;
     }
 
@@ -3549,10 +3590,12 @@ lt_argz_insertinorder (pargz, pargz_len, entry)
   if (*pargz)
     while ((before = argz_next (*pargz, *pargz_len, before)))
       {
-        int cmp = strcmp (entry, before);
+        int cmp = strcmp (entry, before);
 
-        if (cmp < 0)  break;
-        if (cmp == 0) return 0; /* No duplicates! */
+        if (cmp < 0)
+          break;
+        if (cmp == 0)
+          return 0;             /* No duplicates! */
       }
 
   return lt_argz_insert (pargz, pargz_len, before, entry);
@@ -3565,26 +3608,26 @@ lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
      const char *dirnam;
      struct dirent *dp;
 {
-  char   *buf       = 0;
-  size_t buf_len    = 0;
-  char   *end       = 0;
+  char *buf = 0;
+  size_t buf_len = 0;
+  char *end = 0;
   size_t end_offset = 0;
-  size_t dir_len    = 0;
-  int    errors     = 0;
+  size_t dir_len = 0;
+  int errors = 0;
 
   assert (pargz);
   assert (pargz_len);
   assert (dp);
 
   dir_len = LT_STRLEN (dirnam);
-  end     = dp->d_name + LT_D_NAMLEN(dp);
+  end = dp->d_name + LT_D_NAMLEN (dp);
 
   /* Ignore version numbers.  */
   {
     char *p;
-    for (p = end; p -1 > dp->d_name; --p)
+    for (p = end; p - 1 > dp->d_name; --p)
       if (strchr (".0123456789", p[-1]) == 0)
-        break;
+        break;
 
     if (*p == '.')
       end = p;
@@ -3593,25 +3636,25 @@ lt_argz_insertdir (pargz, pargz_len, dirnam, dp)
   /* Ignore filename extension.  */
   {
     char *p;
-    for (p = end -1; p > dp->d_name; --p)
+    for (p = end - 1; p > dp->d_name; --p)
       if (*p == '.')
-        {
-          end = p;
-          break;
-        }
+        {
+          end = p;
+          break;
+        }
   }
 
   /* Prepend the directory name.  */
-  end_offset    = end - dp->d_name;
-  buf_len       = dir_len + 1+ end_offset;
-  buf           = LT_EMALLOC (char, 1+ buf_len);
+  end_offset = end - dp->d_name;
+  buf_len = dir_len + 1 + end_offset;
+  buf = LT_EMALLOC (char, 1 + buf_len);
   if (!buf)
     return ++errors;
 
   assert (buf);
 
-  strcpy  (buf, dirnam);
-  strcat  (buf, "/");
+  strcpy (buf, dirnam);
+  strcat (buf, "/");
   strncat (buf, dp->d_name, end_offset);
   buf[buf_len] = LT_EOS_CHAR;
 
@@ -3630,26 +3673,26 @@ list_files_by_dir (dirnam, pargz, pargz_len)
      char **pargz;
      size_t *pargz_len;
 {
-  DIR   *dirp     = 0;
-  int    errors   = 0;
+  DIR *dirp = 0;
+  int errors = 0;
 
   assert (dirnam && *dirnam);
   assert (pargz);
   assert (pargz_len);
-  assert (dirnam[LT_STRLEN(dirnam) -1] != '/');
+  assert (dirnam[LT_STRLEN (dirnam) - 1] != '/');
 
   dirp = opendir (dirnam);
   if (dirp)
     {
-      struct dirent *dp = 0;
+      struct dirent *dp = 0;
 
       while ((dp = readdir (dirp)))
-        if (dp->d_name[0] != '.')
-          if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
-            {
-              ++errors;
-              break;
-            }
+        if (dp->d_name[0] != '.')
+          if (lt_argz_insertdir (pargz, pargz_len, dirnam, dp))
+            {
+              ++errors;
+              break;
+            }
 
       closedir (dirp);
     }
@@ -3668,12 +3711,12 @@ foreachfile_callback (dirname, data1, data2)
      lt_ptr data1;
      lt_ptr data2;
 {
-  int (*func) LT_PARAMS((const char *filename, lt_ptr data))
-        = (int (*) LT_PARAMS((const char *filename, lt_ptr data))) data1;
+  int (*func) LT_PARAMS ((const char *filename, lt_ptr data))
+    = (int (*)LT_PARAMS ((const char *filename, lt_ptr data))) data1;
 
-  int     is_done  = 0;
-  char   *argz     = 0;
-  size_t  argz_len = 0;
+  int is_done = 0;
+  char *argz = 0;
+  size_t argz_len = 0;
 
   if (list_files_by_dir (dirname, &argz, &argz_len) != 0)
     goto cleanup;
@@ -3684,10 +3727,10 @@ foreachfile_callback (dirname, data1, data2)
     char *filename = 0;
     while ((filename = argz_next (argz, argz_len, filename)))
       if ((is_done = (*func) (filename, data2)))
-        break;
+        break;
   }
 
- cleanup:
+cleanup:
   LT_DLFREE (argz);
 
   return is_done;
@@ -3711,34 +3754,34 @@ lt_dlforeachfile (search_path, func, data)
   if (search_path)
     {
       /* If a specific path was passed, search only the directories
-         listed in it.  */
+         listed in it.  */
       is_done = foreach_dirinpath (search_path, 0,
-                                   foreachfile_callback, func, data);
+                                   foreachfile_callback, func, data);
     }
   else
     {
       /* Otherwise search the default paths.  */
       is_done = foreach_dirinpath (user_search_path, 0,
-                                   foreachfile_callback, func, data);
+                                   foreachfile_callback, func, data);
       if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv("LTDL_LIBRARY_PATH"), 0,
-                                       foreachfile_callback, func, data);
-        }
+        {
+          is_done = foreach_dirinpath (getenv ("LTDL_LIBRARY_PATH"), 0,
+                                       foreachfile_callback, func, data);
+        }
 
 #ifdef LTDL_SHLIBPATH_VAR
       if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv(LTDL_SHLIBPATH_VAR), 0,
-                                       foreachfile_callback, func, data);
-        }
+        {
+          is_done = foreach_dirinpath (getenv (LTDL_SHLIBPATH_VAR), 0,
+                                       foreachfile_callback, func, data);
+        }
 #endif
 #ifdef LTDL_SYSSEARCHPATH
       if (!is_done)
-        {
-          is_done = foreach_dirinpath (getenv(LTDL_SYSSEARCHPATH), 0,
-                                       foreachfile_callback, func, data);
-        }
+        {
+          is_done = foreach_dirinpath (getenv (LTDL_SYSSEARCHPATH), 0,
+                                       foreachfile_callback, func, data);
+        }
 #endif
     }
 
@@ -3780,16 +3823,16 @@ lt_dlclose (handle)
       lt_user_data data = handle->loader->dlloader_data;
 
       if (handle != handles)
-        {
-          last->next = handle->next;
-        }
+        {
+          last->next = handle->next;
+        }
       else
-        {
-          handles = handle->next;
-        }
+        {
+          handles = handle->next;
+        }
 
       errors += handle->loader->module_close (data, handle->module);
-      errors += unload_deplibs(handle);
+      errors += unload_deplibs (handle);
 
       /* It is up to the callers to free the data itself.  */
       LT_DLFREE (handle->caller_data);
@@ -3807,7 +3850,7 @@ lt_dlclose (handle)
       ++errors;
     }
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
 
   return errors;
@@ -3819,8 +3862,8 @@ lt_dlsym (handle, symbol)
      const char *symbol;
 {
   size_t lensym;
-  char  lsym[LT_SYMBOL_LENGTH];
-  char  *sym;
+  char lsym[LT_SYMBOL_LENGTH];
+  char *sym;
   lt_ptr address;
   lt_user_data data;
 
@@ -3837,7 +3880,7 @@ lt_dlsym (handle, symbol)
     }
 
   lensym = LT_STRLEN (symbol) + LT_STRLEN (handle->loader->sym_prefix)
-                                        + LT_STRLEN (handle->info.name);
+    + LT_STRLEN (handle->info.name);
 
   if (lensym + LT_SYMBOL_OVERHEAD < LT_SYMBOL_LENGTH)
     {
@@ -3847,10 +3890,10 @@ lt_dlsym (handle, symbol)
     {
       sym = LT_EMALLOC (char, lensym + LT_SYMBOL_OVERHEAD + 1);
       if (!sym)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
-          return 0;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (BUFFER_OVERFLOW));
+          return 0;
+        }
     }
 
   data = handle->loader->dlloader_data;
@@ -3862,40 +3905,40 @@ lt_dlsym (handle, symbol)
 
       /* this is a libtool module */
       if (handle->loader->sym_prefix)
-        {
-          strcpy(sym, handle->loader->sym_prefix);
-          strcat(sym, handle->info.name);
-        }
+        {
+          strcpy (sym, handle->loader->sym_prefix);
+          strcat (sym, handle->info.name);
+        }
       else
-        {
-          strcpy(sym, handle->info.name);
-        }
+        {
+          strcpy (sym, handle->info.name);
+        }
 
-      strcat(sym, "_LTX_");
-      strcat(sym, symbol);
+      strcat (sym, "_LTX_");
+      strcat (sym, symbol);
 
       /* try "modulename_LTX_symbol" */
       address = handle->loader->find_sym (data, handle->module, sym);
       if (address)
-        {
-          if (sym != lsym)
-            {
-              LT_DLFREE (sym);
-            }
-          return address;
-        }
+        {
+          if (sym != lsym)
+            {
+              LT_DLFREE (sym);
+            }
+          return address;
+        }
       LT_DLMUTEX_SETERROR (saved_error);
     }
 
   /* otherwise try "symbol" */
   if (handle->loader->sym_prefix)
     {
-      strcpy(sym, handle->loader->sym_prefix);
-      strcat(sym, symbol);
+      strcpy (sym, handle->loader->sym_prefix);
+      strcat (sym, symbol);
     }
   else
     {
-      strcpy(sym, symbol);
+      strcpy (sym, symbol);
     }
 
   address = handle->loader->find_sym (data, handle->module, sym);
@@ -3924,10 +3967,10 @@ lt_dlpath_insertdir (ppath, before, dir)
      char *before;
      const char *dir;
 {
-  int    errors         = 0;
-  char  *canonical      = 0;
-  char  *argz           = 0;
-  size_t argz_len       = 0;
+  int errors = 0;
+  char *canonical = 0;
+  char *argz = 0;
+  size_t argz_len = 0;
 
   assert (ppath);
   assert (dir && *dir);
@@ -3943,12 +3986,12 @@ lt_dlpath_insertdir (ppath, before, dir)
   /* If *PPATH is empty, set it to DIR.  */
   if (*ppath == 0)
     {
-      assert (!before);         /* BEFORE cannot be set without PPATH.  */
-      assert (dir);             /* Without DIR, don't call this function!  */
+      assert (!before);         /* BEFORE cannot be set without PPATH.  */
+      assert (dir);             /* Without DIR, don't call this function!  */
 
       *ppath = lt_estrdup (dir);
       if (*ppath == 0)
-        ++errors;
+        ++errors;
 
       return errors;
     }
@@ -3981,9 +4024,9 @@ lt_dlpath_insertdir (ppath, before, dir)
     }
 
   argz_stringify (argz, argz_len, LT_PATHSEP_CHAR);
-  LT_DLMEM_REASSIGN (*ppath,  argz);
+  LT_DLMEM_REASSIGN (*ppath, argz);
 
- cleanup:
+cleanup:
   LT_DLFREE (canonical);
   LT_DLFREE (argz);
 
@@ -4000,7 +4043,7 @@ lt_dladdsearchdir (search_dir)
     {
       LT_DLMUTEX_LOCK ();
       if (lt_dlpath_insertdir (&user_search_path, 0, search_dir) != 0)
-        ++errors;
+        ++errors;
       LT_DLMUTEX_UNLOCK ();
     }
 
@@ -4018,12 +4061,12 @@ lt_dlinsertsearchdir (before, search_dir)
     {
       LT_DLMUTEX_LOCK ();
       if ((before < user_search_path)
-          || (before >= user_search_path + LT_STRLEN (user_search_path)))
-        {
-          LT_DLMUTEX_UNLOCK ();
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
-          return 1;
-        }
+          || (before >= user_search_path + LT_STRLEN (user_search_path)))
+        {
+          LT_DLMUTEX_UNLOCK ();
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_POSITION));
+          return 1;
+        }
       LT_DLMUTEX_UNLOCK ();
     }
 
@@ -4031,10 +4074,10 @@ lt_dlinsertsearchdir (before, search_dir)
     {
       LT_DLMUTEX_LOCK ();
       if (lt_dlpath_insertdir (&user_search_path,
-                               (char *) before, search_dir) != 0)
-        {
-          ++errors;
-        }
+                               (char *) before, search_dir) != 0)
+        {
+          ++errors;
+        }
       LT_DLMUTEX_UNLOCK ();
     }
 
@@ -4045,7 +4088,7 @@ int
 lt_dlsetsearchpath (search_path)
      const char *search_path;
 {
-  int   errors      = 0;
+  int errors = 0;
 
   LT_DLMUTEX_LOCK ();
   LT_DLFREE (user_search_path);
@@ -4096,7 +4139,7 @@ lt_dlmakeresident (handle)
 }
 
 int
-lt_dlisresident (handle)
+lt_dlisresident (handle)
      lt_dlhandle handle;
 {
   if (!handle)
@@ -4107,10 +4150,10 @@ lt_dlisresident	(handle)
 
   return LT_DLIS_RESIDENT (handle);
 }
+
 
 
 
-
 /* --- MODULE INFORMATION --- */
 
 const lt_dlinfo *
@@ -4135,7 +4178,7 @@ lt_dlhandle_next (place)
 
 int
 lt_dlforeach (func, data)
-     int (*func) LT_PARAMS((lt_dlhandle handle, lt_ptr data));
+     int (*func) LT_PARAMS ((lt_dlhandle handle, lt_ptr data));
      lt_ptr data;
 {
   int errors = 0;
@@ -4150,10 +4193,10 @@ lt_dlforeach (func, data)
 
       cur = cur->next;
       if ((*func) (tmp, data))
-        {
-          ++errors;
-          break;
-        }
+        {
+          ++errors;
+          break;
+        }
     }
 
   LT_DLMUTEX_UNLOCK ();
@@ -4195,10 +4238,10 @@ lt_dlcaller_set_data (key, handle, data)
   for (i = 0; i < n_elements; ++i)
     {
       if (handle->caller_data[i].key == key)
-        {
-          stale = handle->caller_data[i].data;
-          break;
-        }
+        {
+          stale = handle->caller_data[i].data;
+          break;
+        }
     }
 
   /* Ensure that there is enough room in this handle's caller_data
@@ -4206,31 +4249,31 @@ lt_dlcaller_set_data (key, handle, data)
   if (i == n_elements)
     {
       lt_caller_data *temp
-        = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2+ n_elements);
+        = LT_DLREALLOC (lt_caller_data, handle->caller_data, 2 + n_elements);
 
       if (!temp)
-        {
-          stale = 0;
-          goto done;
-        }
+        {
+          stale = 0;
+          goto done;
+        }
 
       handle->caller_data = temp;
 
       /* We only need this if we needed to allocate a new caller_data.  */
-      handle->caller_data[i].key  = key;
-      handle->caller_data[1+ i].key = 0;
+      handle->caller_data[i].key = key;
+      handle->caller_data[1 + i].key = 0;
     }
 
   handle->caller_data[i].data = data;
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
 
   return stale;
 }
 
 lt_ptr
-lt_dlcaller_get_data  (key, handle)
+lt_dlcaller_get_data (key, handle)
      lt_dlcaller_id key;
      lt_dlhandle handle;
 {
@@ -4245,11 +4288,11 @@ lt_dlcaller_get_data  (key, handle)
     int i;
     for (i = 0; handle->caller_data[i].key; ++i)
       {
-        if (handle->caller_data[i].key == key)
-          {
-            result = handle->caller_data[i].data;
-            break;
-          }
+        if (handle->caller_data[i].key == key)
+          {
+            result = handle->caller_data[i].data;
+            break;
+          }
       }
   }
 
@@ -4257,9 +4300,9 @@ lt_dlcaller_get_data  (key, handle)
 
   return result;
 }
+
 
 
-
 /* --- USER MODULE LOADER API --- */
 
 
@@ -4272,10 +4315,9 @@ lt_dlloader_add (place, dlloader, loader_name)
   int errors = 0;
   lt_dlloader *node = 0, *ptr = 0;
 
-  if ((dlloader == 0)   /* diagnose null parameters */
+  if ((dlloader == 0)           /* diagnose null parameters */
       || (dlloader->module_open == 0)
-      || (dlloader->module_close == 0)
-      || (dlloader->find_sym == 0))
+      || (dlloader->module_close == 0) || (dlloader->find_sym == 0))
     {
       LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
       return 1;
@@ -4286,14 +4328,14 @@ lt_dlloader_add (place, dlloader, loader_name)
   if (!node)
     return 1;
 
-  node->next            = 0;
-  node->loader_name     = loader_name;
-  node->sym_prefix      = dlloader->sym_prefix;
-  node->dlloader_exit   = dlloader->dlloader_exit;
-  node->module_open     = dlloader->module_open;
-  node->module_close    = dlloader->module_close;
-  node->find_sym        = dlloader->find_sym;
-  node->dlloader_data   = dlloader->dlloader_data;
+  node->next = 0;
+  node->loader_name = loader_name;
+  node->sym_prefix = dlloader->sym_prefix;
+  node->dlloader_exit = dlloader->dlloader_exit;
+  node->module_open = dlloader->module_open;
+  node->module_close = dlloader->module_close;
+  node->find_sym = dlloader->find_sym;
+  node->dlloader_data = dlloader->dlloader_data;
 
   LT_DLMUTEX_LOCK ();
   if (!loaders)
@@ -4304,11 +4346,11 @@ lt_dlloader_add (place, dlloader, loader_name)
   else if (!place)
     {
       /* If PLACE is not set, add NODE to the end of the
-         LOADERS list. */
+         LOADERS list. */
       for (ptr = loaders; ptr->next; ptr = ptr->next)
-        {
-          /*NOWORK*/;
-        }
+        {
+           /*NOWORK*/;
+        }
 
       ptr->next = node;
     }
@@ -4322,21 +4364,21 @@ lt_dlloader_add (place, dlloader, loader_name)
     {
       /* Find the node immediately preceding PLACE. */
       for (ptr = loaders; ptr->next != place; ptr = ptr->next)
-        {
-          /*NOWORK*/;
-        }
+        {
+           /*NOWORK*/;
+        }
 
       if (ptr->next != place)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
-          ++errors;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (INVALID_LOADER));
+          ++errors;
+        }
       else
-        {
-          /* Insert NODE between PTR and PLACE. */
-          node->next = place;
-          ptr->next  = node;
-        }
+        {
+          /* Insert NODE between PTR and PLACE. */
+          node->next = place;
+          ptr->next = node;
+        }
     }
 
   LT_DLMUTEX_UNLOCK ();
@@ -4361,14 +4403,14 @@ lt_dlloader_remove (loader_name)
   LT_DLMUTEX_LOCK ();
 
   /* Fail if there are any open modules which use this loader. */
-  for  (handle = handles; handle; handle = handle->next)
+  for (handle = handles; handle; handle = handle->next)
     {
       if (handle->loader == place)
-        {
-          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
-          ++errors;
-          goto done;
-        }
+        {
+          LT_DLMUTEX_SETERROR (LT_DLSTRERROR (REMOVE_LOADER));
+          ++errors;
+          goto done;
+        }
     }
 
   if (place == loaders)
@@ -4381,12 +4423,12 @@ lt_dlloader_remove (loader_name)
       /* Find the loader before the one being removed. */
       lt_dlloader *prev;
       for (prev = loaders; prev->next; prev = prev->next)
-        {
-          if (!strcmp (prev->next->loader_name, loader_name))
-            {
-              break;
-            }
-        }
+        {
+          if (!strcmp (prev->next->loader_name, loader_name))
+            {
+              break;
+            }
+        }
 
       place = prev->next;
       prev->next = prev->next->next;
@@ -4399,7 +4441,7 @@ lt_dlloader_remove (loader_name)
 
   LT_DLFREE (place);
 
- done:
+done:
   LT_DLMUTEX_UNLOCK ();
 
   return errors;
@@ -4468,9 +4510,9 @@ lt_dlloader_find (loader_name)
   for (place = loaders; place; place = place->next)
     {
       if (strcmp (place->loader_name, loader_name) == 0)
-        {
-          break;
-        }
+        {
+          break;
+        }
     }
   LT_DLMUTEX_UNLOCK ();
 
diff --git a/libltdl/ltdl.h b/libltdl/ltdl.h
index 995d4038..2e246515 100644
--- a/libltdl/ltdl.h
+++ b/libltdl/ltdl.h
@@ -28,9 +28,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #ifndef LTDL_H
 #define LTDL_H 1
 
-#include <sys/types.h>          /* for size_t declaration */
-
+#include <sys/types.h>          /* for size_t declaration */
 
+
 /* --- MACROS FOR PORTABILITY --- */
 
 
@@ -44,13 +44,11 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 # define LT_BEGIN_C_DECLS       extern "C" {
 # define LT_END_C_DECLS         }
 #else
-# define LT_BEGIN_C_DECLS       /* empty */
-# define LT_END_C_DECLS         /* empty */
+# define LT_BEGIN_C_DECLS       /* empty */
+# define LT_END_C_DECLS         /* empty */
 #endif
 
 LT_BEGIN_C_DECLS
-
-
 /* LT_PARAMS is a macro used to wrap function prototypes, so that compilers
    that don't understand ANSI C prototypes still work, and ANSI C
    compilers can issue warnings about type mismatches.  */
@@ -61,7 +59,6 @@ LT_BEGIN_C_DECLS
 # define LT_PARAMS(protos)      ()
 # define lt_ptr         char*
 #endif
-
 /* LT_STMT_START/END are used to create macros which expand to a
    a single compound statement in a portable way.  */
 #if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
@@ -76,7 +73,6 @@ LT_BEGIN_C_DECLS
 #    define LT_STMT_END        while (0)
 #  endif
 #endif
-
 /* LT_CONC creates a new concatenated symbol for the compiler
    in a portable way.  */
 #if defined(__STDC__) || defined(__cplusplus) || defined(_MSC_VER)
@@ -84,15 +80,9 @@ LT_BEGIN_C_DECLS
 #else
 #  define LT_CONC(s,t)  s/**/t
 #endif
-
 /* LT_STRLEN can be used safely on NULL pointers.  */
 #define LT_STRLEN(s)    (((s) && (s)[0]) ? strlen (s) : 0)
-
-
-
-/* --- WINDOWS SUPPORT --- */
-
-
+/* --- WINDOWS SUPPORT --- */
 /* Canonicalise Windows and Cygwin recognition macros.  */
 #ifdef __CYGWIN32__
 #  ifndef __CYGWIN__
@@ -110,8 +100,6 @@ LT_BEGIN_C_DECLS
 #    endif
 #  endif
 #endif
-
-
 #ifdef __WINDOWS__
 #  ifndef __CYGWIN__
 /* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory
@@ -123,81 +111,72 @@ LT_BEGIN_C_DECLS
 #ifndef LT_PATHSEP_CHAR
 #  define LT_PATHSEP_CHAR       ':'
 #endif
-
 /* DLL building support on win32 hosts;  mostly to workaround their
    ridiculous implementation of data symbol exporting. */
 #ifndef LT_SCOPE
 #  ifdef __WINDOWS__
-#    ifdef DLL_EXPORT           /* defined by libtool (if required) */
+#    ifdef DLL_EXPORT           /* defined by libtool (if required) */
 #      define LT_SCOPE  __declspec(dllexport)
 #    endif
-#    ifdef LIBLTDL_DLL_IMPORT   /* define if linking with this dll */
+#    ifdef LIBLTDL_DLL_IMPORT   /* define if linking with this dll */
 #      define LT_SCOPE  extern __declspec(dllimport)
 #    endif
 #  endif
-#  ifndef LT_SCOPE              /* static linking or !__WINDOWS__ */
+#  ifndef LT_SCOPE              /* static linking or !__WINDOWS__ */
 #    define LT_SCOPE    extern
 #  endif
 #endif
-
-
-#if defined(_MSC_VER) /* Visual Studio */
+#if defined(_MSC_VER)           /* Visual Studio */
 #  define R_OK 4
 #endif
-
-
-
-/* --- DYNAMIC MODULE LOADING API --- */
-
-
-typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module.  */
+/* --- DYNAMIC MODULE LOADING API --- */
+typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module.  */
 
 /* Initialisation and finalisation functions for libltdl. */
-LT_SCOPE        int         lt_dlinit           LT_PARAMS((void));
-LT_SCOPE        int         lt_dlexit           LT_PARAMS((void));
+LT_SCOPE int lt_dlinit LT_PARAMS ((void));
+LT_SCOPE int lt_dlexit LT_PARAMS ((void));
 
 /* Module search path manipulation.  */
-LT_SCOPE        int         lt_dladdsearchdir    LT_PARAMS((const char *search_dir));
-LT_SCOPE        int         lt_dlinsertsearchdir LT_PARAMS((const char *before,
-                                                    const char *search_dir));
-LT_SCOPE        int         lt_dlsetsearchpath   LT_PARAMS((const char *search_path));
-LT_SCOPE        const char *lt_dlgetsearchpath   LT_PARAMS((void));
-LT_SCOPE        int         lt_dlforeachfile     LT_PARAMS((
-                        const char *search_path,
-                        int (*func) (const char *filename, lt_ptr data),
-                        lt_ptr data));
+LT_SCOPE int lt_dladdsearchdir LT_PARAMS ((const char *search_dir));
+LT_SCOPE int lt_dlinsertsearchdir LT_PARAMS ((const char *before,
+                                              const char *search_dir));
+LT_SCOPE int lt_dlsetsearchpath LT_PARAMS ((const char *search_path));
+LT_SCOPE const char *lt_dlgetsearchpath LT_PARAMS ((void));
+LT_SCOPE int lt_dlforeachfile LT_PARAMS ((const char *search_path,
+                                          int (*func) (const char *filename,
+                                                       lt_ptr data),
+                                          lt_ptr data));
 
 /* Portable libltdl versions of the system dlopen() API. */
-LT_SCOPE        lt_dlhandle lt_dlopen           LT_PARAMS((const char *filename));
-LT_SCOPE        lt_dlhandle lt_dlopenext        LT_PARAMS((const char *filename));
-LT_SCOPE        lt_ptr      lt_dlsym            LT_PARAMS((lt_dlhandle handle,
-                                                     const char *name));
-LT_SCOPE        const char *lt_dlerror          LT_PARAMS((void));
-LT_SCOPE        int         lt_dlclose          LT_PARAMS((lt_dlhandle handle));
+LT_SCOPE lt_dlhandle lt_dlopen LT_PARAMS ((const char *filename));
+LT_SCOPE lt_dlhandle lt_dlopenext LT_PARAMS ((const char *filename));
+LT_SCOPE lt_ptr lt_dlsym LT_PARAMS ((lt_dlhandle handle, const char *name));
+LT_SCOPE const char *lt_dlerror LT_PARAMS ((void));
+LT_SCOPE int lt_dlclose LT_PARAMS ((lt_dlhandle handle));
 
 /* Module residency management. */
-LT_SCOPE        int         lt_dlmakeresident   LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE        int         lt_dlisresident     LT_PARAMS((lt_dlhandle handle));
+LT_SCOPE int lt_dlmakeresident LT_PARAMS ((lt_dlhandle handle));
+LT_SCOPE int lt_dlisresident LT_PARAMS ((lt_dlhandle handle));
+
 
 
 
-
 /* --- MUTEX LOCKING --- */
 
 
-typedef void    lt_dlmutex_lock         LT_PARAMS((void));
-typedef void    lt_dlmutex_unlock       LT_PARAMS((void));
-typedef void    lt_dlmutex_seterror     LT_PARAMS((const char *errmsg));
-typedef const char *lt_dlmutex_geterror LT_PARAMS((void));
+typedef void lt_dlmutex_lock LT_PARAMS ((void));
+typedef void lt_dlmutex_unlock LT_PARAMS ((void));
+typedef void lt_dlmutex_seterror LT_PARAMS ((const char *errmsg));
+typedef const char *lt_dlmutex_geterror LT_PARAMS ((void));
 
-LT_SCOPE        int     lt_dlmutex_register     LT_PARAMS((lt_dlmutex_lock *lock,
-                                            lt_dlmutex_unlock *unlock,
-                                            lt_dlmutex_seterror *seterror,
-                                            lt_dlmutex_geterror *geterror));
+LT_SCOPE int lt_dlmutex_register LT_PARAMS ((lt_dlmutex_lock * lock,
+                                             lt_dlmutex_unlock * unlock,
+                                             lt_dlmutex_seterror * seterror,
+                                             lt_dlmutex_geterror * geterror));
+
 
 
 
-
 /* --- MEMORY HANDLING --- */
 
 
@@ -206,103 +185,109 @@ LT_SCOPE	int	lt_dlmutex_register	LT_PARAMS((lt_dlmutex_lock *lock,
    libltdl relies on a featureful realloc, but if you are sure yours
    has the right semantics then you can assign it directly.  Generally,
    it is safe to assign just a malloc() and a free() function.  */
-LT_SCOPE  lt_ptr   (*lt_dlmalloc)       LT_PARAMS((size_t size));
-LT_SCOPE  lt_ptr   (*lt_dlrealloc)      LT_PARAMS((lt_ptr ptr, size_t size));
-LT_SCOPE  void     (*lt_dlfree)         LT_PARAMS((lt_ptr ptr));
+LT_SCOPE
+lt_ptr (*lt_dlmalloc)
+LT_PARAMS ((size_t size));
+     LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS ((lt_ptr ptr, size_t size));
+     LT_SCOPE void (*lt_dlfree) LT_PARAMS ((lt_ptr ptr));
+
 
 
 
-
 /* --- PRELOADED MODULE SUPPORT --- */
 
 
 /* A preopened symbol. Arrays of this type comprise the exported
    symbols for a dlpreopened module. */
-typedef struct {
-  const char *name;
-  lt_ptr      address;
-} lt_dlsymlist;
+     typedef struct
+     {
+       const char *name;
+       lt_ptr address;
+     } lt_dlsymlist;
 
-LT_SCOPE        int     lt_dlpreload    LT_PARAMS((const lt_dlsymlist *preloaded));
-LT_SCOPE        int     lt_dlpreload_default
-                                LT_PARAMS((const lt_dlsymlist *preloaded));
+     LT_SCOPE int lt_dlpreload LT_PARAMS ((const lt_dlsymlist * preloaded));
+     LT_SCOPE int lt_dlpreload_default
+       LT_PARAMS ((const lt_dlsymlist * preloaded));
 
 #define LTDL_SET_PRELOADED_SYMBOLS()            LT_STMT_START{  \
         extern const lt_dlsymlist lt_preloaded_symbols[];               \
         lt_dlpreload_default(lt_preloaded_symbols);                     \
                                                 }LT_STMT_END
+
 
 
 
-
 /* --- MODULE INFORMATION --- */
 
 
 /* Read only information pertaining to a loaded module. */
-typedef struct {
-  char  *filename;              /* file name */
-  char  *name;                  /* module name */
-  int   ref_count;              /* number of times lt_dlopened minus
-                                   number of times lt_dlclosed. */
-} lt_dlinfo;
-
-LT_SCOPE        const lt_dlinfo *lt_dlgetinfo       LT_PARAMS((lt_dlhandle handle));
-LT_SCOPE        lt_dlhandle     lt_dlhandle_next    LT_PARAMS((lt_dlhandle place));
-LT_SCOPE        int             lt_dlforeach        LT_PARAMS((
-                                int (*func) (lt_dlhandle handle, lt_ptr data),
-                                lt_ptr data));
+     typedef struct
+     {
+       char *filename;          /* file name */
+       char *name;              /* module name */
+       int ref_count;           /* number of times lt_dlopened minus
+                                   number of times lt_dlclosed. */
+     } lt_dlinfo;
+
+     LT_SCOPE const lt_dlinfo *lt_dlgetinfo LT_PARAMS ((lt_dlhandle handle));
+     LT_SCOPE lt_dlhandle lt_dlhandle_next LT_PARAMS ((lt_dlhandle place));
+     LT_SCOPE int lt_dlforeach
+       LT_PARAMS ((int (*func) (lt_dlhandle handle, lt_ptr data),
+                   lt_ptr data));
 
 /* Associating user data with loaded modules. */
-typedef unsigned lt_dlcaller_id;
-
-LT_SCOPE        lt_dlcaller_id  lt_dlcaller_register  LT_PARAMS((void));
-LT_SCOPE        lt_ptr          lt_dlcaller_set_data  LT_PARAMS((lt_dlcaller_id key,
-                                                lt_dlhandle handle,
-                                                lt_ptr data));
-LT_SCOPE        lt_ptr          lt_dlcaller_get_data  LT_PARAMS((lt_dlcaller_id key,
-                                                lt_dlhandle handle));
+     typedef unsigned lt_dlcaller_id;
+
+     LT_SCOPE lt_dlcaller_id lt_dlcaller_register LT_PARAMS ((void));
+     LT_SCOPE lt_ptr lt_dlcaller_set_data LT_PARAMS ((lt_dlcaller_id key,
+                                                      lt_dlhandle handle,
+                                                      lt_ptr data));
+     LT_SCOPE lt_ptr lt_dlcaller_get_data LT_PARAMS ((lt_dlcaller_id key,
+                                                      lt_dlhandle handle));
+
 
 
-
 /* --- USER MODULE LOADER API --- */
 
 
-typedef struct lt_dlloader      lt_dlloader;
-typedef lt_ptr                  lt_user_data;
-typedef lt_ptr                  lt_module;
+     typedef struct lt_dlloader lt_dlloader;
+     typedef lt_ptr lt_user_data;
+     typedef lt_ptr lt_module;
 
 /* Function pointer types for creating user defined module loaders. */
-typedef lt_module   lt_module_open      LT_PARAMS((lt_user_data loader_data,
-                                            const char *filename));
-typedef int         lt_module_close     LT_PARAMS((lt_user_data loader_data,
-                                            lt_module handle));
-typedef lt_ptr      lt_find_sym         LT_PARAMS((lt_user_data loader_data,
-                                            lt_module handle,
-                                            const char *symbol));
-typedef int         lt_dlloader_exit    LT_PARAMS((lt_user_data loader_data));
-
-struct lt_user_dlloader {
-  const char           *sym_prefix;
-  lt_module_open       *module_open;
-  lt_module_close      *module_close;
-  lt_find_sym          *find_sym;
-  lt_dlloader_exit     *dlloader_exit;
-  lt_user_data          dlloader_data;
-};
-
-LT_SCOPE        lt_dlloader    *lt_dlloader_next    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE        lt_dlloader    *lt_dlloader_find    LT_PARAMS((
-                                                const char *loader_name));
-LT_SCOPE        const char     *lt_dlloader_name    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE        lt_user_data   *lt_dlloader_data    LT_PARAMS((lt_dlloader *place));
-LT_SCOPE        int             lt_dlloader_add     LT_PARAMS((lt_dlloader *place,
-                                const struct lt_user_dlloader *dlloader,
-                                const char *loader_name));
-LT_SCOPE        int             lt_dlloader_remove  LT_PARAMS((
-                                                const char *loader_name));
+     typedef lt_module lt_module_open LT_PARAMS ((lt_user_data loader_data,
+                                                  const char *filename));
+     typedef int lt_module_close LT_PARAMS ((lt_user_data loader_data,
+                                             lt_module handle));
+     typedef lt_ptr lt_find_sym LT_PARAMS ((lt_user_data loader_data,
+                                            lt_module handle,
+                                            const char *symbol));
+     typedef int lt_dlloader_exit LT_PARAMS ((lt_user_data loader_data));
+
+     struct lt_user_dlloader
+     {
+       const char *sym_prefix;
+       lt_module_open *module_open;
+       lt_module_close *module_close;
+       lt_find_sym *find_sym;
+       lt_dlloader_exit *dlloader_exit;
+       lt_user_data dlloader_data;
+     };
+
+     LT_SCOPE lt_dlloader *lt_dlloader_next LT_PARAMS ((lt_dlloader * place));
+     LT_SCOPE lt_dlloader *lt_dlloader_find
+       LT_PARAMS ((const char *loader_name));
+     LT_SCOPE const char *lt_dlloader_name LT_PARAMS ((lt_dlloader * place));
+     LT_SCOPE lt_user_data *lt_dlloader_data
+       LT_PARAMS ((lt_dlloader * place));
+     LT_SCOPE int lt_dlloader_add
+       LT_PARAMS ((lt_dlloader * place,
+                   const struct lt_user_dlloader * dlloader,
+                   const char *loader_name));
+     LT_SCOPE int lt_dlloader_remove LT_PARAMS ((const char *loader_name));
+
 
 
-
 /* --- ERROR MESSAGE HANDLING --- */
 
 
@@ -332,21 +317,21 @@ LT_SCOPE	int		lt_dlloader_remove  LT_PARAMS((
     LT_ERROR(INVALID_POSITION,      "invalid search path insert position")
 
 /* Enumerate the symbolic error names. */
-enum {
+     enum
+     {
 #define LT_ERROR(name, diagnostic)      LT_CONC(LT_ERROR_, name),
-        lt_dlerror_table
+       lt_dlerror_table
 #undef LT_ERROR
-
-        LT_ERROR_MAX
-};
+       LT_ERROR_MAX
+     };
 
 /* These functions are only useful from inside custom module loaders. */
-LT_SCOPE        int     lt_dladderror   LT_PARAMS((const char *diagnostic));
-LT_SCOPE        int     lt_dlseterror   LT_PARAMS((int errorcode));
+     LT_SCOPE int lt_dladderror LT_PARAMS ((const char *diagnostic));
+     LT_SCOPE int lt_dlseterror LT_PARAMS ((int errorcode));
+
 
 
 
-
 /* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */
 
 
@@ -362,5 +347,4 @@ LT_SCOPE	int	lt_dlseterror	LT_PARAMS((int errorcode));
 #endif
 
 LT_END_C_DECLS
-
 #endif /* !LTDL_H */
diff --git a/src/common/helper.c b/src/common/helper.c
index 4483f41e..73d794d4 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -43,76 +43,83 @@
 * and these headers are not really useful for us */
 #endif
 
-typedef struct {
-  struct SEMAPHORE * sem;
-  void * args;
+typedef struct
+{
+  struct SEMAPHORE *sem;
+  void *args;
   PThreadMain func;
   int destroyed;
-  void * rval;
+  void *rval;
 } SaveCall;
 
-typedef struct Plugin {
-  struct Plugin * next;
-  char * name;
-  void * library;
+typedef struct Plugin
+{
+  struct Plugin *next;
+  char *name;
+  void *library;
 } Plugin;
 
-static GladeXML * mainXML;
+static GladeXML *mainXML;
 
-static char * gladeFile;
+static char *gladeFile;
 
 static GdkWindowState main_window_state;
 
 /**
  * the main thread
  */
-static struct PTHREAD * mainThread;
+static struct PTHREAD *mainThread;
 
-static SaveCall ** psc;
+static SaveCall **psc;
 
 static unsigned int pscCount;
 
-static struct MUTEX * sclock;
+static struct MUTEX *sclock;
 
 static int saveCallsUp;
 
-static Plugin * plugin;
+static Plugin *plugin;
 
-static void * shutdown_function;
+static void *shutdown_function;
 
-static struct GE_Context * ectx;
+static struct GE_Context *ectx;
 
-static struct GC_Configuration * cfg;
+static struct GC_Configuration *cfg;
 
-static struct CronManager * cron;
+static struct CronManager *cron;
 
-struct CronManager * gnunet_gtk_get_cron() {
+struct CronManager *
+gnunet_gtk_get_cron ()
+{
   return cron;
 }
 
-static gboolean saveCallWrapper(gpointer data) {
-  SaveCall * call = data;
+static gboolean
+saveCallWrapper (gpointer data)
+{
+  SaveCall *call = data;
   int i;
 
   /* clearly, we are no longer pending,
      so remove from psc */
-  if (call->sem != NULL) {
-    MUTEX_LOCK(sclock);
-    for (i=0;i<pscCount;i++) {
-      if (psc[i] == call) {
-        psc[i] = psc[pscCount-1];
-        break;
-      }
+  if (call->sem != NULL)
+    {
+      MUTEX_LOCK (sclock);
+      for (i = 0; i < pscCount; i++)
+        {
+          if (psc[i] == call)
+            {
+              psc[i] = psc[pscCount - 1];
+              break;
+            }
+        }
+      GE_ASSERT (NULL, i != pscCount);
+      GROW (psc, pscCount, pscCount - 1);
+      MUTEX_UNLOCK (sclock);
     }
-    GE_ASSERT(NULL, i != pscCount);
-    GROW(psc,
-         pscCount,
-         pscCount-1);
-    MUTEX_UNLOCK(sclock);
-  }
-  call->rval = call->func(call->args);
+  call->rval = call->func (call->args);
   if (call->sem != NULL)
-    SEMAPHORE_UP(call->sem);
+    SEMAPHORE_UP (call->sem);
   return FALSE;
 }
 
@@ -121,318 +128,330 @@ static gboolean saveCallWrapper(gpointer data) {
  * Since GTK doesn't work with multi-threaded applications under Windows,
  * all GTK operations have to be done in the main thread
  */
-void * gtkSaveCall(PThreadMain func,
-                   void * args) {
+void *
+gtkSaveCall (PThreadMain func, void *args)
+{
   SaveCall call;
 
-  MUTEX_LOCK(sclock);
-  if ( (saveCallsUp == NO) ||
-       (! PTHREAD_TEST_SELF(mainThread)) ) {
-    call.args = args;
-    call.func = func;
-    call.sem  = SEMAPHORE_CREATE(0);
-    call.destroyed = 0;
-    call.rval = NULL;
-    GROW(psc,
-         pscCount,
-         pscCount+1);
-    psc[pscCount-1] = &call;
-    gtk_idle_add(&saveCallWrapper,
-                 &call);
-    MUTEX_UNLOCK(sclock);
-    PTHREAD_STOP_SLEEP(mainThread);
-    SEMAPHORE_DOWN(call.sem, YES);
-    SEMAPHORE_DESTROY(call.sem);
-    return call.rval;
-  } else {
-    MUTEX_UNLOCK(sclock);
-    return func(args);
-  }
+  MUTEX_LOCK (sclock);
+  if ((saveCallsUp == NO) || (!PTHREAD_TEST_SELF (mainThread)))
+    {
+      call.args = args;
+      call.func = func;
+      call.sem = SEMAPHORE_CREATE (0);
+      call.destroyed = 0;
+      call.rval = NULL;
+      GROW (psc, pscCount, pscCount + 1);
+      psc[pscCount - 1] = &call;
+      gtk_idle_add (&saveCallWrapper, &call);
+      MUTEX_UNLOCK (sclock);
+      PTHREAD_STOP_SLEEP (mainThread);
+      SEMAPHORE_DOWN (call.sem, YES);
+      SEMAPHORE_DESTROY (call.sem);
+      return call.rval;
+    }
+  else
+    {
+      MUTEX_UNLOCK (sclock);
+      return func (args);
+    }
 }
 
 /**
  * Simple accessor method.
  */
-const char * getGladeFileName() {
+const char *
+getGladeFileName ()
+{
   return gladeFile;
 }
 
 /**
  * Simple accessor method.
  */
-GladeXML * getMainXML() {
+GladeXML *
+getMainXML ()
+{
   return mainXML;
 }
 
-static void connector(const gchar *handler_name,
-                      GObject *object,
-                      const gchar *signal_name,
-                      const gchar *signal_data,
-                      GObject *connect_object,
-                      gboolean after,
-                      gpointer user_data) {
-  GModule * module;
-  GladeXML * xml = user_data;
-  Plugin * plug;
-  void * method;
+static void
+connector (const gchar * handler_name,
+           GObject * object,
+           const gchar * signal_name,
+           const gchar * signal_data,
+           GObject * connect_object, gboolean after, gpointer user_data)
+{
+  GModule *module;
+  GladeXML *xml = user_data;
+  Plugin *plug;
+  void *method;
 
   plug = plugin;
   method = NULL;
-  while (plug != NULL) {
-    method = os_plugin_resolve_function(plug->library,
-                                        handler_name,
-                                        NO);
-    if (method != NULL)
-      break;
-    plug = plug->next;
-  }
-  if (0 == strcmp(handler_name,
-                  "gnunet_gtk_main_quit"))
+  while (plug != NULL)
+    {
+      method = os_plugin_resolve_function (plug->library, handler_name, NO);
+      if (method != NULL)
+        break;
+      plug = plug->next;
+    }
+  if (0 == strcmp (handler_name, "gnunet_gtk_main_quit"))
     method = shutdown_function;
-  if (method == NULL) {
-    module = g_module_open(NULL, 0);
-    if ( (module == NULL) ||
-         (TRUE != g_module_symbol(module,
-                                  handler_name,
-                                  &method)) ) {
-      GE_LOG(ectx,
-             GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
-             _("Failed to find handler for `%s'\n"),
-             handler_name);
-      g_module_close(module);
-      return;
+  if (method == NULL)
+    {
+      module = g_module_open (NULL, 0);
+      if ((module == NULL) ||
+          (TRUE != g_module_symbol (module, handler_name, &method)))
+        {
+          GE_LOG (ectx,
+                  GE_WARNING | GE_DEVELOPER | GE_IMMEDIATE,
+                  _("Failed to find handler for `%s'\n"), handler_name);
+          g_module_close (module);
+          return;
+        }
+      g_module_close (module);
     }
-    g_module_close(module);
-  }
-  glade_xml_signal_connect(xml,
-                           handler_name,
-                           (GCallback) method);
+  glade_xml_signal_connect (xml, handler_name, (GCallback) method);
 }
 
-void connectGladeWithPlugins(GladeXML * xml) {
-  glade_xml_signal_autoconnect_full(xml,
-                                    &connector,
-                                    xml);
+void
+connectGladeWithPlugins (GladeXML * xml)
+{
+  glade_xml_signal_autoconnect_full (xml, &connector, xml);
 }
 
-typedef void (*InitCall)(struct GE_Context * ectx,
-                         struct GC_Configuration * cfg);
+typedef void (*InitCall) (struct GE_Context * ectx,
+                          struct GC_Configuration * cfg);
 
-typedef void (*PlainCall)(void);
+typedef void (*PlainCall) (void);
 
-static void loadPlugin(const char * name) {
-  Plugin * p;
-  struct PluginHandle * lib;
+static void
+loadPlugin (const char *name)
+{
+  Plugin *p;
+  struct PluginHandle *lib;
   InitCall init;
 
-  lib = os_plugin_load(ectx,
-                       "libgnunetgtkmodule_",
-                       name);
+  lib = os_plugin_load (ectx, "libgnunetgtkmodule_", name);
   if (lib == NULL)
     return;
-  p = MALLOC(sizeof(Plugin));
-  p->name = STRDUP(name);
+  p = MALLOC (sizeof (Plugin));
+  p->name = STRDUP (name);
   p->next = plugin;
   p->library = lib;
   plugin = p;
-  init = os_plugin_resolve_function(lib,
-                                    "init_",
-                                    NO);
+  init = os_plugin_resolve_function (lib, "init_", NO);
   if (init != NULL)
-    init(ectx, cfg);
+    init (ectx, cfg);
 }
 
-static void loadPlugins(const char * names) {
-  char * dup;
-  char * next;
-  const char * pos;
+static void
+loadPlugins (const char *names)
+{
+  char *dup;
+  char *next;
+  const char *pos;
 
   if (names == NULL)
     return;
 
-  dup = STRDUP(names);
+  dup = STRDUP (names);
   next = dup;
-  do {
-    while (*next == ' ')
-      next++;
-    pos = next;
-    while ( (*next != '\0') &&
-            (*next != ' ') )
-      next++;
-    if (*next == '\0') {
-      next = NULL; /* terminate! */
-    } else {
-      *next = '\0'; /* add 0-termination for pos */
-      next++;
+  do
+    {
+      while (*next == ' ')
+        next++;
+      pos = next;
+      while ((*next != '\0') && (*next != ' '))
+        next++;
+      if (*next == '\0')
+        {
+          next = NULL;          /* terminate! */
+        }
+      else
+        {
+          *next = '\0';         /* add 0-termination for pos */
+          next++;
+        }
+      if (strlen (pos) > 0)
+        loadPlugin (pos);
     }
-    if (strlen(pos) > 0)
-      loadPlugin(pos);
-  } while (next != NULL);
-  FREE(dup);
+  while (next != NULL);
+  FREE (dup);
 }
 
-static void *unloadPlugin(void *p) {
+static void *
+unloadPlugin (void *p)
+{
   PlainCall done;
-  Plugin * plug = (Plugin *) p;
+  Plugin *plug = (Plugin *) p;
 
-  done = os_plugin_resolve_function(plug->library,
-                                    "done_",
-                                    NO);
+  done = os_plugin_resolve_function (plug->library, "done_", NO);
   if (done != NULL)
-    done();
-  os_plugin_unload(plug->library);
-  FREE(plug->name);
-  FREE(plug);
+    done ();
+  os_plugin_unload (plug->library);
+  FREE (plug->name);
+  FREE (plug);
 
   return NULL;
 }
 
-void initGNUnetGTKCommon(struct GE_Context * e,
-                         struct GC_Configuration * c,
-                         void * callback) {
-  char * load;
-  char * path;
-  char * filename;
+void
+initGNUnetGTKCommon (struct GE_Context *e,
+                     struct GC_Configuration *c, void *callback)
+{
+  char *load;
+  char *path;
+  char *filename;
 
   ectx = e;
   cfg = c;
   shutdown_function = callback;
-  sclock = MUTEX_CREATE(YES);
-  mainThread = PTHREAD_GET_SELF();
+  sclock = MUTEX_CREATE (YES);
+  mainThread = PTHREAD_GET_SELF ();
   saveCallsUp = YES;
-  cron = cron_create(ectx);
+  cron = cron_create (ectx);
 
   /* load the interface */
-  path = os_get_installation_path(IPK_DATADIR);
-  filename = MALLOC(strlen(path) + strlen("/../gnunet-gtk/gnunet-gtk.glade") + 2);
-  strcpy(filename, path);
-  FREE(path);
-  strcat(filename, "/../gnunet-gtk/gnunet-gtk.glade");
+  path = os_get_installation_path (IPK_DATADIR);
+  filename =
+    MALLOC (strlen (path) + strlen ("/../gnunet-gtk/gnunet-gtk.glade") + 2);
+  strcpy (filename, path);
+  FREE (path);
+  strcat (filename, "/../gnunet-gtk/gnunet-gtk.glade");
 #if MINGW
-  gladeFile = MALLOC(_MAX_PATH + 1);
-  plibc_conv_to_win_path(filename,
-                         gladeFile);
+  gladeFile = MALLOC (_MAX_PATH + 1);
+  plibc_conv_to_win_path (filename, gladeFile);
 #else
-  gladeFile = STRDUP(filename);
+  gladeFile = STRDUP (filename);
 #endif
-  FREE(filename);
+  FREE (filename);
 
-  mainXML = glade_xml_new(gladeFile,
-                          "mainWindow",
-                          PACKAGE_NAME);
+  mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGE_NAME);
   if (mainXML == NULL)
-    GE_DIE_STRERROR_FILE(ectx,
-                         GE_FATAL | GE_USER | GE_IMMEDIATE,
-                         "glade_xml_new",
-                         gladeFile);
+    GE_DIE_STRERROR_FILE (ectx,
+                          GE_FATAL | GE_USER | GE_IMMEDIATE,
+                          "glade_xml_new", gladeFile);
   /* load the plugins */
-  GC_get_configuration_value_string(cfg,
-                                    "GNUNET-GTK",
-                                    "PLUGINS",
-                                    "about daemon fs stats",
-                                    &load);
-  loadPlugins(load);
-  FREE(load);
-  connectGladeWithPlugins(mainXML);
-  cron_start(cron);
+  GC_get_configuration_value_string (cfg,
+                                     "GNUNET-GTK",
+                                     "PLUGINS",
+                                     "about daemon fs stats", &load);
+  loadPlugins (load);
+  FREE (load);
+  connectGladeWithPlugins (mainXML);
+  cron_start (cron);
 }
 
-void shutdownPlugins() {
+void
+shutdownPlugins ()
+{
   int i;
 
-  cron_stop(cron);
+  cron_stop (cron);
   /* unload the plugins */
-  while (plugin != NULL) {
-    Plugin * next;
-
-    next = plugin->next;
-    unloadPlugin(plugin);
-    plugin = next;
-  }
-  UNREF(mainXML);
+  while (plugin != NULL)
+    {
+      Plugin *next;
+
+      next = plugin->next;
+      unloadPlugin (plugin);
+      plugin = next;
+    }
+  UNREF (mainXML);
   mainXML = NULL;
-  FREE(gladeFile);
+  FREE (gladeFile);
   gladeFile = NULL;
 
   saveCallsUp = NO;
-  MUTEX_LOCK(sclock);
-  for (i=0;i<pscCount;i++)
-    psc[i]->func(psc[i]);
+  MUTEX_LOCK (sclock);
+  for (i = 0; i < pscCount; i++)
+    psc[i]->func (psc[i]);
   i = pscCount;
-  MUTEX_UNLOCK(sclock);
+  MUTEX_UNLOCK (sclock);
   /* wait until all PSC-jobs have left
      the gtkSaveCall method before destroying
      the mutex! */
-  while (i != 0) {
-    PTHREAD_SLEEP(50 * cronMILLIS);
-    MUTEX_LOCK(sclock);
-    i = pscCount;
-    MUTEX_UNLOCK(sclock);
-  }
+  while (i != 0)
+    {
+      PTHREAD_SLEEP (50 * cronMILLIS);
+      MUTEX_LOCK (sclock);
+      i = pscCount;
+      MUTEX_UNLOCK (sclock);
+    }
 }
 
-void doneGNUnetGTKCommon() {
-  cron_destroy(cron);
-  PTHREAD_REL_SELF(mainThread);
-  MUTEX_DESTROY(sclock);
+void
+doneGNUnetGTKCommon ()
+{
+  cron_destroy (cron);
+  PTHREAD_REL_SELF (mainThread);
+  MUTEX_DESTROY (sclock);
 }
 
-struct rwsc_closure {
-  struct SEMAPHORE * sig;
+struct rwsc_closure
+{
+  struct SEMAPHORE *sig;
   PThreadMain realMain;
-  void * arg;
+  void *arg;
 };
 
-static void * shutdownCode(void * arg) {
-  struct rwsc_closure * cls = arg;
-  void * ret;
+static void *
+shutdownCode (void *arg)
+{
+  struct rwsc_closure *cls = arg;
+  void *ret;
 
-  ret = cls->realMain(cls->arg);
-  SEMAPHORE_UP(cls->sig);
-  PTHREAD_STOP_SLEEP(mainThread);
+  ret = cls->realMain (cls->arg);
+  SEMAPHORE_UP (cls->sig);
+  PTHREAD_STOP_SLEEP (mainThread);
   return ret;
 }
 
-void * run_with_save_calls(PThreadMain cb,
-                           void * arg) {
-  struct PTHREAD * doneThread;
-  void * retval;
+void *
+run_with_save_calls (PThreadMain cb, void *arg)
+{
+  struct PTHREAD *doneThread;
+  void *retval;
   struct rwsc_closure cls;
   int i;
 
-  cls.sig = SEMAPHORE_CREATE(0);
+  cls.sig = SEMAPHORE_CREATE (0);
   cls.realMain = cb;
   cls.arg = arg;
-  doneThread = PTHREAD_CREATE(&shutdownCode,
-                              &cls,
-                              64*1024);
+  doneThread = PTHREAD_CREATE (&shutdownCode, &cls, 64 * 1024);
   if (doneThread == NULL)
-    GE_DIE_STRERROR(ectx,
-                    GE_FATAL | GE_ADMIN | GE_BULK,
-                    "pthread_create");
-  if (! PTHREAD_TEST_SELF(mainThread)) {
-    /* another thread will run the save calls */
-    SEMAPHORE_DOWN(cls.sig, YES);
-  } else {
-    while (SYSERR == SEMAPHORE_DOWN(cls.sig, NO)) {
-      MUTEX_LOCK(sclock);
-      if (pscCount > 0) {
-        i = weak_randomi(pscCount);
-        if (TRUE == g_idle_remove_by_data(psc[i]))
-          saveCallWrapper(psc[i]);
-      } else {
-        i = -1;
-      }
-      MUTEX_UNLOCK(sclock);
-      if ( (i == -1) &&
-           (OK != SEMAPHORE_DOWN(cls.sig, NO)) ) {
-        PTHREAD_SLEEP(50 * cronMILLIS);
-      }
+    GE_DIE_STRERROR (ectx, GE_FATAL | GE_ADMIN | GE_BULK, "pthread_create");
+  if (!PTHREAD_TEST_SELF (mainThread))
+    {
+      /* another thread will run the save calls */
+      SEMAPHORE_DOWN (cls.sig, YES);
+    }
+  else
+    {
+      while (SYSERR == SEMAPHORE_DOWN (cls.sig, NO))
+        {
+          MUTEX_LOCK (sclock);
+          if (pscCount > 0)
+            {
+              i = weak_randomi (pscCount);
+              if (TRUE == g_idle_remove_by_data (psc[i]))
+                saveCallWrapper (psc[i]);
+            }
+          else
+            {
+              i = -1;
+            }
+          MUTEX_UNLOCK (sclock);
+          if ((i == -1) && (OK != SEMAPHORE_DOWN (cls.sig, NO)))
+            {
+              PTHREAD_SLEEP (50 * cronMILLIS);
+            }
+        }
     }
-  }
-  PTHREAD_JOIN(doneThread,
-               &retval);
-  SEMAPHORE_DESTROY(cls.sig);
+  PTHREAD_JOIN (doneThread, &retval);
+  SEMAPHORE_DESTROY (cls.sig);
   return retval;
 }
 
@@ -440,62 +459,67 @@ void * run_with_save_calls(PThreadMain cb,
  * Simple glue to libnotify, and others?
  *
  */
-void gnunetgtk_notify(int type,
-                      const char *message,
-                      ...) {
+void
+gnunetgtk_notify (int type, const char *message, ...)
+{
 #ifdef WITH_LIBNOTIFY
   static int once;
-  char * msg;
+  char *msg;
   size_t size;
   va_list arg;
-  GtkWidget * root;
+  GtkWidget *root;
   NotifyNotification *libnotify;
   NotifyUrgency libnotify_urgency = NOTIFY_URGENCY_NORMAL;
   long libnotify_expire_timeout = NOTIFY_EXPIRES_DEFAULT;
 
-  if (! notify_is_initted()){
-    if (once == 1)
-      return;
-    if (! notify_init ("gnunet-gtk")) {
-      once = 1;
-      GE_LOG(ectx,
-             GE_WARNING | GE_BULK | GE_USER | GE_ADMIN,
-             _("Could not initialize libnotify\n"));
-      return;
+  if (!notify_is_initted ())
+    {
+      if (once == 1)
+        return;
+      if (!notify_init ("gnunet-gtk"))
+        {
+          once = 1;
+          GE_LOG (ectx,
+                  GE_WARNING | GE_BULK | GE_USER | GE_ADMIN,
+                  _("Could not initialize libnotify\n"));
+          return;
+        }
     }
-  }
-
-  root = glade_xml_get_widget(getMainXML(),"mainWindow");
-  if (gtk_window_is_active(GTK_WINDOW(root)) == FALSE) {
-    if (type == NOTIFY_LOW)
-      libnotify_urgency = NOTIFY_URGENCY_LOW;
-     else if( type == NOTIFY_NORMAL)
-       libnotify_urgency = NOTIFY_URGENCY_NORMAL;
-     else
-       libnotify_urgency = NOTIFY_URGENCY_CRITICAL;
-    va_start(arg, message);
-    size = vsnprintf(NULL, 0, message, arg);
-    va_end(arg);
-    msg = MALLOC(size+1);
-    va_start(arg, message);
-    vsnprintf(msg, size, message, arg);
-    va_end(arg);
-    libnotify = notify_notification_new("gnunet-gtk",
-                                        msg,
-                                        PACKAGE_DATA "/gnunet-gtk/gnunet-gtk-notify.png",
-                                        NULL);
-    FREE(msg);
-    notify_notification_set_timeout(libnotify, libnotify_expire_timeout);
-    notify_notification_set_urgency(libnotify, libnotify_urgency);
-    if (! notify_notification_show (libnotify, NULL)) {
-      once = 1;
-      GE_LOG(ectx,
-             GE_WARNING | GE_USER | GE_ADMIN | GE_BULK,
-             _("Could not send notification via libnotify\n"));
+
+  root = glade_xml_get_widget (getMainXML (), "mainWindow");
+  if (gtk_window_is_active (GTK_WINDOW (root)) == FALSE)
+    {
+      if (type == NOTIFY_LOW)
+        libnotify_urgency = NOTIFY_URGENCY_LOW;
+      else if (type == NOTIFY_NORMAL)
+        libnotify_urgency = NOTIFY_URGENCY_NORMAL;
+      else
+        libnotify_urgency = NOTIFY_URGENCY_CRITICAL;
+      va_start (arg, message);
+      size = vsnprintf (NULL, 0, message, arg);
+      va_end (arg);
+      msg = MALLOC (size + 1);
+      va_start (arg, message);
+      vsnprintf (msg, size, message, arg);
+      va_end (arg);
+      libnotify = notify_notification_new ("gnunet-gtk",
+                                           msg,
+                                           PACKAGE_DATA
+                                           "/gnunet-gtk/gnunet-gtk-notify.png",
+                                           NULL);
+      FREE (msg);
+      notify_notification_set_timeout (libnotify, libnotify_expire_timeout);
+      notify_notification_set_urgency (libnotify, libnotify_urgency);
+      if (!notify_notification_show (libnotify, NULL))
+        {
+          once = 1;
+          GE_LOG (ectx,
+                  GE_WARNING | GE_USER | GE_ADMIN | GE_BULK,
+                  _("Could not send notification via libnotify\n"));
+        }
+      g_object_unref (G_OBJECT (libnotify));
+      notify_uninit ();
     }
-    g_object_unref(G_OBJECT(libnotify));
-    notify_uninit();
-  }
 #endif
 }
 
@@ -504,41 +528,35 @@ void gnunetgtk_notify(int type,
  * If validation fails, msg is freed and a valid
  * Utf-8 string is returned.
  */
-char * validate_utf8(char * msg) {
-  const gchar * end;
-  char * ret;
+char *
+validate_utf8 (char *msg)
+{
+  const gchar *end;
+  char *ret;
   gsize send;
 
   end = NULL;
-  if (TRUE == g_utf8_validate(msg,
-                              -1,
-                              &end))
+  if (TRUE == g_utf8_validate (msg, -1, &end))
     return msg;
   /* hope that it is ISO8859-1 */
-  ret = g_convert_with_fallback(msg,
-                                -1,
-                                "UTF-8",
-                                "ISO8859-1",
-                                ".",
-                                NULL,
-                                &send,
-                                NULL);
-  FREE(msg);
-  msg = STRDUP(ret);
-  g_free(ret);
-  GE_BREAK(NULL,
-           TRUE == g_utf8_validate(msg,
-                                   -1,
-                                   &end));
+  ret = g_convert_with_fallback (msg,
+                                 -1,
+                                 "UTF-8",
+                                 "ISO8859-1", ".", NULL, &send, NULL);
+  FREE (msg);
+  msg = STRDUP (ret);
+  g_free (ret);
+  GE_BREAK (NULL, TRUE == g_utf8_validate (msg, -1, &end));
   return msg;
 }
 
 /**
 * Gtk callback to save the main window state (tray icon use)
 */
-void saveMainWindowState(GtkWidget *main_window,
-                         GdkEventWindowState *event,
-                         gpointer user_data) {
+void
+saveMainWindowState (GtkWidget * main_window,
+                     GdkEventWindowState * event, gpointer user_data)
+{
   main_window_state = (*event).new_window_state;
   return;
 }
@@ -546,55 +564,70 @@ void saveMainWindowState(GtkWidget *main_window,
 /**
 * Get the last main window state when restoring (tray icon use)
 */
-GdkWindowState getMainWindowState() {
+GdkWindowState
+getMainWindowState ()
+{
   return main_window_state;
 }
 
 /**
  * Start gnunet-setup, asking for a password if needed
  */
-gboolean startGNUnetSetup (gboolean run_wizard) {
-  GtkWidget * mainWindow;
-  GtkWidget * messageDialog;
+gboolean
+startGNUnetSetup (gboolean run_wizard)
+{
+  GtkWidget *mainWindow;
+  GtkWidget *messageDialog;
   int code;
   char *error_message;
 #ifdef WITH_LIBGKSU2
   GError *gerror = NULL;
-  if(run_wizard) {
-    code = gksu_run("gnunet-setup -d wizard-gtk",
-                    &gerror);
-  } else {
-    code = gksu_run("gnunet-setup -d",
-                    &gerror);
-  }
-  if (code && !gerror) {
-    error_message = STRDUP(_("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."));
-  } else if (code && gerror) {
-    error_message = g_strdup_printf(_("GKSu returned:\n%s"),
-                                    gerror->message);
-    g_error_free(gerror);
-  } else {
-    error_message = NULL;
-  }
+  if (run_wizard)
+    {
+      code = gksu_run ("gnunet-setup -d wizard-gtk", &gerror);
+    }
+  else
+    {
+      code = gksu_run ("gnunet-setup -d", &gerror);
+    }
+  if (code && !gerror)
+    {
+      error_message =
+        STRDUP (_
+                ("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."));
+    }
+  else if (code && gerror)
+    {
+      error_message = g_strdup_printf (_("GKSu returned:\n%s"),
+                                       gerror->message);
+      g_error_free (gerror);
+    }
+  else
+    {
+      error_message = NULL;
+    }
 #elif defined(WINDOWS)
 /* FIXME: run gnunet-setup, assuming we can get the needed rights */
-  error_message = STRDUP(_("Not implemented yet!"));
+  error_message = STRDUP (_("Not implemented yet!"));
   code = TRUE;
 #else
-  error_message = STRDUP(_("GKSu support is not enabled, impossible to get the needed rights. You should build gnunet-gtk with the --enable-libgksu2 option, or get the right binary package. Note you can still start the configuration tool (gnunet-setup) manually."));
+  error_message =
+    STRDUP (_
+            ("GKSu support is not enabled, impossible to get the needed rights. You should build gnunet-gtk with the --enable-libgksu2 option, or get the right binary package. Note you can still start the configuration tool (gnunet-setup) manually."));
   code = TRUE;
 #endif
-  mainWindow = glade_xml_get_widget(getMainXML(),
-                                    "mainWindow");
-  messageDialog = gtk_message_dialog_new(GTK_WINDOW(mainWindow),
-                                         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                                         GTK_MESSAGE_WARNING,
-                                         GTK_BUTTONS_CLOSE,
-                                         _("Failed to run the configuration tool (gnunet-setup): %s"),
-                                         error_message);
-  gtk_dialog_run(GTK_DIALOG(messageDialog));
-  gtk_widget_destroy(messageDialog);
-  FREE(error_message);
+  mainWindow = glade_xml_get_widget (getMainXML (), "mainWindow");
+  messageDialog = gtk_message_dialog_new (GTK_WINDOW (mainWindow),
+                                          GTK_DIALOG_MODAL |
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          GTK_MESSAGE_WARNING,
+                                          GTK_BUTTONS_CLOSE,
+                                          _
+                                          ("Failed to run the configuration tool (gnunet-setup): %s"),
+                                          error_message);
+  gtk_dialog_run (GTK_DIALOG (messageDialog));
+  gtk_widget_destroy (messageDialog);
+  FREE (error_message);
   return code;
 }
 
diff --git a/src/common/iterators.c b/src/common/iterators.c
index 920072b6..4d8d72b3 100644
--- a/src/common/iterators.c
+++ b/src/common/iterators.c
@@ -33,105 +33,84 @@
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_selection_selected_foreach(GtkTreeSelection *selection,
-                                         GtkTreeSelectionForeachFunc func,
-                                         gpointer data) {
+void
+ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
+                                     GtkTreeSelectionForeachFunc func,
+                                     gpointer data)
+{
   unsigned int i;
   unsigned int size;
-  GList * selected;
-  GtkTreeRowReference ** refs;
-  GtkTreeModel * model;
-  GtkTreePath * path;
+  GList *selected;
+  GtkTreeRowReference **refs;
+  GtkTreeModel *model;
+  GtkTreePath *path;
   GtkTreeIter iter;
 
-  selected = gtk_tree_selection_get_selected_rows(selection,
-                                                  &model);
+  selected = gtk_tree_selection_get_selected_rows (selection, &model);
 
-  i = g_list_length(selected);
+  i = g_list_length (selected);
   size = 0;
   refs = NULL;
-  GROW(refs,
-       size,
-       i);
-  for (i=0;i<size;i++)
-    refs[i] = gtk_tree_row_reference_new(model,
-                                         g_list_nth_data(selected, i));
-  g_list_foreach(selected,
-                 (GFunc) &gtk_tree_path_free,
-                 NULL);
-  g_list_free(selected);
-  for (i=0;i<size;i++) {
-    path = gtk_tree_row_reference_get_path(refs[i]);
-    gtk_tree_row_reference_free(refs[i]);
-    if (TRUE == gtk_tree_model_get_iter(model,
-                                        &iter,
-                                        path))
-      func(model,
-           path,
-           &iter,
-           data);
-    gtk_tree_path_free(path);
-  }
-  GROW(refs,
-       size,
-       0);
+  GROW (refs, size, i);
+  for (i = 0; i < size; i++)
+    refs[i] = gtk_tree_row_reference_new (model,
+                                          g_list_nth_data (selected, i));
+  g_list_foreach (selected, (GFunc) & gtk_tree_path_free, NULL);
+  g_list_free (selected);
+  for (i = 0; i < size; i++)
+    {
+      path = gtk_tree_row_reference_get_path (refs[i]);
+      gtk_tree_row_reference_free (refs[i]);
+      if (TRUE == gtk_tree_model_get_iter (model, &iter, path))
+        func (model, path, &iter, data);
+      gtk_tree_path_free (path);
+    }
+  GROW (refs, size, 0);
 }
 
-typedef struct {
-  GtkTreeRowReference ** refs;
+typedef struct
+{
+  GtkTreeRowReference **refs;
   unsigned int pos;
   unsigned int size;
 } CollectData;
 
 static gboolean
-collectAllRows(GtkTreeModel * model,
-               GtkTreePath * path,
-               GtkTreeIter * iter,
-               gpointer cls) {
-  CollectData * cd = cls;
+collectAllRows (GtkTreeModel * model,
+                GtkTreePath * path, GtkTreeIter * iter, gpointer cls)
+{
+  CollectData *cd = cls;
 
   if (cd->size == cd->pos)
-    GROW(cd->refs,
-         cd->size,
-         cd->size * 2 + 4);
-  cd->refs[cd->pos++] = gtk_tree_row_reference_new(model,
-                                                   path);
+    GROW (cd->refs, cd->size, cd->size * 2 + 4);
+  cd->refs[cd->pos++] = gtk_tree_row_reference_new (model, path);
   return FALSE;
 }
-        
+
 
 /**
  * Identical to "gtk_tree_model_foreach",
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_model_foreach(GtkTreeModel * model,
-                            GtkTreeSelectionForeachFunc func,
-                            gpointer data) {
+void
+ggc_tree_model_foreach (GtkTreeModel * model,
+                        GtkTreeSelectionForeachFunc func, gpointer data)
+{
   int i;
-  GtkTreePath * path;
+  GtkTreePath *path;
   GtkTreeIter iter;
   CollectData cd;
 
-  memset(&cd,
-         0,
-         sizeof(CollectData));
-  gtk_tree_model_foreach(model,
-                         &collectAllRows,
-                         &cd);
-  for (i=cd.pos-1;i>=0;i--) {
-    path = gtk_tree_row_reference_get_path(cd.refs[i]);
-    gtk_tree_row_reference_free(cd.refs[i]);
-    if (TRUE == gtk_tree_model_get_iter(model,
-                                        &iter,
-                                        path))
-      func(model,
-           path,
-           &iter,
-           data);
-    gtk_tree_path_free(path);
-  }
-  GROW(cd.refs,
-       cd.size,
-       0);
+  memset (&cd, 0, sizeof (CollectData));
+  gtk_tree_model_foreach (model, &collectAllRows, &cd);
+  for (i = cd.pos - 1; i >= 0; i--)
+    {
+      path = gtk_tree_row_reference_get_path (cd.refs[i]);
+      gtk_tree_row_reference_free (cd.refs[i]);
+      if (TRUE == gtk_tree_model_get_iter (model, &iter, path))
+        func (model, path, &iter, data);
+      gtk_tree_path_free (path);
+    }
+  GROW (cd.refs, cd.size, 0);
 }
diff --git a/src/common/logging.c b/src/common/logging.c
index 426d6d69..93c6833c 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -30,52 +30,44 @@
 #include <glib.h>
 #include <gmodule.h>
 
-static GtkWidget * infoWindow;
+static GtkWidget *infoWindow;
 
-static GtkWidget * infoWindowTextView;
+static GtkWidget *infoWindowTextView;
 
-static GladeXML * statusXML;
+static GladeXML *statusXML;
 
-static void init() {
-  GtkWidget * button;
+static void
+init ()
+{
+  GtkWidget *button;
 
   if (statusXML != NULL)
     return;
   statusXML
-    = glade_xml_new(getGladeFileName(),
-                    "statusWindow",
-                    PACKAGE_NAME);
-  infoWindow
-    = glade_xml_get_widget(statusXML,
-                           "statusWindow");
+    = glade_xml_new (getGladeFileName (), "statusWindow", PACKAGE_NAME);
+  infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
   infoWindowTextView
-    = glade_xml_get_widget(statusXML,
-                           "messageWindowTextView");
-  button
-    = glade_xml_get_widget(statusXML,
-                           "messageWindowCloseButton");
-  connectGladeWithPlugins(statusXML);
-
-  g_signal_connect_data(infoWindow,
-                        "delete-event",
-                        G_CALLBACK(&gtk_widget_hide_on_delete),
-                        NULL,
-                        NULL,
-                        0);
-  g_signal_connect_data(button,
-                        "clicked",
-                        G_CALLBACK(&gtk_widget_hide_on_delete),
-                        infoWindow,
-                        NULL,
-                        G_CONNECT_SWAPPED);
+    = glade_xml_get_widget (statusXML, "messageWindowTextView");
+  button = glade_xml_get_widget (statusXML, "messageWindowCloseButton");
+  connectGladeWithPlugins (statusXML);
+
+  g_signal_connect_data (infoWindow,
+                         "delete-event",
+                         G_CALLBACK (&gtk_widget_hide_on_delete),
+                         NULL, NULL, 0);
+  g_signal_connect_data (button,
+                         "clicked",
+                         G_CALLBACK (&gtk_widget_hide_on_delete),
+                         infoWindow, NULL, G_CONNECT_SWAPPED);
 }
 
 /**
  * Closure for doInfoMessage.
  */
-typedef struct {
+typedef struct
+{
   int doPopup;
-  char * note;
+  char *note;
 } InfoMessage;
 
 /**
@@ -86,27 +78,26 @@ typedef struct {
 /**
  * Callback for infoMessage()
  */
-static void * doInfoMessage(void * args) {
-  const InfoMessage * info = args;
+static void *
+doInfoMessage (void *args)
+{
+  const InfoMessage *info = args;
   GtkTextIter iter;
-  GtkTextBuffer * buffer;
+  GtkTextBuffer *buffer;
   GtkTextIter end;
 
-  init();
-  if (info->doPopup==YES)
-    gtk_widget_show(infoWindow);
-  buffer
-    = gtk_text_view_get_buffer(GTK_TEXT_VIEW(infoWindowTextView));
-  gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
-  gtk_text_buffer_insert(buffer,
-                         &iter,
-                         info->note,
-                         -1);
-  if (gtk_text_buffer_get_line_count(buffer) >= MAX_LINES) {
-    gtk_text_buffer_get_iter_at_line(buffer, &iter, MAX_LINES-1);
-    gtk_text_buffer_get_iter_at_line(buffer, &end, MAX_LINES);
-    gtk_text_buffer_delete(buffer, &iter, &end);
-  }
+  init ();
+  if (info->doPopup == YES)
+    gtk_widget_show (infoWindow);
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (infoWindowTextView));
+  gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1);
+  gtk_text_buffer_insert (buffer, &iter, info->note, -1);
+  if (gtk_text_buffer_get_line_count (buffer) >= MAX_LINES)
+    {
+      gtk_text_buffer_get_iter_at_line (buffer, &iter, MAX_LINES - 1);
+      gtk_text_buffer_get_iter_at_line (buffer, &end, MAX_LINES);
+      gtk_text_buffer_delete (buffer, &iter, &end);
+    }
   return NULL;
 }
 
@@ -115,39 +106,37 @@ static void * doInfoMessage(void * args) {
  *
  * @param doPopup do we open the window, YES or NO
  */
-void infoMessage(int doPopup,
-                 const char * format,
-                 ...) {
+void
+infoMessage (int doPopup, const char *format, ...)
+{
   va_list args;
   InfoMessage info;
 
-  va_start(args, format);
-  info.note = g_strdup_vprintf(format, args);
-  va_end(args);
+  va_start (args, format);
+  info.note = g_strdup_vprintf (format, args);
+  va_end (args);
   info.doPopup = doPopup;
-  gtkSaveCall(&doInfoMessage,
-              &info);
-  g_free(info.note);
+  gtkSaveCall (&doInfoMessage, &info);
+  g_free (info.note);
 }
 
-static void * saveAddLogEntry(void * args) {
-  static GtkWidget * s = NULL;
+static void *
+saveAddLogEntry (void *args)
+{
+  static GtkWidget *s = NULL;
   static int once = 1;
   static guint id;
 
-  init();
-  if (once) {
-    once = 0;
-    s = glade_xml_get_widget(getMainXML(),
-                             "statusbar");
-    id = gtk_statusbar_get_context_id(GTK_STATUSBAR(s),
-                                      "LOG");
-  } else
-    gtk_statusbar_pop(GTK_STATUSBAR(s),
-                      id);
-  gtk_statusbar_push(GTK_STATUSBAR(s),
-                     id,
-                     (const char*) args);
+  init ();
+  if (once)
+    {
+      once = 0;
+      s = glade_xml_get_widget (getMainXML (), "statusbar");
+      id = gtk_statusbar_get_context_id (GTK_STATUSBAR (s), "LOG");
+    }
+  else
+    gtk_statusbar_pop (GTK_STATUSBAR (s), id);
+  gtk_statusbar_push (GTK_STATUSBAR (s), id, (const char *) args);
   return NULL;
 }
 
@@ -157,51 +146,49 @@ static void * saveAddLogEntry(void * args) {
  * @param txt the log entry
  *
  */
-void addLogEntry(const char * txt,
-                 ...) {
+void
+addLogEntry (const char *txt, ...)
+{
   va_list args;
-  gchar * note;
-
-  va_start(args, txt);
-  note = g_strdup_vprintf(txt, args);
-  va_end(args);
-  infoMessage(NO, note);
-  gtkSaveCall(&saveAddLogEntry,
-              (void*) note);
-  g_free(note);
+  gchar *note;
+
+  va_start (args, txt);
+  note = g_strdup_vprintf (txt, args);
+  va_end (args);
+  infoMessage (NO, note);
+  gtkSaveCall (&saveAddLogEntry, (void *) note);
+  g_free (note);
 }
 
-static void ge_gtk_log_handler(void * ctx,
-                               GE_KIND kind,
-                               const char * date,
-                               const char * msg) {
+static void
+ge_gtk_log_handler (void *ctx,
+                    GE_KIND kind, const char *date, const char *msg)
+{
   int popUp;
 
   popUp = NO;
-  if ( (kind & (GE_FATAL | GE_ERROR | GE_WARNING)) > 0)
+  if ((kind & (GE_FATAL | GE_ERROR | GE_WARNING)) > 0)
     popUp = YES;
-  infoMessage(popUp,
-              "%s: %s",
-              date,
-              msg);
+  infoMessage (popUp, "%s: %s", date, msg);
 }
 
-struct GE_Context * createGtkLogger(GE_KIND mask) {
-  struct GE_Context * myLog;
+struct GE_Context *
+createGtkLogger (GE_KIND mask)
+{
+  struct GE_Context *myLog;
 
-  myLog = GE_create_context_callback(mask,
-                                     &ge_gtk_log_handler,
-                                     NULL,
-                                     NULL,
-                                     NULL);
+  myLog = GE_create_context_callback (mask,
+                                      &ge_gtk_log_handler, NULL, NULL, NULL);
   return myLog;
 }
 
-void __attribute__ ((destructor)) gnunet_gtk_common_ltdl_fini() {
-  if (statusXML != NULL) {
-    gtk_widget_destroy(infoWindow);
-    infoWindow = NULL;
-    UNREF(statusXML);
-    statusXML = NULL;
-  }
+void __attribute__ ((destructor)) gnunet_gtk_common_ltdl_fini ()
+{
+  if (statusXML != NULL)
+    {
+      gtk_widget_destroy (infoWindow);
+      infoWindow = NULL;
+      UNREF (statusXML);
+      statusXML = NULL;
+    }
 }
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index 6d7a02f7..da2ee0e4 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -55,16 +55,14 @@
 #include <X11/Xatom.h>
 
 G_BEGIN_DECLS
-
 #define EGG_TYPE_TRAY_ICON              (egg_tray_icon_get_type ())
 #define EGG_TRAY_ICON(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
 #define EGG_TRAY_ICON_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
 #define EGG_IS_TRAY_ICON(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
 #define EGG_IS_TRAY_ICON_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
 #define EGG_TRAY_ICON_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
-        
-typedef struct _EggTrayIcon       EggTrayIcon;
-typedef struct _EggTrayIconClass  EggTrayIconClass;
+typedef struct _EggTrayIcon EggTrayIcon;
+typedef struct _EggTrayIconClass EggTrayIconClass;
 
 struct _EggTrayIcon
 {
@@ -86,73 +84,74 @@ struct _EggTrayIconClass
   GtkPlugClass parent_class;
 };
 
-GType        egg_tray_icon_get_type       (void);
+GType egg_tray_icon_get_type (void);
 
 #if GTK_CHECK_VERSION(2,1,0)
-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
-                                           const gchar *name);
+EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen * screen,
+                                           const gchar * name);
 #endif
 
-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
+EggTrayIcon *egg_tray_icon_new (const gchar * name);
 
-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
-                                           gint         timeout,
-                                           const char  *message,
-                                           gint         len);
-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
-                                           guint        id);
+guint egg_tray_icon_send_message (EggTrayIcon * icon,
+                                  gint timeout,
+                                  const char *message, gint len);
+void egg_tray_icon_cancel_message (EggTrayIcon * icon, guint id);
 
-GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
+GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon * icon);
 
 
-static gboolean tray_clicked (GtkWidget *trayContextMenu, GdkEvent *event);
-static gboolean on_tray_quit_activate(GtkWidget *widget, GdkEvent *event, gpointer data);
-                                        
-G_END_DECLS
+static gboolean tray_clicked (GtkWidget * trayContextMenu, GdkEvent * event);
+static gboolean on_tray_quit_activate (GtkWidget * widget, GdkEvent * event,
+                                       gpointer data);
 
+G_END_DECLS
 #define SYSTEM_TRAY_REQUEST_DOCK    0
 #define SYSTEM_TRAY_BEGIN_MESSAGE   1
 #define SYSTEM_TRAY_CANCEL_MESSAGE  2
-
 #define SYSTEM_TRAY_ORIENTATION_HORZ 0
 #define SYSTEM_TRAY_ORIENTATION_VERT 1
-
-enum {
+  enum
+{
   PROP_0,
   PROP_ORIENTATION
 };
 
 static GtkPlugClass *parent_class = NULL;
 
-static void egg_tray_icon_init (EggTrayIcon *icon);
-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
+static void egg_tray_icon_init (EggTrayIcon * icon);
+static void egg_tray_icon_class_init (EggTrayIconClass * klass);
 
-static void egg_tray_icon_get_property (GObject    *object,
-                                        guint       prop_id,
-                                        GValue     *value,
-                                        GParamSpec *pspec);
+static void egg_tray_icon_get_property (GObject * object,
+                                        guint prop_id,
+                                        GValue * value, GParamSpec * pspec);
 
-static void egg_tray_icon_realize   (GtkWidget *widget);
-static void egg_tray_icon_unrealize (GtkWidget *widget);
+static void egg_tray_icon_realize (GtkWidget * widget);
+static void egg_tray_icon_unrealize (GtkWidget * widget);
 
-static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
-                                                    gboolean     dock_if_realized);
-static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
+static void egg_tray_icon_update_manager_window (EggTrayIcon * icon,
+                                                 gboolean dock_if_realized);
+static void egg_tray_icon_manager_window_destroyed (EggTrayIcon * icon);
 
-static Display * getDisplay(GtkWidget * w) {
+static Display *
+getDisplay (GtkWidget * w)
+{
 #if GTK_CHECK_VERSION(2,1,0)
-        return GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (w));
+  return GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (w));
 #else
-        return gdk_display;
+  return gdk_display;
 #endif
 }
 
-static GdkWindow * getWindow(EggTrayIcon * icon) {
+static GdkWindow *
+getWindow (EggTrayIcon * icon)
+{
 #if GTK_CHECK_VERSION(2,1,0)
-        return gdk_window_lookup_for_display (gtk_widget_get_display(GTK_WIDGET(icon)),
-                                              icon->manager_window);
+  return
+    gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
+                                   icon->manager_window);
 #else
-        return gdk_window_lookup(icon->manager_window);
+  return gdk_window_lookup (icon->manager_window);
 #endif
 }
 
@@ -163,30 +162,32 @@ egg_tray_icon_get_type (void)
 
   if (our_type == 0)
     {
-      our_type = g_type_from_name("EggTrayIcon");
+      our_type = g_type_from_name ("EggTrayIcon");
 
       if (our_type == 0)
         {
-      static const GTypeInfo our_info =
-      {
-        sizeof (EggTrayIconClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) egg_tray_icon_class_init,
-        NULL, /* class_finalize */
-        NULL, /* class_data */
-        sizeof (EggTrayIcon),
-        0,    /* n_preallocs */
-        (GInstanceInitFunc) egg_tray_icon_init,
-        NULL /* value_table */
-      };
-
-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
+          static const GTypeInfo our_info = {
+            sizeof (EggTrayIconClass),
+            (GBaseInitFunc) NULL,
+            (GBaseFinalizeFunc) NULL,
+            (GClassInitFunc) egg_tray_icon_class_init,
+            NULL,               /* class_finalize */
+            NULL,               /* class_data */
+            sizeof (EggTrayIcon),
+            0,                  /* n_preallocs */
+            (GInstanceInitFunc) egg_tray_icon_init,
+            NULL                /* value_table */
+          };
+
+          our_type =
+            g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info,
+                                    0);
         }
       else if (parent_class == NULL)
         {
           /* we're reheating the old class from a previous instance -  engage ugly hack =( */
-          egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
+          egg_tray_icon_class_init ((EggTrayIconClass *)
+                                    g_type_class_peek (our_type));
         }
     }
 
@@ -194,7 +195,7 @@ egg_tray_icon_get_type (void)
 }
 
 static void
-egg_tray_icon_init (EggTrayIcon *icon)
+egg_tray_icon_init (EggTrayIcon * icon)
 {
   icon->stamp = 1;
   icon->orientation = GTK_ORIENTATION_HORIZONTAL;
@@ -203,33 +204,32 @@ egg_tray_icon_init (EggTrayIcon *icon)
 }
 
 static void
-egg_tray_icon_class_init (EggTrayIconClass *klass)
+egg_tray_icon_class_init (EggTrayIconClass * klass)
 {
-  GObjectClass *gobject_class = (GObjectClass *)klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
+  GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
 
   parent_class = g_type_class_peek_parent (klass);
 
   gobject_class->get_property = egg_tray_icon_get_property;
 
-  widget_class->realize   = egg_tray_icon_realize;
+  widget_class->realize = egg_tray_icon_realize;
   widget_class->unrealize = egg_tray_icon_unrealize;
 
   g_object_class_install_property (gobject_class,
-                                   PROP_ORIENTATION,
-                                   g_param_spec_enum ("orientation",
-                                                      _("Orientation"),
-                                                      _("The orientation of the tray."),
-                                                      GTK_TYPE_ORIENTATION,
-                                                      GTK_ORIENTATION_HORIZONTAL,
-                                                      G_PARAM_READABLE));
+                                   PROP_ORIENTATION,
+                                   g_param_spec_enum ("orientation",
+                                                      _("Orientation"),
+                                                      _
+                                                      ("The orientation of the tray."),
+                                                      GTK_TYPE_ORIENTATION,
+                                                      GTK_ORIENTATION_HORIZONTAL,
+                                                      G_PARAM_READABLE));
 }
 
 static void
-egg_tray_icon_get_property (GObject    *object,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
+egg_tray_icon_get_property (GObject * object,
+                            guint prop_id, GValue * value, GParamSpec * pspec)
 {
   EggTrayIcon *icon = EGG_TRAY_ICON (object);
 
@@ -245,32 +245,35 @@ egg_tray_icon_get_property (GObject    *object,
 }
 
 static void
-egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
+egg_tray_icon_get_orientation_property (EggTrayIcon * icon)
 {
   Display *xdisplay;
   Atom type;
   int format;
-  union {
-        gulong *prop;
-        guchar *prop_ch;
-  } prop = { NULL };
+  union
+  {
+    gulong *prop;
+    guchar *prop_ch;
+  } prop =
+  {
+  NULL};
   gulong nitems;
   gulong bytes_after;
   int error, result;
 
-  g_return_if_fail(icon->manager_window != None);
+  g_return_if_fail (icon->manager_window != None);
 
-  xdisplay = getDisplay(GTK_WIDGET (icon));
+  xdisplay = getDisplay (GTK_WIDGET (icon));
 
   gdk_error_trap_push ();
   type = None;
   result = XGetWindowProperty (xdisplay,
-                               icon->manager_window,
-                               icon->orientation_atom,
-                               0, G_MAXLONG, FALSE,
-                               XA_CARDINAL,
-                               &type, &format, &nitems,
-                               &bytes_after, &(prop.prop_ch));
+                               icon->manager_window,
+                               icon->orientation_atom,
+                               0, G_MAXLONG, FALSE,
+                               XA_CARDINAL,
+                               &type, &format, &nitems,
+                               &bytes_after, &(prop.prop_ch));
   error = gdk_error_trap_pop ();
 
   if (error || result != Success)
@@ -280,16 +283,15 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
     {
       GtkOrientation orientation;
 
-      orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ?
-                                        GTK_ORIENTATION_HORIZONTAL :
-                                        GTK_ORIENTATION_VERTICAL;
+      orientation = (prop.prop[0] == SYSTEM_TRAY_ORIENTATION_HORZ) ?
+        GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
 
       if (icon->orientation != orientation)
-        {
-          icon->orientation = orientation;
+        {
+          icon->orientation = orientation;
 
-          g_object_notify (G_OBJECT (icon), "orientation");
-        }
+          g_object_notify (G_OBJECT (icon), "orientation");
+        }
     }
 
   if (prop.prop)
@@ -297,10 +299,11 @@ egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
 }
 
 static GdkFilterReturn
-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
+egg_tray_icon_manager_filter (GdkXEvent * xevent, GdkEvent * event,
+                              gpointer user_data)
 {
   EggTrayIcon *icon = user_data;
-  XEvent *xev = (XEvent *)xevent;
+  XEvent *xev = (XEvent *) xevent;
 
   if (xev->xany.type == ClientMessage &&
       xev->xclient.message_type == icon->manager_atom &&
@@ -311,21 +314,21 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
   else if (xev->xany.window == icon->manager_window)
     {
       if (xev->xany.type == PropertyNotify &&
-          xev->xproperty.atom == icon->orientation_atom)
-        {
-          egg_tray_icon_get_orientation_property (icon);
-        }
+          xev->xproperty.atom == icon->orientation_atom)
+        {
+          egg_tray_icon_get_orientation_property (icon);
+        }
       if (xev->xany.type == DestroyNotify)
-        {
-          egg_tray_icon_manager_window_destroyed (icon);
-        }
+        {
+          egg_tray_icon_manager_window_destroyed (icon);
+        }
     }
 
   return GDK_FILTER_CONTINUE;
 }
 
 static void
-egg_tray_icon_unrealize (GtkWidget *widget)
+egg_tray_icon_unrealize (GtkWidget * widget)
 {
   EggTrayIcon *icon = EGG_TRAY_ICON (widget);
   GdkWindow *root_window;
@@ -334,7 +337,7 @@ egg_tray_icon_unrealize (GtkWidget *widget)
     {
       GdkWindow *gdkwin;
 
-      gdkwin = getWindow(icon);
+      gdkwin = getWindow (icon);
       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
     }
 
@@ -347,16 +350,14 @@ egg_tray_icon_unrealize (GtkWidget *widget)
   gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
 
   if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+    (*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
 static void
-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
-                                    long         message,
-                                    Window       window,
-                                    long         data1,
-                                    long         data2,
-                                    long         data3)
+egg_tray_icon_send_manager_message (EggTrayIcon * icon,
+                                    long message,
+                                    Window window,
+                                    long data1, long data2, long data3)
 {
   XClientMessageEvent ev;
   Display *display;
@@ -371,43 +372,43 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
   ev.data.l[3] = data2;
   ev.data.l[4] = data3;
 
-  display = getDisplay(GTK_WIDGET (icon));
+  display = getDisplay (GTK_WIDGET (icon));
 
   gdk_error_trap_push ();
   XSendEvent (display,
-              icon->manager_window, False, NoEventMask, (XEvent *)&ev);
+              icon->manager_window, False, NoEventMask, (XEvent *) & ev);
   XSync (display, False);
   gdk_error_trap_pop ();
 }
 
 static void
-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
+egg_tray_icon_send_dock_request (EggTrayIcon * icon)
 {
   egg_tray_icon_send_manager_message (icon,
-                                      SYSTEM_TRAY_REQUEST_DOCK,
-                                      icon->manager_window,
-                                      gtk_plug_get_id (GTK_PLUG (icon)),
-                                      0, 0);
+                                      SYSTEM_TRAY_REQUEST_DOCK,
+                                      icon->manager_window,
+                                      gtk_plug_get_id (GTK_PLUG (icon)),
+                                      0, 0);
 }
 
 static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon,
-                                     gboolean     dock_if_realized)
+egg_tray_icon_update_manager_window (EggTrayIcon * icon,
+                                     gboolean dock_if_realized)
 {
   Display *xdisplay;
 
   if (icon->manager_window != None)
     return;
 
-  xdisplay = getDisplay(GTK_WIDGET (icon));
+  xdisplay = getDisplay (GTK_WIDGET (icon));
   XGrabServer (xdisplay);
 
-  icon->manager_window = XGetSelectionOwner (xdisplay,
-                                             icon->selection_atom);
+  icon->manager_window = XGetSelectionOwner (xdisplay, icon->selection_atom);
 
   if (icon->manager_window != None)
     XSelectInput (xdisplay,
-                  icon->manager_window, StructureNotifyMask|PropertyChangeMask);
+                  icon->manager_window,
+                  StructureNotifyMask | PropertyChangeMask);
 
   XUngrabServer (xdisplay);
   XFlush (xdisplay);
@@ -416,24 +417,24 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon,
     {
       GdkWindow *gdkwin;
 
-      gdkwin = getWindow(icon);
+      gdkwin = getWindow (icon);
       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
 
       if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-        egg_tray_icon_send_dock_request (icon);
+        egg_tray_icon_send_dock_request (icon);
 
       egg_tray_icon_get_orientation_property (icon);
     }
 }
 
 static void
-egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
+egg_tray_icon_manager_window_destroyed (EggTrayIcon * icon)
 {
   GdkWindow *gdkwin;
 
   g_return_if_fail (icon->manager_window != None);
 
-  gdkwin = getWindow(icon);
+  gdkwin = getWindow (icon);
   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
 
   icon->manager_window = None;
@@ -442,7 +443,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
 }
 
 static void
-egg_tray_icon_realize (GtkWidget *widget)
+egg_tray_icon_realize (GtkWidget * widget)
 {
   EggTrayIcon *icon = EGG_TRAY_ICON (widget);
   gint screen;
@@ -462,21 +463,19 @@ egg_tray_icon_realize (GtkWidget *widget)
 #endif
 
   /* Now see if there's a manager window around */
-  g_snprintf (buffer, sizeof (buffer),
-              "_NET_SYSTEM_TRAY_S%d",
-              screen);
+  g_snprintf (buffer, sizeof (buffer), "_NET_SYSTEM_TRAY_S%d", screen);
 
   icon->selection_atom = XInternAtom (xdisplay, buffer, False);
 
   icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
 
   icon->system_tray_opcode_atom = XInternAtom (xdisplay,
-                                                   "_NET_SYSTEM_TRAY_OPCODE",
-                                                   False);
+                                               "_NET_SYSTEM_TRAY_OPCODE",
+                                               False);
 
   icon->orientation_atom = XInternAtom (xdisplay,
-                                        "_NET_SYSTEM_TRAY_ORIENTATION",
-                                        False);
+                                        "_NET_SYSTEM_TRAY_ORIENTATION",
+                                        False);
 
   egg_tray_icon_update_manager_window (icon, FALSE);
   egg_tray_icon_send_dock_request (icon);
@@ -488,38 +487,36 @@ egg_tray_icon_realize (GtkWidget *widget)
 #endif
 
   /* Add a root window filter so that we get changes on MANAGER */
-  gdk_window_add_filter (root_window,
-                         egg_tray_icon_manager_filter, icon);
+  gdk_window_add_filter (root_window, egg_tray_icon_manager_filter, icon);
 }
 
 #if GTK_CHECK_VERSION(2,1,0)
 EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
+egg_tray_icon_new_for_screen (GdkScreen * screen, const char *name)
 {
   g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
 
-  return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
+  return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name,
+                       NULL);
 }
 #endif
 
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
+EggTrayIcon *
+egg_tray_icon_new (const gchar * name)
 {
   return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
 }
 
 guint
-egg_tray_icon_send_message (EggTrayIcon *icon,
-                            gint         timeout,
-                            const gchar *message,
-                            gint         len)
+egg_tray_icon_send_message (EggTrayIcon * icon,
+                            gint timeout, const gchar * message, gint len)
 {
   guint stamp;
 
   g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
   g_return_val_if_fail (timeout >= 0, 0);
   g_return_val_if_fail (message != NULL, 0);
-                
+
   if (icon->manager_window == None)
     return 0;
 
@@ -530,8 +527,9 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
 
   /* Get ready to send the message */
   egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
-                                      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-                                      timeout, len, stamp);
+                                      (Window)
+                                      gtk_plug_get_id (GTK_PLUG (icon)),
+                                      timeout, len, stamp);
 
   /* Now to send the actual message */
   gdk_error_trap_push ();
@@ -540,27 +538,28 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
       XClientMessageEvent ev;
       Display *xdisplay;
 
-      xdisplay = getDisplay(GTK_WIDGET (icon));
+      xdisplay = getDisplay (GTK_WIDGET (icon));
 
       ev.type = ClientMessage;
-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
+      ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
       ev.format = 8;
       ev.message_type = XInternAtom (xdisplay,
-                                     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+                                     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
       if (len > 20)
-        {
-          memcpy (&ev.data, message, 20);
-          len -= 20;
-          message += 20;
-        }
+        {
+          memcpy (&ev.data, message, 20);
+          len -= 20;
+          message += 20;
+        }
       else
-        {
-          memcpy (&ev.data, message, len);
-          len = 0;
-        }
+        {
+          memcpy (&ev.data, message, len);
+          len = 0;
+        }
 
       XSendEvent (xdisplay,
-                  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
+                  icon->manager_window, False, StructureNotifyMask,
+                  (XEvent *) & ev);
       XSync (xdisplay, False);
     }
   gdk_error_trap_pop ();
@@ -569,19 +568,19 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
 }
 
 void
-egg_tray_icon_cancel_message (EggTrayIcon *icon,
-                              guint        id)
+egg_tray_icon_cancel_message (EggTrayIcon * icon, guint id)
 {
   g_return_if_fail (EGG_IS_TRAY_ICON (icon));
   g_return_if_fail (id > 0);
 
   egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
-                                      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
-                                      id, 0, 0);
+                                      (Window)
+                                      gtk_plug_get_id (GTK_PLUG (icon)), id,
+                                      0, 0);
 }
 
 GtkOrientation
-egg_tray_icon_get_orientation (EggTrayIcon *icon)
+egg_tray_icon_get_orientation (EggTrayIcon * icon)
 {
   g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL);
 
@@ -590,75 +589,86 @@ egg_tray_icon_get_orientation (EggTrayIcon *icon)
 
 
 /* Callback for the "Quit" element on the tray icon menu */
-static gboolean on_tray_quit_activate(GtkWidget *widget, GdkEvent *event, gpointer data) {
-    gnunet_gtk_main_quit();
-    return TRUE;
+static gboolean
+on_tray_quit_activate (GtkWidget * widget, GdkEvent * event, gpointer data)
+{
+  gnunet_gtk_main_quit ();
+  return TRUE;
 }
 
 /* Function activated when the user clicks the tray icon */
-static gboolean tray_clicked(GtkWidget *widget, GdkEvent *event) {
-  if(event->type == GDK_BUTTON_PRESS) {
-    GdkEventButton *event_button;
-    event_button = (GdkEventButton *) event;
-    if(event_button->button == 1) {
-      GtkWidget *root;
-      root = glade_xml_get_widget(getMainXML(),
-                               "mainWindow");
-      GdkWindowState main_window_state;
-      if (gtk_window_is_active (GTK_WINDOW(root)))
-        gtk_widget_hide (root);
-      else
-        gtk_window_present (GTK_WINDOW(root));
-        main_window_state = getMainWindowState();
-        if(main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
-          gtk_window_maximize (GTK_WINDOW(root));
-    return TRUE;
-    }
-    else if(event_button->button == 3) {
-      GtkMenu *trayContextMenu;
-      trayContextMenu = GTK_MENU (widget);
-      g_return_val_if_fail (GTK_IS_MENU (trayContextMenu), FALSE);
-      gtk_menu_popup(trayContextMenu, NULL, NULL, NULL, NULL,
-                     event_button->button, event_button->time);
-      return TRUE;
+static gboolean
+tray_clicked (GtkWidget * widget, GdkEvent * event)
+{
+  if (event->type == GDK_BUTTON_PRESS)
+    {
+      GdkEventButton *event_button;
+      event_button = (GdkEventButton *) event;
+      if (event_button->button == 1)
+        {
+          GtkWidget *root;
+          root = glade_xml_get_widget (getMainXML (), "mainWindow");
+          GdkWindowState main_window_state;
+          if (gtk_window_is_active (GTK_WINDOW (root)))
+            gtk_widget_hide (root);
+          else
+            gtk_window_present (GTK_WINDOW (root));
+          main_window_state = getMainWindowState ();
+          if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
+            gtk_window_maximize (GTK_WINDOW (root));
+          return TRUE;
+        }
+      else if (event_button->button == 3)
+        {
+          GtkMenu *trayContextMenu;
+          trayContextMenu = GTK_MENU (widget);
+          g_return_val_if_fail (GTK_IS_MENU (trayContextMenu), FALSE);
+          gtk_menu_popup (trayContextMenu, NULL, NULL, NULL, NULL,
+                          event_button->button, event_button->time);
+          return TRUE;
+        }
     }
-  }
   return FALSE;
 }
 
 /* Initiate the system tray icon */
-void initTrayIcon() {
-   static EggTrayIcon *tray_icon;
-   static GtkWidget *tray_icon_image;
-   static GtkTooltips *tray_icon_tooltip;
-   GtkWidget *eventbox, *trayContextMenu, *tray_quit;
-   GdkPixbuf *pixbuf;
-   GladeXML *trayContextMenuXML;
-   char * instDir;
-   char * iconPath;
-
-   trayContextMenuXML = glade_xml_new (getGladeFileName(), "trayContextMenu", PACKAGE_NAME);
-   trayContextMenu = glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
-   tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
-
-   tray_icon = egg_tray_icon_new (_("GNU's p2p network"));
-   instDir = os_get_installation_path(IPK_DATADIR);
-   iconPath = MALLOC(strlen(instDir) + 40);
-   strcpy(iconPath, instDir);
-   strcat(iconPath, "/../gnunet-gtk/gnunet-gtk-tray.png");
-   FREE(instDir);
-   pixbuf = gdk_pixbuf_new_from_file (iconPath, NULL);
-   FREE(iconPath);
-   tray_icon_image = gtk_image_new_from_pixbuf (pixbuf);
-   eventbox = gtk_event_box_new ();
-   gtk_container_add (GTK_CONTAINER (eventbox), tray_icon_image);
-   gtk_container_add (GTK_CONTAINER (tray_icon), eventbox);
-   g_signal_connect(G_OBJECT(tray_quit), "activate", G_CALLBACK(on_tray_quit_activate), NULL);
-   g_signal_connect_swapped (G_OBJECT (eventbox), "button_press_event", G_CALLBACK (tray_clicked), trayContextMenu);
-   tray_icon_tooltip = gtk_tooltips_new ();
-   gtk_tooltips_set_tip (tray_icon_tooltip, GTK_WIDGET (tray_icon), _("GNU's p2p network"), NULL);
-   gtk_widget_show (eventbox);
-   gtk_widget_show_all (GTK_WIDGET (tray_icon));
+void
+initTrayIcon ()
+{
+  static EggTrayIcon *tray_icon;
+  static GtkWidget *tray_icon_image;
+  static GtkTooltips *tray_icon_tooltip;
+  GtkWidget *eventbox, *trayContextMenu, *tray_quit;
+  GdkPixbuf *pixbuf;
+  GladeXML *trayContextMenuXML;
+  char *instDir;
+  char *iconPath;
+
+  trayContextMenuXML =
+    glade_xml_new (getGladeFileName (), "trayContextMenu", PACKAGE_NAME);
+  trayContextMenu =
+    glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
+  tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
+
+  tray_icon = egg_tray_icon_new (_("GNU's p2p network"));
+  instDir = os_get_installation_path (IPK_DATADIR);
+  iconPath = MALLOC (strlen (instDir) + 40);
+  strcpy (iconPath, instDir);
+  strcat (iconPath, "/../gnunet-gtk/gnunet-gtk-tray.png");
+  FREE (instDir);
+  pixbuf = gdk_pixbuf_new_from_file (iconPath, NULL);
+  FREE (iconPath);
+  tray_icon_image = gtk_image_new_from_pixbuf (pixbuf);
+  eventbox = gtk_event_box_new ();
+  gtk_container_add (GTK_CONTAINER (eventbox), tray_icon_image);
+  gtk_container_add (GTK_CONTAINER (tray_icon), eventbox);
+  g_signal_connect (G_OBJECT (tray_quit), "activate",
+                    G_CALLBACK (on_tray_quit_activate), NULL);
+  g_signal_connect_swapped (G_OBJECT (eventbox), "button_press_event",
+                            G_CALLBACK (tray_clicked), trayContextMenu);
+  tray_icon_tooltip = gtk_tooltips_new ();
+  gtk_tooltips_set_tip (tray_icon_tooltip, GTK_WIDGET (tray_icon),
+                        _("GNU's p2p network"), NULL);
+  gtk_widget_show (eventbox);
+  gtk_widget_show_all (GTK_WIDGET (tray_icon));
 }
-
-
diff --git a/src/core/eggtrayicon.h b/src/core/eggtrayicon.h
index 55dc8664..33d687f1 100644
--- a/src/core/eggtrayicon.h
+++ b/src/core/eggtrayicon.h
@@ -47,6 +47,6 @@
 #ifndef __EGG_TRAY_ICON_H__
 #define __EGG_TRAY_ICON_H__
 
-void initTrayIcon();
+void initTrayIcon ();
 
 #endif /* __EGG_TRAY_ICON_H__ */
diff --git a/src/core/main.c b/src/core/main.c
index e6628cd0..1bf128c1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -34,130 +34,125 @@
 static int debug_mode = NO;
 #endif
 
-static char * cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
+static char *cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
 
 /**
  * All gnunet-gtk command line options
  */
 static struct CommandLineOption gnunetgtkOptions[] = {
-  COMMAND_LINE_OPTION_CFG_FILE(&cfgFilename), /* -c */
+  COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),  /* -c */
 #ifdef WINDOWS
-  { 'd', "debug", NULL,
-    gettext_noop("run in debug mode"),
-    0, &gnunet_getopt_configure_set_one, &debug_mode },
+  {'d', "debug", NULL,
+   gettext_noop ("run in debug mode"),
+   0, &gnunet_getopt_configure_set_one, &debug_mode},
 #endif
-  COMMAND_LINE_OPTION_HELP(gettext_noop("GNUnet GTK user interface.")), /* -h */
+  COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),       /* -h */
   COMMAND_LINE_OPTION_HOSTNAME, /* -H */
-  COMMAND_LINE_OPTION_LOGGING, /* -L */
-  COMMAND_LINE_OPTION_VERSION(VERSION), /* -v */
+  COMMAND_LINE_OPTION_LOGGING,  /* -L */
+  COMMAND_LINE_OPTION_VERSION (VERSION),        /* -v */
   COMMAND_LINE_OPTION_VERBOSE,
   COMMAND_LINE_OPTION_END,
 };
 
-static void * shutdownCode(void * unused) {
-  shutdownPlugins();
+static void *
+shutdownCode (void *unused)
+{
+  shutdownPlugins ();
   return NULL;
 }
 
-void gnunet_gtk_main_quit() {
-  GE_setDefaultContext(NULL);
-  run_with_save_calls(&shutdownCode,
-                      NULL);
-  gtk_main_quit();
+void
+gnunet_gtk_main_quit ()
+{
+  GE_setDefaultContext (NULL);
+  run_with_save_calls (&shutdownCode, NULL);
+  gtk_main_quit ();
 }
 
 #if 0
-static void customLog(const char * msg) {
-  addLogEntry("%s", msg);
+static void
+customLog (const char *msg)
+{
+  addLogEntry ("%s", msg);
 }
 #endif
 
-int main(int argc,
-         char * const * argv) {
-  GtkWidget * root;
+int
+main (int argc, char *const *argv)
+{
+  GtkWidget *root;
   int i;
-  struct GE_Context * ectx;
-  struct GE_Context * my_ctx;
-  struct GC_Configuration * cfg;
-  char * log;
+  struct GE_Context *ectx;
+  struct GE_Context *my_ctx;
+  struct GC_Configuration *cfg;
+  char *log;
   GE_KIND mask;
 #if ENABLE_NLS
-  char * path;
+  char *path;
 #endif
 
 #ifdef WINDOWS
-  SetCursor(LoadCursor(NULL, IDC_APPSTARTING));
+  SetCursor (LoadCursor (NULL, IDC_APPSTARTING));
 #endif
 
-  g_thread_init(NULL);
-  gtk_init(&argc, (char***) &argv);
-  i = GNUNET_init(argc,
-                  argv,
-                  "gnunet-gtk",
-                  &cfgFilename,
-                  gnunetgtkOptions,
-                  &ectx,
-                  &cfg);
-  if (i == -1) {
-    GNUNET_fini(ectx, cfg);
-    return -1;
-  }
+  g_thread_init (NULL);
+  gtk_init (&argc, (char ***) &argv);
+  i = GNUNET_init (argc,
+                   argv,
+                   "gnunet-gtk", &cfgFilename, gnunetgtkOptions, &ectx, &cfg);
+  if (i == -1)
+    {
+      GNUNET_fini (ectx, cfg);
+      return -1;
+    }
 #ifdef WINDOWS
   if (!debug_mode)
-    FreeConsole();
+    FreeConsole ();
 #endif
 
 #if ENABLE_NLS
   setlocale (LC_ALL, "");
-  path = os_get_installation_path(IPK_LOCALEDIR);
-  BINDTEXTDOMAIN("gnunet-gtk", path);
-  FREE(path);
-  textdomain("gnunet-gtk");
-  bind_textdomain_codeset("GNUnet", "UTF-8");
-  bind_textdomain_codeset("gnunet-gtk", "UTF-8");
+  path = os_get_installation_path (IPK_LOCALEDIR);
+  BINDTEXTDOMAIN ("gnunet-gtk", path);
+  FREE (path);
+  textdomain ("gnunet-gtk");
+  bind_textdomain_codeset ("GNUnet", "UTF-8");
+  bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
 #endif
-  initGNUnetGTKCommon(ectx,
-                      cfg,
-                      &gnunet_gtk_main_quit);
+  initGNUnetGTKCommon (ectx, cfg, &gnunet_gtk_main_quit);
   /* configure GTK logging */
-  GC_get_configuration_value_string(cfg,
-                                    "LOGGING",
-                                    "USER-LEVEL",
-                                    "WARNING",
-                                    &log);
-  mask = GE_getKIND(log);
-  FREE(log);
-  mask |= mask-1; /* set all bits... */
+  GC_get_configuration_value_string (cfg,
+                                     "LOGGING",
+                                     "USER-LEVEL", "WARNING", &log);
+  mask = GE_getKIND (log);
+  FREE (log);
+  mask |= mask - 1;             /* set all bits... */
   mask |= GE_USER | GE_BULK | GE_IMMEDIATE;
-  if (YES == GC_get_configuration_value_yesno(cfg,
-                                              "LOGGING",
-                                              "DEVELOPER",
-                                              NO))
+  if (YES == GC_get_configuration_value_yesno (cfg,
+                                               "LOGGING", "DEVELOPER", NO))
     mask |= GE_DEVELOPER | GE_REQUEST;
-  my_ctx = createGtkLogger(mask);
-  GE_setDefaultContext(my_ctx);
-  root
-    = glade_xml_get_widget(getMainXML(),
-                           "mainWindow");
-  gtk_window_maximize(GTK_WINDOW(root));
+  my_ctx = createGtkLogger (mask);
+  GE_setDefaultContext (my_ctx);
+  root = glade_xml_get_widget (getMainXML (), "mainWindow");
+  gtk_window_maximize (GTK_WINDOW (root));
 #ifndef WINDOWS
-  initTrayIcon();
+  initTrayIcon ();
 #endif
-  gtk_widget_show(root);
+  gtk_widget_show (root);
 
   /* start the event loop */
-  gdk_threads_enter();
+  gdk_threads_enter ();
 
 #ifdef WINDOWS
-  SetCursor(LoadCursor(NULL, IDC_ARROW));
+  SetCursor (LoadCursor (NULL, IDC_ARROW));
 #endif
 
-  gtk_main();
-  gdk_threads_leave();
-  GE_setDefaultContext(ectx);
-  GE_free_context(my_ctx);
-  doneGNUnetGTKCommon();
-  GNUNET_fini(ectx, cfg);
+  gtk_main ();
+  gdk_threads_leave ();
+  GE_setDefaultContext (ectx);
+  GE_free_context (my_ctx);
+  doneGNUnetGTKCommon ();
+  GNUNET_fini (ectx, cfg);
   return 0;
 }
 
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 0b85e239..2fbde8f7 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -43,32 +43,29 @@
 #define DEBUG_END()
 #endif
 
-void initGNUnetGTKCommon(struct GE_Context * ectx,
-                         struct GC_Configuration * cfg,
-                         void * callback);
+void initGNUnetGTKCommon (struct GE_Context *ectx,
+                          struct GC_Configuration *cfg, void *callback);
 
-void shutdownPlugins(void);
+void shutdownPlugins (void);
 
-void doneGNUnetGTKCommon(void);
+void doneGNUnetGTKCommon (void);
 
 /**
  * Get the name of the main glade file for gnunet-gtk.
  */
-const char * getGladeFileName(void);
+const char *getGladeFileName (void);
 
 /**
  * Get the GladeXML for the main window of gnunet-gtk.
  */
-GladeXML * getMainXML(void);
+GladeXML *getMainXML (void);
 
 /**
  * Appends a message to the info window
  * @param doPopup if YES, the info window will
  *   be opened
  */
-void infoMessage(int doPopup,
-                 const char * format,
-                 ...);
+void infoMessage (int doPopup, const char *format, ...);
 
 /**
  * Appends a log entry to the info window
@@ -77,17 +74,16 @@ void infoMessage(int doPopup,
  *
  * @param txt the log entry
  */
-void addLogEntry(const char * txt, ...);
+void addLogEntry (const char *txt, ...);
+
+struct GE_Context *createGtkLogger (GE_KIND mask);
 
-struct GE_Context * createGtkLogger(GE_KIND mask);
-        
 /**
  * Call a callback function from the mainloop/main thread ("SaveCall").
  * Since GTK doesn't work with multi-threaded applications under Windows,
  * all GTK operations have to be done in the main thread
  */
-void * gtkSaveCall(PThreadMain func,
-                   void * arg);
+void *gtkSaveCall (PThreadMain func, void *arg);
 
 /**
  * Run the given "cb" function and save calls
@@ -95,15 +91,14 @@ void * gtkSaveCall(PThreadMain func,
  * keep save calls going while something else
  * happens).
  */
-void * run_with_save_calls(PThreadMain cb,
-                           void * arg);
+void *run_with_save_calls (PThreadMain cb, void *arg);
 
 /**
  * Bind handlers defined by the various
  * plugins to the signals defined by the
  * Glade XML.
  */
-void connectGladeWithPlugins(GladeXML * xml);
+void connectGladeWithPlugins (GladeXML * xml);
 
 #define NOTIFY_LOW 0
 #define NOTIFY_NORMAL 1
@@ -112,30 +107,27 @@ void connectGladeWithPlugins(GladeXML * xml);
 /**
  * Sends a message to libnotify
  */
-void gnunetgtk_notify(int type,
-                      const char * message,
-                      ...);
+void gnunetgtk_notify (int type, const char *message, ...);
 
 /**
  * Validate that a string is a Utf-8 string.
  * If validation fails, msg is freed and a valid
  * Utf-8 string is returned.
  */
-char * validate_utf8(char * msg);
+char *validate_utf8 (char *msg);
 
 /**
  * Gtk callback to save the main window state (tray icon use)
  */
-void saveMainWindowState(GtkWidget *main_window,
-                         GdkEventWindowState *event,
-                         gpointer user_data);
+void saveMainWindowState (GtkWidget * main_window,
+                          GdkEventWindowState * event, gpointer user_data);
 
 /**
  * Get the last main window state when restoring (tray icon use)
  */
-GdkWindowState getMainWindowState(void);
+GdkWindowState getMainWindowState (void);
 
-void gnunet_gtk_main_quit(void);
+void gnunet_gtk_main_quit (void);
 
 /**
 * Start gnunet-setup, asking for a password if needed
@@ -149,20 +141,19 @@ gboolean startGNUnetSetup (gboolean run_wizard);
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_selection_selected_foreach(GtkTreeSelection *selection,
-                                         GtkTreeSelectionForeachFunc func,
-                                         gpointer data);
+void ggc_tree_selection_selected_foreach (GtkTreeSelection * selection,
+                                          GtkTreeSelectionForeachFunc func,
+                                          gpointer data);
 
 /**
  * Identical to "gtk_tree_model_foreach",
  * except that modifications of the underlying model
  * during the iteration are tolerated.
  */
-void ggc_tree_model_foreach(GtkTreeModel * model,
-                            GtkTreeSelectionForeachFunc func,
-                            gpointer data);
+void ggc_tree_model_foreach (GtkTreeModel * model,
+                             GtkTreeSelectionForeachFunc func, gpointer data);
 
 
-struct CronManager * gnunet_gtk_get_cron(void);
+struct CronManager *gnunet_gtk_get_cron (void);
 
 #endif
diff --git a/src/include/platform.h b/src/include/platform.h
index 3958ae74..e93c60dc 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -54,27 +54,27 @@
 #define VERBOSE_STATS 0
 
 #ifdef CYGWIN
- #include <sys/reent.h>
- #define _REENT_ONLY
+#include <sys/reent.h>
+#define _REENT_ONLY
 #endif
 
 #include <pthread.h>
 #ifdef CYGWIN
- #undef _REENT_ONLY
+#undef _REENT_ONLY
 #endif
 
 #ifdef _MSC_VER
- #include <Winsock2.h>
+#include <Winsock2.h>
 #else
 #ifndef MINGW
- #include <netdb.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netinet/tcp.h>
- #include <netinet/in.h>
- #include <pwd.h>
- #include <sys/ioctl.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include <pwd.h>
+#include <sys/ioctl.h>
 #endif
 #endif
 
@@ -83,47 +83,47 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #ifndef _MSC_VER
-#include <ltdl.h> /* KLB_FIX */
+#include <ltdl.h>               /* KLB_FIX */
 #endif
 #include <errno.h>
 #include <signal.h>
 #ifndef _MSC_VER
-#include <unistd.h> /* KLB_FIX */
+#include <unistd.h>             /* KLB_FIX */
 #endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #ifndef _MSC_VER
-#include <dirent.h> /* KLB_FIX */
+#include <dirent.h>             /* KLB_FIX */
 #endif
 #include <fcntl.h>
 #include <math.h>
 
 #if TIME_WITH_SYS_TIME
- #include <sys/time.h>
- #include <time.h>
+#include <sys/time.h>
+#include <time.h>
 #else
- #if HAVE_SYS_TIME_H
-  #include <sys/time.h>
- #else
-  #include <time.h>
- #endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#else
+#include <time.h>
+#endif
 #endif
 
 /* if we have both openssl & libgcrypt, stick
    to openssl for now (who has the obscure
    libgcrypt CVS version that works for us!?...) */
 #if USE_OPENSSL
- #if USE_GCRYPT
-  #undef USE_GCRYPT
-  #define USE_GCRYPT 0
- #endif
+#if USE_GCRYPT
+#undef USE_GCRYPT
+#define USE_GCRYPT 0
+#endif
 #endif
 
 #ifdef SOMEBSD
- #include <net/if.h>
+#include <net/if.h>
 #endif
 #ifdef FREEBSD
- #include <semaphore.h>
+#include <semaphore.h>
 #endif
 #ifdef OSX
 #include <semaphore.h>
@@ -153,9 +153,9 @@
 
 
 #ifdef CYGWIN
- #define SIOCGIFCONF     _IOW('s', 100, struct ifconf) /* get if list */
- #define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq) /* Get if flags */
- #define SIOCGIFADDR     _IOW('s', 102, struct ifreq) /* Get if addr */
+#define SIOCGIFCONF     _IOW('s', 100, struct ifconf)   /* get if list */
+#define SIOCGIFFLAGS    _IOW('s', 101, struct ifreq)    /* Get if flags */
+#define SIOCGIFADDR     _IOW('s', 102, struct ifreq)    /* Get if addr */
 #endif
 
 #ifndef MINGW
@@ -163,15 +163,15 @@
 #endif
 
 #ifdef OSX
- #define socklen_t unsigned int
+#define socklen_t unsigned int
 #endif
 
 #if !HAVE_ATOLL
-long long atoll(const char *nptr);
+long long atoll (const char *nptr);
 #endif
 
 #if ENABLE_NLS
-        #include "langinfo.h"
+#include "langinfo.h"
 #endif
 
 #include <GNUnet/gnunet_util.h>
diff --git a/src/include/plibc.h b/src/include/plibc.h
index 7118c69d..2178dc76 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -29,17 +29,18 @@
 #define _PLIBC_H_
 
 #ifndef SIGALRM
- #define SIGALRM 14
+#define SIGALRM 14
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #ifdef WINDOWS
 
 #if ENABLE_NLS
-  #include "langinfo.h"
+#include "langinfo.h"
 #endif
 
 #include <windows.h>
@@ -71,109 +72,109 @@ extern "C" {
 #define int32_t long
 
 #ifndef pid_t
-        #define pid_t int
+#define pid_t int
 #endif
 
 #ifndef WEXITSTATUS
-        #define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
+#define WEXITSTATUS(status) (((status) & 0xff00) >> 8)
 #endif
 
 /* Thanks to the Cygwin project */
-#define ENOCSI 43       /* No CSI structure available */
-#define EL2HLT 44       /* Level 2 halted */
+#define ENOCSI 43               /* No CSI structure available */
+#define EL2HLT 44               /* Level 2 halted */
 #ifndef  EDEADLK
-        #define EDEADLK 45      /* Deadlock condition */
+#define EDEADLK 45              /* Deadlock condition */
 #endif
 #ifndef  ENOLCK
-        #define ENOLCK 46       /* No record locks available */
+#define ENOLCK 46               /* No record locks available */
 #endif
-#define EBADE 50        /* Invalid exchange */
-#define EBADR 51        /* Invalid request descriptor */
-#define EXFULL 52       /* Exchange full */
-#define ENOANO 53       /* No anode */
-#define EBADRQC 54      /* Invalid request code */
-#define EBADSLT 55      /* Invalid slot */
+#define EBADE 50                /* Invalid exchange */
+#define EBADR 51                /* Invalid request descriptor */
+#define EXFULL 52               /* Exchange full */
+#define ENOANO 53               /* No anode */
+#define EBADRQC 54              /* Invalid request code */
+#define EBADSLT 55              /* Invalid slot */
 #ifndef  EDEADLOCK
-        #define EDEADLOCK EDEADLK       /* File locking deadlock error */
+#define EDEADLOCK EDEADLK       /* File locking deadlock error */
 #endif
-#define EBFONT 57       /* Bad font file fmt */
-#define ENOSTR 60       /* Device not a stream */
-#define ENODATA 61      /* No data (for no delay io) */
-#define ETIME 62        /* Timer expired */
-#define ENOSR 63        /* Out of streams resources */
-#define ENONET 64       /* Machine is not on the network */
-#define ENOPKG 65       /* Package not installed */
-#define EREMOTE 66      /* The object is remote */
-#define ENOLINK 67      /* The link has been severed */
-#define EADV 68         /* Advertise error */
-#define ESRMNT 69       /* Srmount error */
-#define ECOMM 70        /* Communication error on send */
-#define EPROTO 71       /* Protocol error */
-#define EMULTIHOP 74    /* Multihop attempted */
-#define ELBIN 75        /* Inode is remote (not really error) */
-#define EDOTDOT 76      /* Cross mount point (not really error) */
-#define EBADMSG 77      /* Trying to read unreadable message */
-#define ENOTUNIQ 80     /* Given log. name not unique */
-#define EBADFD 81       /* f.d. invalid for this operation */
-#define EREMCHG 82      /* Remote address changed */
-#define ELIBACC 83      /* Can't access a needed shared lib */
-#define ELIBBAD 84      /* Accessing a corrupted shared lib */
-#define ELIBSCN 85      /* .lib section in a.out corrupted */
-#define ELIBMAX 86      /* Attempting to link in too many libs */
-#define ELIBEXEC 87     /* Attempting to exec a shared library */
+#define EBFONT 57               /* Bad font file fmt */
+#define ENOSTR 60               /* Device not a stream */
+#define ENODATA 61              /* No data (for no delay io) */
+#define ETIME 62                /* Timer expired */
+#define ENOSR 63                /* Out of streams resources */
+#define ENONET 64               /* Machine is not on the network */
+#define ENOPKG 65               /* Package not installed */
+#define EREMOTE 66              /* The object is remote */
+#define ENOLINK 67              /* The link has been severed */
+#define EADV 68                 /* Advertise error */
+#define ESRMNT 69               /* Srmount error */
+#define ECOMM 70                /* Communication error on send */
+#define EPROTO 71               /* Protocol error */
+#define EMULTIHOP 74            /* Multihop attempted */
+#define ELBIN 75                /* Inode is remote (not really error) */
+#define EDOTDOT 76              /* Cross mount point (not really error) */
+#define EBADMSG 77              /* Trying to read unreadable message */
+#define ENOTUNIQ 80             /* Given log. name not unique */
+#define EBADFD 81               /* f.d. invalid for this operation */
+#define EREMCHG 82              /* Remote address changed */
+#define ELIBACC 83              /* Can't access a needed shared lib */
+#define ELIBBAD 84              /* Accessing a corrupted shared lib */
+#define ELIBSCN 85              /* .lib section in a.out corrupted */
+#define ELIBMAX 86              /* Attempting to link in too many libs */
+#define ELIBEXEC 87             /* Attempting to exec a shared library */
 #ifndef  ENOSYS
-        #define ENOSYS 88       /* Function not implemented */
+#define ENOSYS 88               /* Function not implemented */
 #endif
-#define ENMFILE 89      /* No more files */
+#define ENMFILE 89              /* No more files */
 #ifndef  ENOTEMPTY
-        #define ENOTEMPTY 90    /* Directory not empty */
+#define ENOTEMPTY 90            /* Directory not empty */
 #endif
 #ifndef  ENAMETOOLONG
-        #define ENAMETOOLONG 91 /* File or path name too long */
+#define ENAMETOOLONG 91         /* File or path name too long */
 #endif
-#define ELOOP 92        /* Too many symbolic links */
-#define EOPNOTSUPP 95   /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT 96 /* Protocol family not supported */
-#define ECONNRESET 104  /* Connection reset by peer */
-#define ENOBUFS 105     /* No buffer space available */
-#define EAFNOSUPPORT 106 /* Address family not supported by protocol family */
-#define EPROTOTYPE 107  /* Protocol wrong type for socket */
-#define ENOTSOCK 108    /* Socket operation on non-socket */
-#define ENOPROTOOPT 109 /* Protocol not available */
-#define ESHUTDOWN 110   /* Can't send after socket shutdown */
-#define ECONNREFUSED 111        /* Connection refused */
-#define EADDRINUSE 112          /* Address already in use */
-#define ECONNABORTED 113        /* Connection aborted */
-#define ENETUNREACH 114         /* Network is unreachable */
-#define ENETDOWN 115            /* Network interface is not configured */
+#define ELOOP 92                /* Too many symbolic links */
+#define EOPNOTSUPP 95           /* Operation not supported on transport endpoint */
+#define EPFNOSUPPORT 96         /* Protocol family not supported */
+#define ECONNRESET 104          /* Connection reset by peer */
+#define ENOBUFS 105             /* No buffer space available */
+#define EAFNOSUPPORT 106        /* Address family not supported by protocol family */
+#define EPROTOTYPE 107          /* Protocol wrong type for socket */
+#define ENOTSOCK 108            /* Socket operation on non-socket */
+#define ENOPROTOOPT 109         /* Protocol not available */
+#define ESHUTDOWN 110           /* Can't send after socket shutdown */
+#define ECONNREFUSED 111        /* Connection refused */
+#define EADDRINUSE 112          /* Address already in use */
+#define ECONNABORTED 113        /* Connection aborted */
+#define ENETUNREACH 114         /* Network is unreachable */
+#define ENETDOWN 115            /* Network interface is not configured */
 #ifndef  ETIMEDOUT
-        #define ETIMEDOUT 116           /* Connection timed out */
+#define ETIMEDOUT 116           /* Connection timed out */
 #endif
-#define EHOSTDOWN 117           /* Host is down */
-#define EHOSTUNREACH 118        /* Host is unreachable */
-#define EINPROGRESS 119         /* Connection already in progress */
-#define EALREADY 120            /* Socket already connected */
-#define EDESTADDRREQ 121        /* Destination address required */
-#define EMSGSIZE 122            /* Message too long */
-#define EPROTONOSUPPORT 123     /* Unknown protocol */
-#define ESOCKTNOSUPPORT 124     /* Socket type not supported */
-#define EADDRNOTAVAIL 125       /* Address not available */
-#define ENETRESET 126           /* Connection aborted by network */
-#define EISCONN 127                 /* Socket is already connected */
-#define ENOTCONN 128            /* Socket is not connected */
-#define ETOOMANYREFS 129        /* Too many references: cannot splice */
-#define EPROCLIM 130            /* Too many processes */
-#define EUSERS 131                      /* Too many users */
-#define EDQUOT 132                      /* Disk quota exceeded */
-#define ESTALE 133          /* Unknown error */
+#define EHOSTDOWN 117           /* Host is down */
+#define EHOSTUNREACH 118        /* Host is unreachable */
+#define EINPROGRESS 119         /* Connection already in progress */
+#define EALREADY 120            /* Socket already connected */
+#define EDESTADDRREQ 121        /* Destination address required */
+#define EMSGSIZE 122            /* Message too long */
+#define EPROTONOSUPPORT 123     /* Unknown protocol */
+#define ESOCKTNOSUPPORT 124     /* Socket type not supported */
+#define EADDRNOTAVAIL 125       /* Address not available */
+#define ENETRESET 126           /* Connection aborted by network */
+#define EISCONN 127             /* Socket is already connected */
+#define ENOTCONN 128            /* Socket is not connected */
+#define ETOOMANYREFS 129        /* Too many references: cannot splice */
+#define EPROCLIM 130            /* Too many processes */
+#define EUSERS 131              /* Too many users */
+#define EDQUOT 132              /* Disk quota exceeded */
+#define ESTALE 133              /* Unknown error */
 #ifndef  ENOTSUP
-        #define ENOTSUP 134                 /* Not supported */
+#define ENOTSUP 134             /* Not supported */
 #endif
-#define ENOMEDIUM 135       /* No medium (in tape drive) */
-#define ENOSHARE 136        /* No such host or network path */
-#define ECASECLASH 137      /* Filename exists with different case */
-#define EWOULDBLOCK EAGAIN      /* Operation would block */
-#define EOVERFLOW 139 /* Value too large for defined data type */
+#define ENOMEDIUM 135           /* No medium (in tape drive) */
+#define ENOSHARE 136            /* No such host or network path */
+#define ECASECLASH 137          /* Filename exists with different case */
+#define EWOULDBLOCK EAGAIN      /* Operation would block */
+#define EOVERFLOW 139           /* Value too large for defined data type */
 
 #undef HOST_NOT_FOUND
 #define HOST_NOT_FOUND 1
@@ -187,65 +188,65 @@ extern "C" {
 #define PROT_READ   0x1
 #define PROT_WRITE  0x2
 #define MAP_SHARED  0x1
-#define MAP_PRIVATE 0x2 /* unsupported */
+#define MAP_PRIVATE 0x2         /* unsupported */
 #define MAP_FIXED   0x10
 #define MAP_FAILED  ((void *)-1)
 
-struct statfs
-{
-  long f_type;                  /* type of filesystem (see below) */
-  long f_bsize;                 /* optimal transfer block size */
-  long f_blocks;                /* total data blocks in file system */
-  long f_bfree;                 /* free blocks in fs */
-  long f_bavail;                /* free blocks avail to non-superuser */
-  long f_files;                 /* total file nodes in file system */
-  long f_ffree;                 /* free file nodes in fs */
-  long f_fsid;                  /* file system id */
-  long f_namelen;               /* maximum length of filenames */
-  long f_spare[6];              /* spare for later */
-};
+  struct statfs
+  {
+    long f_type;                /* type of filesystem (see below) */
+    long f_bsize;               /* optimal transfer block size */
+    long f_blocks;              /* total data blocks in file system */
+    long f_bfree;               /* free blocks in fs */
+    long f_bavail;              /* free blocks avail to non-superuser */
+    long f_files;               /* total file nodes in file system */
+    long f_ffree;               /* free file nodes in fs */
+    long f_fsid;                /* file system id */
+    long f_namelen;             /* maximum length of filenames */
+    long f_spare[6];            /* spare for later */
+  };
 
 /* Taken from the Wine project <http://www.winehq.org>
     /wine/include/winternl.h */
-enum SYSTEM_INFORMATION_CLASS
-{
-  SystemBasicInformation = 0,
-  Unknown1,
-  SystemPerformanceInformation = 2,
-  SystemTimeOfDayInformation = 3, /* was SystemTimeInformation */
-  Unknown4,
-  SystemProcessInformation = 5,
-  Unknown6,
-  Unknown7,
-  SystemProcessorPerformanceInformation = 8,
-  Unknown9,
-  Unknown10,
-  SystemDriverInformation,
-  Unknown12,
-  Unknown13,
-  Unknown14,
-  Unknown15,
-  SystemHandleList,
-  Unknown17,
-  Unknown18,
-  Unknown19,
-  Unknown20,
-  SystemCacheInformation,
-  Unknown22,
-  SystemInterruptInformation = 23,
-  SystemExceptionInformation = 33,
-  SystemRegistryQuotaInformation = 37,
-  SystemLookasideInformation = 45
-};
-
-typedef struct
-{
+  enum SYSTEM_INFORMATION_CLASS
+  {
+    SystemBasicInformation = 0,
+    Unknown1,
+    SystemPerformanceInformation = 2,
+    SystemTimeOfDayInformation = 3,     /* was SystemTimeInformation */
+    Unknown4,
+    SystemProcessInformation = 5,
+    Unknown6,
+    Unknown7,
+    SystemProcessorPerformanceInformation = 8,
+    Unknown9,
+    Unknown10,
+    SystemDriverInformation,
+    Unknown12,
+    Unknown13,
+    Unknown14,
+    Unknown15,
+    SystemHandleList,
+    Unknown17,
+    Unknown18,
+    Unknown19,
+    Unknown20,
+    SystemCacheInformation,
+    Unknown22,
+    SystemInterruptInformation = 23,
+    SystemExceptionInformation = 33,
+    SystemRegistryQuotaInformation = 37,
+    SystemLookasideInformation = 45
+  };
+
+  typedef struct
+  {
     LARGE_INTEGER IdleTime;
     LARGE_INTEGER KernelTime;
     LARGE_INTEGER UserTime;
     LARGE_INTEGER Reserved1[2];
     ULONG Reserved2;
-} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
+  } SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION;
 
 #define sleep(secs) (Sleep(secs * 1000))
 
@@ -262,11 +263,11 @@ typedef struct
 #define SHUT_RDWR SD_BOTH
 
 /* Operations for flock() */
-#define LOCK_SH  1       /* shared lock */
-#define LOCK_EX  2       /* exclusive lock */
-#define LOCK_NB  4       /* or'd with one of the above to prevent
-                            blocking */
-#define LOCK_UN  8       /* remove lock */
+#define LOCK_SH  1              /* shared lock */
+#define LOCK_EX  2              /* exclusive lock */
+#define LOCK_NB  4              /* or'd with one of the above to prevent
+                                   blocking */
+#define LOCK_UN  8              /* remove lock */
 
 /* Not supported under MinGW */
 #define S_IRGRP 0
@@ -288,258 +289,259 @@ typedef struct
  */
 #define index(s, c) strchr(s, c)
 
-BOOL _plibc_CreateShortcut(const char *pszSrc, const char *pszDest);
-BOOL _plibc_DereferenceShortcut(char *pszShortcut);
-char *plibc_ChooseDir(char *pszTitle, unsigned long ulFlags);
-char *plibc_ChooseFile(char *pszTitle, unsigned long ulFlags);
-long QueryRegistry(HKEY hMainKey, char *pszKey, char *pszSubKey,
-              char *pszBuffer, long *pdLength);
-
-BOOL __win_IsHandleMarkedAsBlocking(SOCKET hHandle);
-void __win_SetHandleBlockingMode(SOCKET s, BOOL bBlocking);
-void __win_DiscardHandleBlockingMode(SOCKET s);
-int _win_isSocketValid(int s);
-int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);
-
-typedef void (*TPanicProc) (int, char *);
-void plibc_set_panic_proc(TPanicProc proc);
-
-int flock(int fd, int operation);
-int fsync(int fildes);
-int inet_pton(int af, const char *src, void *dst);
-int inet_pton4(const char *src, u_char *dst, int pton);
+  BOOL _plibc_CreateShortcut (const char *pszSrc, const char *pszDest);
+  BOOL _plibc_DereferenceShortcut (char *pszShortcut);
+  char *plibc_ChooseDir (char *pszTitle, unsigned long ulFlags);
+  char *plibc_ChooseFile (char *pszTitle, unsigned long ulFlags);
+  long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
+                      char *pszBuffer, long *pdLength);
+
+  BOOL __win_IsHandleMarkedAsBlocking (SOCKET hHandle);
+  void __win_SetHandleBlockingMode (SOCKET s, BOOL bBlocking);
+  void __win_DiscardHandleBlockingMode (SOCKET s);
+  int _win_isSocketValid (int s);
+  int plibc_conv_to_win_path (const char *pszUnix, char *pszWindows);
+
+  typedef void (*TPanicProc) (int, char *);
+  void plibc_set_panic_proc (TPanicProc proc);
+
+  int flock (int fd, int operation);
+  int fsync (int fildes);
+  int inet_pton (int af, const char *src, void *dst);
+  int inet_pton4 (const char *src, u_char * dst, int pton);
 #if USE_IPV6
-int inet_pton6(const char *src, u_char *dst);
+  int inet_pton6 (const char *src, u_char * dst);
 #endif
-int truncate(const char *fname, int distance);
-int statfs(const char *path, struct statfs *buf);
-const char *hstrerror(int err);
-void gettimeofday(struct timeval *tp, void *tzp);
-int mkstemp(char *tmplate);
-char *strptime (const char *buf, const char *format, struct tm *tm);
-char *ctime(const time_t *clock);
-char *ctime_r(const time_t *clock, char *buf);
-int plibc_init(char *pszOrg, char *pszApp);
-void plibc_shutdown();
-int plibc_conv_to_win_path_ex(const char *pszUnix, char *pszWindows, int derefLinks);
-void _SetErrnoFromWinError(long lWinError, char *pszCaller, int iLine);
-void SetErrnoFromWinsockError(long lWinError);
-void SetHErrnoFromWinError(long lWinError);
-void SetErrnoFromHRESULT(HRESULT hRes);
-FILE *_win_fopen(const char *filename, const char *mode);
-DIR *_win_opendir(const char *dirname);
-int _win_open(const char *filename, int oflag, ...);
+  int truncate (const char *fname, int distance);
+  int statfs (const char *path, struct statfs *buf);
+  const char *hstrerror (int err);
+  void gettimeofday (struct timeval *tp, void *tzp);
+  int mkstemp (char *tmplate);
+  char *strptime (const char *buf, const char *format, struct tm *tm);
+  char *ctime (const time_t * clock);
+  char *ctime_r (const time_t * clock, char *buf);
+  int plibc_init (char *pszOrg, char *pszApp);
+  void plibc_shutdown ();
+  int plibc_conv_to_win_path_ex (const char *pszUnix, char *pszWindows,
+                                 int derefLinks);
+  void _SetErrnoFromWinError (long lWinError, char *pszCaller, int iLine);
+  void SetErrnoFromWinsockError (long lWinError);
+  void SetHErrnoFromWinError (long lWinError);
+  void SetErrnoFromHRESULT (HRESULT hRes);
+  FILE *_win_fopen (const char *filename, const char *mode);
+  DIR *_win_opendir (const char *dirname);
+  int _win_open (const char *filename, int oflag, ...);
 #ifdef ENABLE_NLS
-char *_win_bindtextdomain(const char *domainname, const char *dirname);
+  char *_win_bindtextdomain (const char *domainname, const char *dirname);
 #endif
-int _win_chdir(const char *path);
-int _win_close(int fd);
-int _win_creat(const char *path, mode_t mode);
-int _win_fstat(int handle, struct stat *buffer);
-int _win_pipe(int *phandles);
-int _win_rmdir(const char *path);
-int _win_access( const char *path, int mode );
-int _win_chmod(const char *filename, int pmode);
-char *realpath(const char *file_name, char *resolved_name);
-long _win_random(void);
-int _win_remove(const char *path);
-int _win_rename(const char *oldname, const char *newname);
-int _win_stat(const char *path, struct stat *buffer);
-int _win_unlink(const char *filename);
-int _win_write(int fildes, const void *buf, size_t nbyte);
-int _win_read(int fildes, void *buf, size_t nbyte);
-size_t _win_fwrite(const void *buffer, size_t size, size_t count, FILE *stream);
-size_t _win_fread( void *buffer, size_t size, size_t count, FILE *stream );
-int _win_symlink(const char *path1, const char *path2);
-void *_win_mmap(void *start, size_t len, int access, int flags, int fd,
-                unsigned long long offset);
-int _win_munmap(void *start, size_t length);
-int _win_lstat(const char *path, struct stat *buf);
-int _win_readlink(const char *path, char *buf, size_t bufsize);
-int _win_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
-int _win_printf(const char *format,...);
-int _win_fprintf(FILE *f,const char *format,...);
-int _win_vprintf(const char *format, va_list ap);
-int _win_vfprintf(FILE *stream, const char *format, va_list arg_ptr);
-int _win_vsprintf(char *dest,const char *format, va_list arg_ptr);
-int _win_vsnprintf(char* str, size_t size, const char *format, va_list arg_ptr);
-int _win_snprintf(char *str,size_t size,const char *format,...);
-int _win_sprintf(char *dest,const char *format,...);
-int _win_vsscanf(const char* str, const char* format, va_list arg_ptr);
-int _win_sscanf(const char *str, const char *format, ...);
-int _win_vfscanf(FILE *stream, const char *format, va_list arg_ptr);
-int _win_vscanf(const char *format, va_list arg_ptr);
-int _win_scanf(const char *format, ...);
-int _win_fscanf(FILE *stream, const char *format, ...);
-pid_t _win_waitpid(pid_t pid, int *stat_loc, int options);
-int _win_bind(SOCKET s, const struct sockaddr *name, int namelen);
-int _win_connect(SOCKET s,const struct sockaddr *name, int namelen);
-int _win_getpeername(SOCKET s, struct sockaddr *name,
-                int *namelen);
-int _win_getsockname(SOCKET s, struct sockaddr *name,
-                int *namelen);
-int _win_getsockopt(SOCKET s, int level, int optname, char *optval,
-                                int *optlen);
-int _win_listen(SOCKET s, int backlog);
-int _win_recv(SOCKET s, char *buf, int len, int flags);
-int _win_recvfrom(SOCKET s, void *buf, int len, int flags,
-             struct sockaddr *from, int *fromlen);
-int _win_select(int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
-                const struct timeval *tv);
-int _win_send(SOCKET s, const char *buf, int len, int flags);
-int _win_sendto(SOCKET s, const char *buf, int len, int flags,
-                const struct sockaddr *to, int tolen);
-int _win_setsockopt(SOCKET s, int level, int optname, const void *optval,
-                    int optlen);
-int _win_shutdown(SOCKET s, int how);
-SOCKET _win_socket(int af, int type, int protocol);
-struct hostent *_win_gethostbyaddr(const char *addr, int len, int type);
-struct hostent *_win_gethostbyname(const char *name);
-char *_win_strerror(int errnum);
-int IsWinNT();
+  int _win_chdir (const char *path);
+  int _win_close (int fd);
+  int _win_creat (const char *path, mode_t mode);
+  int _win_fstat (int handle, struct stat *buffer);
+  int _win_pipe (int *phandles);
+  int _win_rmdir (const char *path);
+  int _win_access (const char *path, int mode);
+  int _win_chmod (const char *filename, int pmode);
+  char *realpath (const char *file_name, char *resolved_name);
+  long _win_random (void);
+  int _win_remove (const char *path);
+  int _win_rename (const char *oldname, const char *newname);
+  int _win_stat (const char *path, struct stat *buffer);
+  int _win_unlink (const char *filename);
+  int _win_write (int fildes, const void *buf, size_t nbyte);
+  int _win_read (int fildes, void *buf, size_t nbyte);
+  size_t _win_fwrite (const void *buffer, size_t size, size_t count,
+                      FILE * stream);
+  size_t _win_fread (void *buffer, size_t size, size_t count, FILE * stream);
+  int _win_symlink (const char *path1, const char *path2);
+  void *_win_mmap (void *start, size_t len, int access, int flags, int fd,
+                   unsigned long long offset);
+  int _win_munmap (void *start, size_t length);
+  int _win_lstat (const char *path, struct stat *buf);
+  int _win_readlink (const char *path, char *buf, size_t bufsize);
+  int _win_accept (SOCKET s, struct sockaddr *addr, int *addrlen);
+  int _win_printf (const char *format, ...);
+  int _win_fprintf (FILE * f, const char *format, ...);
+  int _win_vprintf (const char *format, va_list ap);
+  int _win_vfprintf (FILE * stream, const char *format, va_list arg_ptr);
+  int _win_vsprintf (char *dest, const char *format, va_list arg_ptr);
+  int _win_vsnprintf (char *str, size_t size, const char *format,
+                      va_list arg_ptr);
+  int _win_snprintf (char *str, size_t size, const char *format, ...);
+  int _win_sprintf (char *dest, const char *format, ...);
+  int _win_vsscanf (const char *str, const char *format, va_list arg_ptr);
+  int _win_sscanf (const char *str, const char *format, ...);
+  int _win_vfscanf (FILE * stream, const char *format, va_list arg_ptr);
+  int _win_vscanf (const char *format, va_list arg_ptr);
+  int _win_scanf (const char *format, ...);
+  int _win_fscanf (FILE * stream, const char *format, ...);
+  pid_t _win_waitpid (pid_t pid, int *stat_loc, int options);
+  int _win_bind (SOCKET s, const struct sockaddr *name, int namelen);
+  int _win_connect (SOCKET s, const struct sockaddr *name, int namelen);
+  int _win_getpeername (SOCKET s, struct sockaddr *name, int *namelen);
+  int _win_getsockname (SOCKET s, struct sockaddr *name, int *namelen);
+  int _win_getsockopt (SOCKET s, int level, int optname, char *optval,
+                       int *optlen);
+  int _win_listen (SOCKET s, int backlog);
+  int _win_recv (SOCKET s, char *buf, int len, int flags);
+  int _win_recvfrom (SOCKET s, void *buf, int len, int flags,
+                     struct sockaddr *from, int *fromlen);
+  int _win_select (int max_fd, fd_set * rfds, fd_set * wfds, fd_set * efds,
+                   const struct timeval *tv);
+  int _win_send (SOCKET s, const char *buf, int len, int flags);
+  int _win_sendto (SOCKET s, const char *buf, int len, int flags,
+                   const struct sockaddr *to, int tolen);
+  int _win_setsockopt (SOCKET s, int level, int optname, const void *optval,
+                       int optlen);
+  int _win_shutdown (SOCKET s, int how);
+  SOCKET _win_socket (int af, int type, int protocol);
+  struct hostent *_win_gethostbyaddr (const char *addr, int len, int type);
+  struct hostent *_win_gethostbyname (const char *name);
+  char *_win_strerror (int errnum);
+  int IsWinNT ();
 
 #if !HAVE_STRNDUP
-char *strndup (const char *s, size_t n);
+  char *strndup (const char *s, size_t n);
 #endif
 #if !HAVE_STRNLEN
-size_t strnlen (const char *str, size_t maxlen);
+  size_t strnlen (const char *str, size_t maxlen);
 #endif
 
-#endif /* WINDOWS */
+#endif                          /* WINDOWS */
 
 #ifndef WINDOWS
- #define DIR_SEPARATOR '/'
- #define DIR_SEPARATOR_STR "/"
- #define NEWLINE "\n"
+#define DIR_SEPARATOR '/'
+#define DIR_SEPARATOR_STR "/"
+#define NEWLINE "\n"
 
 #ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) bindtextdomain(d, n)
+#define BINDTEXTDOMAIN(d, n) bindtextdomain(d, n)
 #endif
- #define CREAT(p, m) creat(p, m)
- #undef FOPEN
- #define FOPEN(f, m) fopen(f, m)
- #define OPENDIR(d) opendir(d)
- #define OPEN(f) open(f)
- #define CHDIR(d) chdir(d)
- #define CLOSE(f) close(f)
- #define RMDIR(f) rmdir(f)
- #define ACCESS(p, m) access(p, m)
- #define CHMOD(f, p) chmod(f, p)
- #define FSTAT(h, b) fstat(h, b)
- #define PIPE(h) pipe(h)
- #define REMOVE(p) remove(p)
- #define RENAME(o, n) rename(o, n)
- #define STAT(p, b) stat(p, b)
- #define UNLINK(f) unlink(f)
- #define WRITE(f, b, n) write(f, b, n)
- #define READ(f, b, n) read(f, b, n)
- #define GN_FREAD(b, s, c, f) fread(b, s, c, f)
- #define GN_FWRITE(b, s, c, f) fwrite(b, s, c, f)
- #define SYMLINK(a, b) symlink(a, b)
- #define MMAP(s, l, p, f, d, o) mmap(s, l, p, f, d, o)
- #define MUNMAP(s, l) munmap(s, l)
- #define STRERROR(i) strerror(i)
- #define RANDOM() random()
- #define READLINK(p, b, s) readlink(p, b, s)
- #define LSTAT(p, b) lstat(p, b)
- #define PRINTF printf
- #define FPRINTF fprintf
- #define VPRINTF(f, a) vprintf(f, a)
- #define VFPRINTF(s, f, a) vfprintf(s, f, a)
- #define VSPRINTF(d, f, a) vsprintf(d, f, a)
- #define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
- #define _REAL_SNPRINTF snprintf
- #define SPRINTF sprintf
- #define VSSCANF(s, f, a) vsscanf(s, f, a)
- #define SSCANF sscanf
- #define VFSCANF(s, f, a) vfscanf(s, f, a)
- #define VSCANF(f, a) vscanf(f, a)
- #define SCANF scanf
- #define FSCANF fscanf
- #define WAITPID(p, s, o) waitpid(p, s, o)
- #define ACCEPT(s, a, l) accept(s, a, l)
- #define BIND(s, n, l) bind(s, n, l)
- #define CONNECT(s, n, l) connect(s, n, l)
- #define GETPEERNAME(s, n, l) getpeername(s, n, l)
- #define GETSOCKNAME(s, n, l) getsockname(s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) getsockopt(s, l, o, v, p)
- #define LISTEN(s, b) listen(s, b)
- #define RECV(s, b, l, f) recv(s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) recvfrom(s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) select(n, r, w, e, t)
- #define SEND(s, b, l, f) send(s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) sendto(s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) setsockopt(s, l, o, v, n)
- #define SHUTDOWN(s, h) shutdown(s, h)
- #define SOCKET(a, t, p) socket(a, t, p)
- #define GETHOSTBYADDR(a, l, t) gethostbyname(a, l, t)
- #define GETHOSTBYNAME(n) gethostbyname(n)
+#define CREAT(p, m) creat(p, m)
+#undef FOPEN
+#define FOPEN(f, m) fopen(f, m)
+#define OPENDIR(d) opendir(d)
+#define OPEN(f) open(f)
+#define CHDIR(d) chdir(d)
+#define CLOSE(f) close(f)
+#define RMDIR(f) rmdir(f)
+#define ACCESS(p, m) access(p, m)
+#define CHMOD(f, p) chmod(f, p)
+#define FSTAT(h, b) fstat(h, b)
+#define PIPE(h) pipe(h)
+#define REMOVE(p) remove(p)
+#define RENAME(o, n) rename(o, n)
+#define STAT(p, b) stat(p, b)
+#define UNLINK(f) unlink(f)
+#define WRITE(f, b, n) write(f, b, n)
+#define READ(f, b, n) read(f, b, n)
+#define GN_FREAD(b, s, c, f) fread(b, s, c, f)
+#define GN_FWRITE(b, s, c, f) fwrite(b, s, c, f)
+#define SYMLINK(a, b) symlink(a, b)
+#define MMAP(s, l, p, f, d, o) mmap(s, l, p, f, d, o)
+#define MUNMAP(s, l) munmap(s, l)
+#define STRERROR(i) strerror(i)
+#define RANDOM() random()
+#define READLINK(p, b, s) readlink(p, b, s)
+#define LSTAT(p, b) lstat(p, b)
+#define PRINTF printf
+#define FPRINTF fprintf
+#define VPRINTF(f, a) vprintf(f, a)
+#define VFPRINTF(s, f, a) vfprintf(s, f, a)
+#define VSPRINTF(d, f, a) vsprintf(d, f, a)
+#define VSNPRINTF(str, size, fmt, a) vsnprintf(str, size, fmt, a)
+#define _REAL_SNPRINTF snprintf
+#define SPRINTF sprintf
+#define VSSCANF(s, f, a) vsscanf(s, f, a)
+#define SSCANF sscanf
+#define VFSCANF(s, f, a) vfscanf(s, f, a)
+#define VSCANF(f, a) vscanf(f, a)
+#define SCANF scanf
+#define FSCANF fscanf
+#define WAITPID(p, s, o) waitpid(p, s, o)
+#define ACCEPT(s, a, l) accept(s, a, l)
+#define BIND(s, n, l) bind(s, n, l)
+#define CONNECT(s, n, l) connect(s, n, l)
+#define GETPEERNAME(s, n, l) getpeername(s, n, l)
+#define GETSOCKNAME(s, n, l) getsockname(s, n, l)
+#define GETSOCKOPT(s, l, o, v, p) getsockopt(s, l, o, v, p)
+#define LISTEN(s, b) listen(s, b)
+#define RECV(s, b, l, f) recv(s, b, l, f)
+#define RECVFROM(s, b, l, f, r, o) recvfrom(s, b, l, f, r, o)
+#define SELECT(n, r, w, e, t) select(n, r, w, e, t)
+#define SEND(s, b, l, f) send(s, b, l, f)
+#define SENDTO(s, b, l, f, o, n) sendto(s, b, l, f, o, n)
+#define SETSOCKOPT(s, l, o, v, n) setsockopt(s, l, o, v, n)
+#define SHUTDOWN(s, h) shutdown(s, h)
+#define SOCKET(a, t, p) socket(a, t, p)
+#define GETHOSTBYADDR(a, l, t) gethostbyname(a, l, t)
+#define GETHOSTBYNAME(n) gethostbyname(n)
 #else
- #define DIR_SEPARATOR '\\'
- #define DIR_SEPARATOR_STR "\\"
- #define NEWLINE "\r\n"
+#define DIR_SEPARATOR '\\'
+#define DIR_SEPARATOR_STR "\\"
+#define NEWLINE "\r\n"
 
 #ifdef ENABLE_NLS
- #define BINDTEXTDOMAIN(d, n) _win_bindtextdomain(d, n)
+#define BINDTEXTDOMAIN(d, n) _win_bindtextdomain(d, n)
 #endif
- #define CREAT(p, m) _win_creat(p, m)
- #define FOPEN(f, m) _win_fopen(f, m)
- #define OPENDIR(d) _win_opendir(d)
- #define OPEN(f) _win_open(f)
- #define CHDIR(d) _win_chdir(d)
- #define CLOSE(f) _win_close(f)
- #define FSTAT(h, b) _win_fstat(h, b)
- #define RMDIR(f) _win_rmdir(f)
- #define ACCESS(p, m) _win_access(p, m)
- #define CHMOD(f, p) _win_chmod(f, p)
- #define PIPE(h) _win_pipe(h)
- #define RANDOM() _win_random()
- #define REMOVE(p) _win_remove(p)
- #define RENAME(o, n) _win_rename(o, n)
- #define STAT(p, b) _win_stat(p, b)
- #define UNLINK(f) _win_unlink(f)
- #define WRITE(f, b, n) _win_write(f, b, n)
- #define READ(f, b, n) _win_read(f, b, n)
- #define GN_FREAD(b, s, c, f) _win_fread(b, s, c, f)
- #define GN_FWRITE(b, s, c, f) _win_fwrite(b, s, c, f)
- #define SYMLINK(a, b) _win_symlink(a, b)
- #define MMAP(s, l, p, f, d, o) _win_mmap(s, l, p, f, d, o)
- #define MUNMAP(s, l) _win_munmap(s, l)
- #define STRERROR(i) _win_strerror(i)
- #define READLINK(p, b, s) _win_readlink(p, b, s)
- #define LSTAT(p, b) _win_lstat(p, b)
- #define PRINTF(f, ...) _win_printf(f , __VA_ARGS__)
- #define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__)
- #define VPRINTF(f, a) _win_vprintf(f, a)
- #define VFPRINTF(s, f, a) _win_vfprintf(s, f, a)
- #define VSPRINTF(d, f, a) _win_vsprintf(d, f, a)
- #define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a)
- #define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt, __VA_ARGS__)
- #define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__)
- #define VSSCANF(s, f, a) _win_vsscanf(s, f, a)
- #define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__)
- #define VFSCANF(s, f, a) _win_vfscanf(s, f, a)
- #define VSCANF(f, a) _win_vscanf(f, a)
- #define SCANF(f, ...) _win_scanf(f, __VA_ARGS__)
- #define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)
- #define WAITPID(p, s, o) _win_waitpid(p, s, o)
- #define ACCEPT(s, a, l) _win_accept(s, a, l)
- #define BIND(s, n, l) _win_bind(s, n, l)
- #define CONNECT(s, n, l) _win_connect(s, n, l)
- #define GETPEERNAME(s, n, l) _win_getpeername(s, n, l)
- #define GETSOCKNAME(s, n, l) _win_getsockname(s, n, l)
- #define GETSOCKOPT(s, l, o, v, p) _win_getsockopt(s, l, o, v, p)
- #define LISTEN(s, b) _win_listen(s, b)
- #define RECV(s, b, l, f) _win_recv(s, b, l, f)
- #define RECVFROM(s, b, l, f, r, o) _win_recvfrom(s, b, l, f, r, o)
- #define SELECT(n, r, w, e, t) _win_select(n, r, w, e, t)
- #define SEND(s, b, l, f) _win_send(s, b, l, f)
- #define SENDTO(s, b, l, f, o, n) _win_sendto(s, b, l, f, o, n)
- #define SETSOCKOPT(s, l, o, v, n) _win_setsockopt(s, l, o, v, n)
- #define SHUTDOWN(s, h) _win_shutdown(s, h)
- #define SOCKET(a, t, p) _win_socket(a, t, p)
- #define GETHOSTBYADDR(a, l, t) _win_gethostbyname(a, l, t)
- #define GETHOSTBYNAME(n) _win_gethostbyname(n)
+#define CREAT(p, m) _win_creat(p, m)
+#define FOPEN(f, m) _win_fopen(f, m)
+#define OPENDIR(d) _win_opendir(d)
+#define OPEN(f) _win_open(f)
+#define CHDIR(d) _win_chdir(d)
+#define CLOSE(f) _win_close(f)
+#define FSTAT(h, b) _win_fstat(h, b)
+#define RMDIR(f) _win_rmdir(f)
+#define ACCESS(p, m) _win_access(p, m)
+#define CHMOD(f, p) _win_chmod(f, p)
+#define PIPE(h) _win_pipe(h)
+#define RANDOM() _win_random()
+#define REMOVE(p) _win_remove(p)
+#define RENAME(o, n) _win_rename(o, n)
+#define STAT(p, b) _win_stat(p, b)
+#define UNLINK(f) _win_unlink(f)
+#define WRITE(f, b, n) _win_write(f, b, n)
+#define READ(f, b, n) _win_read(f, b, n)
+#define GN_FREAD(b, s, c, f) _win_fread(b, s, c, f)
+#define GN_FWRITE(b, s, c, f) _win_fwrite(b, s, c, f)
+#define SYMLINK(a, b) _win_symlink(a, b)
+#define MMAP(s, l, p, f, d, o) _win_mmap(s, l, p, f, d, o)
+#define MUNMAP(s, l) _win_munmap(s, l)
+#define STRERROR(i) _win_strerror(i)
+#define READLINK(p, b, s) _win_readlink(p, b, s)
+#define LSTAT(p, b) _win_lstat(p, b)
+#define PRINTF(f, ...) _win_printf(f , __VA_ARGS__)
+#define FPRINTF(fil, fmt, ...) _win_fprintf(fil, fmt, __VA_ARGS__)
+#define VPRINTF(f, a) _win_vprintf(f, a)
+#define VFPRINTF(s, f, a) _win_vfprintf(s, f, a)
+#define VSPRINTF(d, f, a) _win_vsprintf(d, f, a)
+#define VSNPRINTF(str, size, fmt, a) _win_vsnprintf(str, size, fmt, a)
+#define _REAL_SNPRINTF(str, size, fmt, ...) _win_snprintf(str, size, fmt, __VA_ARGS__)
+#define SPRINTF(d, f, ...) _win_sprintf(d, f, __VA_ARGS__)
+#define VSSCANF(s, f, a) _win_vsscanf(s, f, a)
+#define SSCANF(s, f, ...) _win_sscanf(s, f, __VA_ARGS__)
+#define VFSCANF(s, f, a) _win_vfscanf(s, f, a)
+#define VSCANF(f, a) _win_vscanf(f, a)
+#define SCANF(f, ...) _win_scanf(f, __VA_ARGS__)
+#define FSCANF(s, f, ...) _win_fscanf(s, f, __VA_ARGS__)
+#define WAITPID(p, s, o) _win_waitpid(p, s, o)
+#define ACCEPT(s, a, l) _win_accept(s, a, l)
+#define BIND(s, n, l) _win_bind(s, n, l)
+#define CONNECT(s, n, l) _win_connect(s, n, l)
+#define GETPEERNAME(s, n, l) _win_getpeername(s, n, l)
+#define GETSOCKNAME(s, n, l) _win_getsockname(s, n, l)
+#define GETSOCKOPT(s, l, o, v, p) _win_getsockopt(s, l, o, v, p)
+#define LISTEN(s, b) _win_listen(s, b)
+#define RECV(s, b, l, f) _win_recv(s, b, l, f)
+#define RECVFROM(s, b, l, f, r, o) _win_recvfrom(s, b, l, f, r, o)
+#define SELECT(n, r, w, e, t) _win_select(n, r, w, e, t)
+#define SEND(s, b, l, f) _win_send(s, b, l, f)
+#define SENDTO(s, b, l, f, o, n) _win_sendto(s, b, l, f, o, n)
+#define SETSOCKOPT(s, l, o, v, n) _win_setsockopt(s, l, o, v, n)
+#define SHUTDOWN(s, h) _win_shutdown(s, h)
+#define SOCKET(a, t, p) _win_socket(a, t, p)
+#define GETHOSTBYADDR(a, l, t) _win_gethostbyname(a, l, t)
+#define GETHOSTBYNAME(n) _win_gethostbyname(n)
 #endif
 
 
@@ -548,6 +550,6 @@ size_t strnlen (const char *str, size_t maxlen);
 #endif
 
 
-#endif //_PLIBC_H_
+#endif                          //_PLIBC_H_
 
 /* end of plibc.h */
diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index 333397e7..c59b5b67 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -32,30 +32,26 @@
 /**
  * This displays an about window
  */
-void on_about_clicked_about(GtkWidget *dummy,
-                            gpointer data) {
-  GtkWidget * ad;
-  GladeXML * axml;
-
-  axml
-    = glade_xml_new(getGladeFileName(),
-                    "aboutDialog",
-                    PACKAGE_NAME);
-  ad
-    = glade_xml_get_widget(axml,
-                           "aboutDialog");
-  gtk_dialog_run(GTK_DIALOG(ad));
-  gtk_widget_destroy(ad);
-  g_object_unref(axml);
+void
+on_about_clicked_about (GtkWidget * dummy, gpointer data)
+{
+  GtkWidget *ad;
+  GladeXML *axml;
+
+  axml = glade_xml_new (getGladeFileName (), "aboutDialog", PACKAGE_NAME);
+  ad = glade_xml_get_widget (axml, "aboutDialog");
+  gtk_dialog_run (GTK_DIALOG (ad));
+  gtk_widget_destroy (ad);
+  g_object_unref (axml);
 }
 
-void init_about() {
-  GtkWidget * tab;
+void
+init_about ()
+{
+  GtkWidget *tab;
 
-  tab
-    = glade_xml_get_widget(getMainXML(),
-                           "aboutButton");
-  gtk_widget_show(tab);
+  tab = glade_xml_get_widget (getMainXML (), "aboutButton");
+  gtk_widget_show (tab);
 }
 
 /* end of about.c */
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 1898d979..4b0d20e8 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -33,367 +33,360 @@
 #include <GNUnet/gnunet_util_network_client.h>
 #include <gtk/gtk.h>
 
-static struct CronManager * cron;
+static struct CronManager *cron;
 
-static struct GE_Context * ectx;
+static struct GE_Context *ectx;
 
-static struct GC_Configuration * cfg;
+static struct GC_Configuration *cfg;
 
 /**
  * cron job that periodically updates the model for the
  * application list.
  */
-static void * updateAppModelSafe(void * unused) {
-  struct ClientServerConnection * sock;
-  GtkWidget * w;
-  GtkListStore * model;
+static void *
+updateAppModelSafe (void *unused)
+{
+  struct ClientServerConnection *sock;
+  GtkWidget *w;
+  GtkListStore *model;
   GtkTreeIter iter;
-  char * apps;
-  char * next;
-  char * pos;
-  char * desc;
-
-  model = gtk_list_store_new(2,
-                             G_TYPE_STRING,
-                             G_TYPE_STRING);
+  char *apps;
+  char *next;
+  char *pos;
+  char *desc;
+
+  model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   apps = NULL;
-  sock = client_connection_create(ectx, cfg);
+  sock = client_connection_create (ectx, cfg);
   if (sock != NULL)
-    apps = getConfigurationOptionValue(sock,
-                                       "GNUNETD",
-                                       "APPLICATIONS");
-  if (apps != NULL) {
-    next = apps;
-    do {
-      while (*next == ' ')
-        next++;
-      pos = next;
-      while ( (*next != '\0') &&
-              (*next != ' ') )
-        next++;
-      if (*next == '\0') {
-        next = NULL; /* terminate! */
-      } else {
-        *next = '\0'; /* add 0-termination for pos */
-        next++;
-      }
-      if (strlen(pos) > 0) {
-        desc
-          = getConfigurationOptionValue(sock,
-                                        "ABOUT",
-                                        pos);
-        
-        gtk_list_store_append(model,
-                              &iter);
-        gtk_list_store_set(model,
-                           &iter,
-                           0, pos,
-                           1, dgettext("GNUnet", desc),
-                           -1);
-        FREENONNULL(desc);
-      }
-    } while (next != NULL);
-    FREE(apps);
-  }
-  w = glade_xml_get_widget(getMainXML(),
-                           "applicationList");
-  gtk_tree_view_set_model(GTK_TREE_VIEW(w),
-                          GTK_TREE_MODEL(model));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(w)),
-                              GTK_SELECTION_NONE);
-  connection_destroy(sock);
+    apps = getConfigurationOptionValue (sock, "GNUNETD", "APPLICATIONS");
+  if (apps != NULL)
+    {
+      next = apps;
+      do
+        {
+          while (*next == ' ')
+            next++;
+          pos = next;
+          while ((*next != '\0') && (*next != ' '))
+            next++;
+          if (*next == '\0')
+            {
+              next = NULL;      /* terminate! */
+            }
+          else
+            {
+              *next = '\0';     /* add 0-termination for pos */
+              next++;
+            }
+          if (strlen (pos) > 0)
+            {
+              desc = getConfigurationOptionValue (sock, "ABOUT", pos);
+
+              gtk_list_store_append (model, &iter);
+              gtk_list_store_set (model,
+                                  &iter,
+                                  0, pos, 1, dgettext ("GNUnet", desc), -1);
+              FREENONNULL (desc);
+            }
+        }
+      while (next != NULL);
+      FREE (apps);
+    }
+  w = glade_xml_get_widget (getMainXML (), "applicationList");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
+  connection_destroy (sock);
   return NULL;
 }
 
-static void updateAppModel(void * dummy) {
-  gtkSaveCall(&updateAppModelSafe, NULL);
+static void
+updateAppModel (void *dummy)
+{
+  gtkSaveCall (&updateAppModelSafe, NULL);
 }
 
 
-static void * doUpdateMenus(void * arg) {
-  int ret = *(int*) arg;
-  static GtkWidget * killEntry = NULL;
-  static GtkWidget * launchEntry = NULL;
-  static GtkWidget * statsEntryYes = NULL;
-  static GtkWidget * statsEntryNo = NULL;
-  static GtkWidget * statsEntryError = NULL;
-  static GtkWidget * chooser = NULL;
+static void *
+doUpdateMenus (void *arg)
+{
+  int ret = *(int *) arg;
+  static GtkWidget *killEntry = NULL;
+  static GtkWidget *launchEntry = NULL;
+  static GtkWidget *statsEntryYes = NULL;
+  static GtkWidget *statsEntryNo = NULL;
+  static GtkWidget *statsEntryError = NULL;
+  static GtkWidget *chooser = NULL;
   static int once = 1;
   static int isLocal;
-  char * host;
+  char *host;
   int canStart;
-  struct GC_Configuration * dcfg;
-  char * fn;
-  char * user;
-  struct passwd * pws;
-
-  if (once) {
-    once = 0;
-    killEntry
-      = glade_xml_get_widget(getMainXML(),
-                             "stopDaemon");
-    launchEntry
-      = glade_xml_get_widget(getMainXML(),
-                             "startDaemon");
-    statsEntryYes
-      = glade_xml_get_widget(getMainXML(),
-                             "statusPixmapYes");
-    statsEntryNo
-      = glade_xml_get_widget(getMainXML(),
-                             "statusPixmapNo");
-    statsEntryError
-      = glade_xml_get_widget(getMainXML(),
-                             "statusPixmapError");
-    chooser
-      = glade_xml_get_widget(getMainXML(),
-                             "gnunetdconfigFileChooserButton");
-    GC_get_configuration_value_string(cfg,
-                                      "NETWORK",
-                                      "HOST",
-                                      "localhost",
-                                      &host);
-    if (strcmp(host, "localhost")==0)
-      isLocal = TRUE;
-    else
-      isLocal = FALSE;
-    FREE(host);
-  }
-  updateAppModelSafe(NULL);
-  if (ret == 0) {
-    canStart = 0;
-    if ( (isLocal) &&
-         (NULL != (fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser)))) ) {
-      if (disk_file_test(ectx, fn) == YES) {
-        dcfg = GC_create_C_impl();
-        canStart = 1;
-        if (0 != GC_parse_configuration(dcfg, fn))
-          canStart = 0;
-        user = NULL;
-        GC_get_configuration_value_string(dcfg,
-                                          "GNUNETD",
-                                          "USER",
-                                          "",
-                                          &user);
-        if (strlen(user) > 0) {
+  struct GC_Configuration *dcfg;
+  char *fn;
+  char *user;
+  struct passwd *pws;
+
+  if (once)
+    {
+      once = 0;
+      killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
+      launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
+      statsEntryYes = glade_xml_get_widget (getMainXML (), "statusPixmapYes");
+      statsEntryNo = glade_xml_get_widget (getMainXML (), "statusPixmapNo");
+      statsEntryError
+        = glade_xml_get_widget (getMainXML (), "statusPixmapError");
+      chooser
+        = glade_xml_get_widget (getMainXML (),
+                                "gnunetdconfigFileChooserButton");
+      GC_get_configuration_value_string (cfg,
+                                         "NETWORK",
+                                         "HOST", "localhost", &host);
+      if (strcmp (host, "localhost") == 0)
+        isLocal = TRUE;
+      else
+        isLocal = FALSE;
+      FREE (host);
+    }
+  updateAppModelSafe (NULL);
+  if (ret == 0)
+    {
+      canStart = 0;
+      if ((isLocal) &&
+          (NULL !=
+           (fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)))))
+        {
+          if (disk_file_test (ectx, fn) == YES)
+            {
+              dcfg = GC_create_C_impl ();
+              canStart = 1;
+              if (0 != GC_parse_configuration (dcfg, fn))
+                canStart = 0;
+              user = NULL;
+              GC_get_configuration_value_string (dcfg,
+                                                 "GNUNETD",
+                                                 "USER", "", &user);
+              if (strlen (user) > 0)
+                {
 #ifndef WINDOWS
-          if (NULL == (pws = getpwnam(user))) {
-            canStart = 0;
-          } else {
-            if (pws->pw_uid != getuid())
-              canStart = (geteuid() == 0);
-            else
-              canStart = 1;
-          }
+                  if (NULL == (pws = getpwnam (user)))
+                    {
+                      canStart = 0;
+                    }
+                  else
+                    {
+                      if (pws->pw_uid != getuid ())
+                        canStart = (geteuid () == 0);
+                      else
+                        canStart = 1;
+                    }
 #else
-        canStart = 1;
+                  canStart = 1;
 #endif
-        }
-        FREE(user);
-        GC_free(dcfg);
-      }
-      g_free(fn);
+                }
+              FREE (user);
+              GC_free (dcfg);
+            }
+          g_free (fn);
+        }
+      gtk_widget_hide (statsEntryYes);
+      gtk_widget_set_sensitive (killEntry, FALSE);
+      if (canStart && isLocal)
+        {
+          gtk_widget_set_sensitive (launchEntry, TRUE);
+          gtk_widget_show_all (statsEntryNo);
+          gtk_widget_hide (statsEntryError);
+        }
+      else
+        {
+          gtk_widget_set_sensitive (launchEntry, FALSE);
+          gtk_widget_show_all (statsEntryError);
+          gtk_widget_hide (statsEntryNo);
+        }
     }
-    gtk_widget_hide(statsEntryYes);
-    gtk_widget_set_sensitive(killEntry, FALSE);
-    if (canStart && isLocal) {
-      gtk_widget_set_sensitive(launchEntry, TRUE);
-      gtk_widget_show_all(statsEntryNo);
-      gtk_widget_hide(statsEntryError);
-    } else {
-      gtk_widget_set_sensitive(launchEntry, FALSE);
-      gtk_widget_show_all(statsEntryError);
-      gtk_widget_hide(statsEntryNo);
+  else
+    {
+      gtk_widget_hide (statsEntryNo);
+      gtk_widget_hide (statsEntryError);
+      gtk_widget_show_all (statsEntryYes);
+      gtk_widget_set_sensitive (killEntry, TRUE);
+      gtk_widget_set_sensitive (launchEntry, FALSE);
     }
-  } else {
-    gtk_widget_hide(statsEntryNo);
-    gtk_widget_hide(statsEntryError);
-    gtk_widget_show_all(statsEntryYes);
-    gtk_widget_set_sensitive(killEntry, TRUE);
-    gtk_widget_set_sensitive(launchEntry, FALSE);
-  }
   return NULL;
 }
 
-static void cronCheckDaemon(void * dummy) {
+static void
+cronCheckDaemon (void *dummy)
+{
   int ret;
 
-  if (OK == connection_test_running(ectx,
-                                    cfg))
+  if (OK == connection_test_running (ectx, cfg))
     ret = 1;
   else
     ret = 0;
-  gtkSaveCall(&doUpdateMenus, &ret);
+  gtkSaveCall (&doUpdateMenus, &ret);
 }
 
 
 /**
  * Launch gnunetd w/ checks
  */
-void on_startDaemon_clicked_daemon(GtkWidget * widget,
-                                   gpointer data) {
-  GtkWidget * launchEntry;
-  GtkWidget * chooser;
-  char * fn;
-
-  launchEntry
-    = glade_xml_get_widget(getMainXML(),
-                           "startDaemon");
-  gtk_widget_set_sensitive(launchEntry, FALSE);
-  if (OK == connection_test_running(ectx,
-                                    cfg) ) {
-    cronCheckDaemon(NULL);
-    return;
-  } else {      
-    addLogEntry(_("Launching gnunetd..."));
-    chooser
-      = glade_xml_get_widget(getMainXML(),
-                             "gnunetdconfigFileChooserButton");
-    fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
-    GE_BREAK(ectx, fn != NULL);
-    if (SYSERR != os_daemon_start(ectx,
-                                  cfg,
-                                  fn,
-                                  YES)) {
-      addLogEntry(_("Launched gnunetd"));
-    } else {
-      addLogEntry(_("Launching gnunetd failed"));
+void
+on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
+{
+  GtkWidget *launchEntry;
+  GtkWidget *chooser;
+  char *fn;
+
+  launchEntry = glade_xml_get_widget (getMainXML (), "startDaemon");
+  gtk_widget_set_sensitive (launchEntry, FALSE);
+  if (OK == connection_test_running (ectx, cfg))
+    {
+      cronCheckDaemon (NULL);
+      return;
+    }
+  else
+    {
+      addLogEntry (_("Launching gnunetd..."));
+      chooser
+        = glade_xml_get_widget (getMainXML (),
+                                "gnunetdconfigFileChooserButton");
+      fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+      GE_BREAK (ectx, fn != NULL);
+      if (SYSERR != os_daemon_start (ectx, cfg, fn, YES))
+        {
+          addLogEntry (_("Launched gnunetd"));
+        }
+      else
+        {
+          addLogEntry (_("Launching gnunetd failed"));
+        }
+      if (fn != NULL)
+        g_free (fn);
     }
-    if (fn != NULL)
-      g_free(fn);
-  }
 }
 
 /**
  * Kill gnunetd
  */
-void on_stopDaemon_clicked_daemon(GtkWidget * widget,
-                                  gpointer data) {
-  GtkWidget * killEntry = NULL;
-  struct ClientServerConnection * sock;
-
-  killEntry
-    = glade_xml_get_widget(getMainXML(),
-                           "stopDaemon");
-  gtk_widget_set_sensitive(killEntry, FALSE);
-
-  if (OK == connection_test_running(ectx,
-                                    cfg) ) {
-    sock = client_connection_create(ectx,
-                                    cfg);
-    if (OK != connection_request_shutdown(sock)) {
-      GtkWidget * dialog;
-
-      dialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE,
-         _("Error requesting shutdown of gnunetd."));
-      gtk_dialog_run(GTK_DIALOG(dialog));
-      gtk_widget_destroy(dialog);
-    } else {
-      addLogEntry(_("Terminating gnunetd..."));
+void
+on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
+{
+  GtkWidget *killEntry = NULL;
+  struct ClientServerConnection *sock;
+
+  killEntry = glade_xml_get_widget (getMainXML (), "stopDaemon");
+  gtk_widget_set_sensitive (killEntry, FALSE);
+
+  if (OK == connection_test_running (ectx, cfg))
+    {
+      sock = client_connection_create (ectx, cfg);
+      if (OK != connection_request_shutdown (sock))
+        {
+          GtkWidget *dialog;
+
+          dialog = gtk_message_dialog_new
+            (NULL,
+             GTK_DIALOG_MODAL,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE, _("Error requesting shutdown of gnunetd."));
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+        }
+      else
+        {
+          addLogEntry (_("Terminating gnunetd..."));
+        }
+      connection_destroy (sock);
     }
-    connection_destroy(sock);
-  }
-  cronCheckDaemon(NULL);
+  cronCheckDaemon (NULL);
 }
 
-void init_daemon(struct GE_Context * e,
-                 struct GC_Configuration * c) {
-  GtkWidget * tab;
-  GtkWidget * apps;
-  GtkListStore * model;
-  GtkCellRenderer * renderer;
+void
+init_daemon (struct GE_Context *e, struct GC_Configuration *c)
+{
+  GtkWidget *tab;
+  GtkWidget *apps;
+  GtkListStore *model;
+  GtkCellRenderer *renderer;
   int col;
-  char * daemon_config;
+  char *daemon_config;
 
   ectx = e;
   cfg = c;
-  apps
-    = glade_xml_get_widget(getMainXML(),
-                           "applicationList");
-  model = gtk_list_store_new(1, G_TYPE_STRING);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(apps),
-                          GTK_TREE_MODEL(model));
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(apps),
-                                              -1,
-                                              _("Application"),
-                                              renderer,
-                                              "text", 0,
-                                              NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(apps),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(apps),
-                                              -1,
-                                              _("Description"),
-                                              renderer,
-                                              "text", 1,
-                                              NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(apps),
-                                              col - 1),
-                                              TRUE);
-
-  tab
-    = glade_xml_get_widget(getMainXML(),
-                           "daemonScrolledWindow");
-  gtk_widget_show(tab);
+  apps = glade_xml_get_widget (getMainXML (), "applicationList");
+  model = gtk_list_store_new (1, G_TYPE_STRING);
+  gtk_tree_view_set_model (GTK_TREE_VIEW (apps), GTK_TREE_MODEL (model));
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (apps),
+                                                     -1,
+                                                     _("Application"),
+                                                     renderer,
+                                                     "text", 0, NULL);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (apps), col - 1), TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (apps),
+                                                     -1,
+                                                     _("Description"),
+                                                     renderer,
+                                                     "text", 1, NULL);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (apps), col - 1), TRUE);
+
+  tab = glade_xml_get_widget (getMainXML (), "daemonScrolledWindow");
+  gtk_widget_show (tab);
   daemon_config = NULL;
-  GC_get_configuration_value_filename(cfg,
-                                      "DAEMON",
-                                      "CONFIGFILE",
-                                      DEFAULT_DAEMON_CONFIG_FILE,
-                                      &daemon_config);
-  if (YES == disk_file_test(NULL, daemon_config)) {
-    gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(glade_xml_get_widget(getMainXML(),
-                                                                        "gnunetdconfigFileChooserButton")),
-                                  daemon_config);
-  } else {
-    addLogEntry(_("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
-                daemon_config);
-  }
-  FREE(daemon_config);
-
-  cron = gnunet_gtk_get_cron();
-  cron_add_job(cron,
-               &cronCheckDaemon,
-               0,
-               15 * cronSECONDS,
-               NULL);
-  cron_add_job(cron,
-               &updateAppModel,
-               5 * cronMINUTES,
-               5 * cronMINUTES,
-               NULL);
+  GC_get_configuration_value_filename (cfg,
+                                       "DAEMON",
+                                       "CONFIGFILE",
+                                       DEFAULT_DAEMON_CONFIG_FILE,
+                                       &daemon_config);
+  if (YES == disk_file_test (NULL, daemon_config))
+    {
+      gtk_file_chooser_set_filename (GTK_FILE_CHOOSER
+                                     (glade_xml_get_widget
+                                      (getMainXML (),
+                                       "gnunetdconfigFileChooserButton")),
+                                     daemon_config);
+    }
+  else
+    {
+      addLogEntry (_
+                   ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
+                   daemon_config);
+    }
+  FREE (daemon_config);
+
+  cron = gnunet_gtk_get_cron ();
+  cron_add_job (cron, &cronCheckDaemon, 0, 15 * cronSECONDS, NULL);
+  cron_add_job (cron,
+                &updateAppModel, 5 * cronMINUTES, 5 * cronMINUTES, NULL);
 }
 
-void done_daemon() {
-  cron_del_job(cron,
-               &cronCheckDaemon,
-               15 * cronSECONDS,
-               NULL);
-  cron_del_job(cron,
-               &updateAppModel,
-               5 * cronMINUTES,
-               NULL);
+void
+done_daemon ()
+{
+  cron_del_job (cron, &cronCheckDaemon, 15 * cronSECONDS, NULL);
+  cron_del_job (cron, &updateAppModel, 5 * cronMINUTES, NULL);
 }
 
 /**
 * Launch 'gnunet-setup -d wizard-gtk' with needed rights
 */
-void on_startDaemonConfWizard_clicked_daemon(GtkWidget * widget,
-                                             gpointer data) {
-  startGNUnetSetup(TRUE);
+void
+on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
+{
+  startGNUnetSetup (TRUE);
 }
 
 /**
 * Launch 'gnunet-setup -d gconfig' with needed rights
 */
-void on_startDaemonConfTool_clicked_daemon(GtkWidget * widget,
-                                           gpointer data) {
-  startGNUnetSetup(FALSE);
+void
+on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
+{
+  startGNUnetSetup (FALSE);
 }
+
 /* end of daemon.c */
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index efcb1b98..05cc566a 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -33,143 +33,133 @@
 #include <GNUnet/gnunet_collection_lib.h>
 #include <extractor.h>
 
-static GladeXML * metaXML;
-
-void on_collectionDialogMetaDataAddButton_clicked_fs(gpointer dummy,
-                                                     GtkWidget * uploadButton) {
-  handleMetaDataListUpdate(metaXML,
-                           "collectionMetaDataTypeComboBox",            
-                           "collectionMetaDataValueEntry",
-                           "collectionMetaDataTreeView");
+static GladeXML *metaXML;
+
+void
+on_collectionDialogMetaDataAddButton_clicked_fs (gpointer dummy,
+                                                 GtkWidget * uploadButton)
+{
+  handleMetaDataListUpdate (metaXML,
+                            "collectionMetaDataTypeComboBox",
+                            "collectionMetaDataValueEntry",
+                            "collectionMetaDataTreeView");
 }
 
 
-void createCollection_clicked_fs(GtkWidget * dummy1,
-                                 GtkWidget * dummy2) {
-  const char * collectionName;
-  const char * updateIntervalString;
-  GtkWidget * w;
-  GtkWidget * nameLine;
-  GtkWidget * dialog;
-  GtkWidget * spin;
-  struct ECRS_MetaData * meta;
-  struct ECRS_URI * root;
+void
+createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  const char *collectionName;
+  const char *updateIntervalString;
+  GtkWidget *w;
+  GtkWidget *nameLine;
+  GtkWidget *dialog;
+  GtkWidget *spin;
+  struct ECRS_MetaData *meta;
+  struct ECRS_URI *root;
   TIME_T updateInterval;
 
   metaXML
-    = glade_xml_new(getGladeFileName(),
-                    "createCollectionDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(metaXML);
-  dialog = glade_xml_get_widget(metaXML,
-                                "createCollectionDialog");
-  createMetaDataListTreeView(metaXML,
-                             "collectionMetaDataTreeView",
-                             NULL,
-                             NULL);
-  createMetaTypeComboBox(metaXML,
-                         "collectionMetaDataTypeComboBox");
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-                                  GTK_RESPONSE_OK);
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    updateIntervalString
-      = getEntryLineValue(metaXML,
-                          "collectionUpdateIntervalComboBoxEntry");
-    if (0 == strcmp(_("--sporadic update--"),
-                    updateIntervalString))
-      updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
-    else if (0 == strcmp(_("--no update--"),
-                         updateIntervalString))
-      updateInterval = ECRS_SBLOCK_UPDATE_NONE;
-    else if (OK != parseTime(updateIntervalString,
-                             &updateInterval)) {
-      gtk_widget_destroy(dialog);
-      UNREF(metaXML);
-      metaXML = NULL;
-      dialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE,
-         _("Failed to parse given time interval!"));
-      gtk_dialog_run(GTK_DIALOG(dialog));
-      gtk_widget_destroy(dialog);
-      return;
+    = glade_xml_new (getGladeFileName (),
+                     "createCollectionDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (metaXML);
+  dialog = glade_xml_get_widget (metaXML, "createCollectionDialog");
+  createMetaDataListTreeView (metaXML,
+                              "collectionMetaDataTreeView", NULL, NULL);
+  createMetaTypeComboBox (metaXML, "collectionMetaDataTypeComboBox");
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      updateIntervalString
+        = getEntryLineValue (metaXML,
+                             "collectionUpdateIntervalComboBoxEntry");
+      if (0 == strcmp (_("--sporadic update--"), updateIntervalString))
+        updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+      else if (0 == strcmp (_("--no update--"), updateIntervalString))
+        updateInterval = ECRS_SBLOCK_UPDATE_NONE;
+      else if (OK != parseTime (updateIntervalString, &updateInterval))
+        {
+          gtk_widget_destroy (dialog);
+          UNREF (metaXML);
+          metaXML = NULL;
+          dialog = gtk_message_dialog_new
+            (NULL,
+             GTK_DIALOG_MODAL,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+          return;
+        }
+      meta = getMetaDataFromList (metaXML,
+                                  "collectionMetaDataTreeView", NULL);
+      spin = glade_xml_get_widget (metaXML, "collectionAnonymityLevel");
+      nameLine = glade_xml_get_widget (metaXML, "collectionIdentifierEntry");
+      collectionName = gtk_entry_get_text (GTK_ENTRY (nameLine));
+      root = NULL;
+      if (OK == CO_startCollection (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* priority */
+                                    updateInterval, collectionName, meta))
+        {
+          w = glade_xml_get_widget (getMainXML (), "createCollection");
+          gtk_widget_set_sensitive (w, FALSE);
+          w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+          gtk_widget_set_sensitive (w, TRUE);
+        }
+      else
+        {
+          GtkWidget *dialog;
+
+          dialog = gtk_message_dialog_new
+            (NULL,
+             GTK_DIALOG_MODAL,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE,
+             _("Failed to start collection `%s' (consult logs)."),
+             collectionName);
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+        }
+      ECRS_freeMetaData (meta);
     }
-    meta = getMetaDataFromList(metaXML,
-                               "collectionMetaDataTreeView",
-                               NULL);
-    spin = glade_xml_get_widget(metaXML,
-                                "collectionAnonymityLevel");
-    nameLine = glade_xml_get_widget(metaXML,
-                                    "collectionIdentifierEntry");
-    collectionName
-      = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    root = NULL;
-    if (OK == CO_startCollection(gtk_spin_button_get_value_as_int
-                                 (GTK_SPIN_BUTTON(spin)),
-                                 1000, /* priority */
-                                 updateInterval,
-                                 collectionName,
-                                 meta)) {
-      w = glade_xml_get_widget(getMainXML(),
-                               "createCollection");
-      gtk_widget_set_sensitive(w, FALSE);
-      w = glade_xml_get_widget(getMainXML(),
-                               "deleteCollection");
-      gtk_widget_set_sensitive(w, TRUE);
-    } else {
-      GtkWidget * dialog;
-
-      dialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE,
-         _("Failed to start collection `%s' (consult logs)."),
-         collectionName);
-      gtk_dialog_run(GTK_DIALOG(dialog));
-      gtk_widget_destroy(dialog);
-    }
-    ECRS_freeMetaData(meta);
-  }
-  gtk_widget_destroy(dialog);
-  UNREF(metaXML);
+  gtk_widget_destroy (dialog);
+  UNREF (metaXML);
   metaXML = NULL;
 }
 
-void deleteCollection_clicked_fs(GtkWidget * dummy1,
-                                 GtkWidget * dummy2) {
-  GtkWidget * w;
-
-  if (OK == CO_stopCollection()) {
-    w = glade_xml_get_widget(getMainXML(),
-                             "createCollection");
-    gtk_widget_set_sensitive(w, TRUE);
-    w = glade_xml_get_widget(getMainXML(),
-                             "deleteCollection");
-    gtk_widget_set_sensitive(w, FALSE);
-    infoMessage(NO,
-                _("Collection stopped.\n"));
-  } else {
-    infoMessage(YES,
-                _("Failed to stop collection (consult logs).\n"));
-  }
+void
+deleteCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  GtkWidget *w;
+
+  if (OK == CO_stopCollection ())
+    {
+      w = glade_xml_get_widget (getMainXML (), "createCollection");
+      gtk_widget_set_sensitive (w, TRUE);
+      w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+      gtk_widget_set_sensitive (w, FALSE);
+      infoMessage (NO, _("Collection stopped.\n"));
+    }
+  else
+    {
+      infoMessage (YES, _("Failed to stop collection (consult logs).\n"));
+    }
 }
 
-void fs_collection_start() {
-  GtkWidget * w;
-  char * h;
-
-  h = CO_getCollection();
-  if (NULL != h) {
-    w = glade_xml_get_widget(getMainXML(),
-                             "createCollection");
-    FREE(h);
-  } else
-    w = glade_xml_get_widget(getMainXML(),
-                             "deleteCollection");
-  gtk_widget_set_sensitive(w, FALSE);
+void
+fs_collection_start ()
+{
+  GtkWidget *w;
+  char *h;
+
+  h = CO_getCollection ();
+  if (NULL != h)
+    {
+      w = glade_xml_get_widget (getMainXML (), "createCollection");
+      FREE (h);
+    }
+  else
+    w = glade_xml_get_widget (getMainXML (), "deleteCollection");
+  gtk_widget_set_sensitive (w, FALSE);
 }
 
 /* end of collection.c */
diff --git a/src/plugins/fs/collection.h b/src/plugins/fs/collection.h
index 0e4ba1e7..c236c4dc 100644
--- a/src/plugins/fs/collection.h
+++ b/src/plugins/fs/collection.h
@@ -29,6 +29,6 @@
 
 #include <GNUnet/gnunet_util.h>
 
-void fs_collection_start(void);
+void fs_collection_start (void);
 
 #endif
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
index 1767432d..d61b343b 100644
--- a/src/plugins/fs/content_tracking.c
+++ b/src/plugins/fs/content_tracking.c
@@ -37,64 +37,62 @@
 #include <GNUnet/gnunet_namespace_lib.h>
 #include <extractor.h>
 
-static void * clearContentList(void * mdl) {
-  GtkTreeModel * model = GTK_TREE_MODEL(mdl);
-  struct ECRS_URI * uri;
-  struct ECRS_MetaData * meta;
+static void *
+clearContentList (void *mdl)
+{
+  GtkTreeModel *model = GTK_TREE_MODEL (mdl);
+  struct ECRS_URI *uri;
+  struct ECRS_MetaData *meta;
   GtkTreeIter iter;
 
-  DEBUG_BEGIN();
-  if (gtk_tree_model_get_iter_first(model,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(model,
-                         &iter,
-                         NAMESPACE_URI, &uri,
-                         NAMESPACE_META, &meta,
-                         -1);
-      ECRS_freeUri(uri);
-      ECRS_freeMetaData(meta);
-      gtk_list_store_set(GTK_LIST_STORE(model),
-                         &iter,
-                         NAMESPACE_URI, NULL,
-                         NAMESPACE_META, NULL,
-                         -1);
-    } while (gtk_list_store_remove(GTK_LIST_STORE(model),
-                                   &iter));
-  }
-  DEBUG_END();
+  DEBUG_BEGIN ();
+  if (gtk_tree_model_get_iter_first (model, &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (model,
+                              &iter,
+                              NAMESPACE_URI, &uri, NAMESPACE_META, &meta, -1);
+          ECRS_freeUri (uri);
+          ECRS_freeMetaData (meta);
+          gtk_list_store_set (GTK_LIST_STORE (model),
+                              &iter,
+                              NAMESPACE_URI, NULL, NAMESPACE_META, NULL, -1);
+        }
+      while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
+    }
+  DEBUG_END ();
   return NULL;
 }
 
 
-void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1,
-                                               GtkWidget * dummy2) {
-  GtkWidget * contentList;
-  GtkTreeModel * model;
-
-  DEBUG_BEGIN();
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  URITRACK_clearTrackedURIS(ectx,
-                            cfg);
-  gtkSaveCall(&clearContentList, model);
-  DEBUG_END();
+void
+on_clearAvailableContentButton_clicked_fs (GtkWidget * dummy1,
+                                           GtkWidget * dummy2)
+{
+  GtkWidget *contentList;
+  GtkTreeModel *model;
+
+  DEBUG_BEGIN ();
+  contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
+  URITRACK_clearTrackedURIS (ectx, cfg);
+  gtkSaveCall (&clearContentList, model);
+  DEBUG_END ();
 }
 
-void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1,
-                                       GtkWidget * dummy2) {
-  GtkWidget * trackCheckButton;
+void
+on_trackingCheckButton_toggled_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  GtkWidget *trackCheckButton;
 
   trackCheckButton
-    = glade_xml_get_widget(getMainXML(),
-                           "trackingCheckButton");
-  URITRACK_trackURIS(ectx,
-                     cfg,
-                     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ?
-                     YES : NO);
+    = glade_xml_get_widget (getMainXML (), "trackingCheckButton");
+  URITRACK_trackURIS (ectx,
+                      cfg,
+                      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+                                                    (trackCheckButton)) ==
+                      TRUE ? YES : NO);
 }
 
 
@@ -104,63 +102,62 @@ void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1,
  * content model.  Check that it is not already
  * present!
  */
-static void * updateView(void * cls) {
-  const ECRS_FileInfo * fi = cls;
+static void *
+updateView (void *cls)
+{
+  const ECRS_FileInfo *fi = cls;
   GtkTreeIter iter;
-  char * filename;
-  char * uriString;
+  char *filename;
+  char *uriString;
   unsigned long long size;
-  char * size_h;
-  GtkWidget * contentList;
-  GtkTreeModel * model;
-
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  filename = ECRS_getFirstFromMetaData(fi->meta,
-                                       EXTRACTOR_FILENAME,
-                                       EXTRACTOR_TITLE,
-                                       EXTRACTOR_DESCRIPTION,
-                                       EXTRACTOR_SUBJECT,
-                                       EXTRACTOR_ARTIST,
-                                       EXTRACTOR_AUTHOR,
-                                       EXTRACTOR_PUBLISHER,
-                                       EXTRACTOR_CREATOR,
-                                       EXTRACTOR_PRODUCER,
-                                       EXTRACTOR_UNKNOWN,
-                                       -1);
-  if (filename == NULL) {
-    filename = STRDUP(_("no name given"));
-  } else {
-    char * dotdot;
-
-    while (NULL != (dotdot = strstr(filename, "..")))
-      dotdot[0] = dotdot[1] = '_';
-    filename = validate_utf8(filename);
-  }
-
-  if (ECRS_isFileUri(fi->uri))
-    size = ECRS_fileSize(fi->uri);
+  char *size_h;
+  GtkWidget *contentList;
+  GtkTreeModel *model;
+
+  contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
+  filename = ECRS_getFirstFromMetaData (fi->meta,
+                                        EXTRACTOR_FILENAME,
+                                        EXTRACTOR_TITLE,
+                                        EXTRACTOR_DESCRIPTION,
+                                        EXTRACTOR_SUBJECT,
+                                        EXTRACTOR_ARTIST,
+                                        EXTRACTOR_AUTHOR,
+                                        EXTRACTOR_PUBLISHER,
+                                        EXTRACTOR_CREATOR,
+                                        EXTRACTOR_PRODUCER,
+                                        EXTRACTOR_UNKNOWN, -1);
+  if (filename == NULL)
+    {
+      filename = STRDUP (_("no name given"));
+    }
+  else
+    {
+      char *dotdot;
+
+      while (NULL != (dotdot = strstr (filename, "..")))
+        dotdot[0] = dotdot[1] = '_';
+      filename = validate_utf8 (filename);
+    }
+
+  if (ECRS_isFileUri (fi->uri))
+    size = ECRS_fileSize (fi->uri);
   else
     size = 0;
-  uriString = ECRS_uriToString(fi->uri);
-  gtk_list_store_append(GTK_LIST_STORE(model),
-                        &iter);
-  size_h = string_get_fancy_byte_size(size);
-  gtk_list_store_set(GTK_LIST_STORE(model),
-                     &iter,
-                     NAMESPACE_FILENAME, filename,
-                     NAMESPACE_SIZE, size,
-                     NAMESPACE_HSIZE, size_h,
-                     NAMESPACE_URISTRING, uriString,
-                     NAMESPACE_URI, ECRS_dupUri(fi->uri),
-                     NAMESPACE_META, ECRS_dupMetaData(fi->meta),
-                     -1);
-  FREE(size_h);
-  FREE(filename);
-  FREE(uriString);
+  uriString = ECRS_uriToString (fi->uri);
+  gtk_list_store_append (GTK_LIST_STORE (model), &iter);
+  size_h = string_get_fancy_byte_size (size);
+  gtk_list_store_set (GTK_LIST_STORE (model),
+                      &iter,
+                      NAMESPACE_FILENAME, filename,
+                      NAMESPACE_SIZE, size,
+                      NAMESPACE_HSIZE, size_h,
+                      NAMESPACE_URISTRING, uriString,
+                      NAMESPACE_URI, ECRS_dupUri (fi->uri),
+                      NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
+  FREE (size_h);
+  FREE (filename);
+  FREE (uriString);
   return NULL;
 }
 
@@ -169,10 +166,10 @@ static void * updateView(void * cls) {
  * content model.  Check that it is not already
  * present!
  */
-int updateViewSave(const ECRS_FileInfo * fi,
-                   const HashCode512 * key,
-                   int isRoot,
-                   void * closure) {
-  gtkSaveCall(&updateView, (void*) fi);
+int
+updateViewSave (const ECRS_FileInfo * fi,
+                const HashCode512 * key, int isRoot, void *closure)
+{
+  gtkSaveCall (&updateView, (void *) fi);
   return OK;
 }
diff --git a/src/plugins/fs/content_tracking.h b/src/plugins/fs/content_tracking.h
index 075810aa..44e7d92b 100644
--- a/src/plugins/fs/content_tracking.h
+++ b/src/plugins/fs/content_tracking.h
@@ -34,9 +34,7 @@
  * content model.  Check that it is not already
  * present!
  */
-int updateViewSave(const ECRS_FileInfo * fi,
-                   const HashCode512 * key,
-                   int isRoot,
-                   void * closure);
+int updateViewSave (const ECRS_FileInfo * fi,
+                    const HashCode512 * key, int isRoot, void *closure);
 
 #endif
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index ecaf34b8..12ca0bff 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -37,135 +37,114 @@
 
 #ifndef MINGW
 static char *
-selectFile() {
-  GladeXML * uploadXML;
-  GtkFileChooser * dialog;
-  char * ret;
+selectFile ()
+{
+  GladeXML *uploadXML;
+  GtkFileChooser *dialog;
+  char *ret;
 
   uploadXML
-    = glade_xml_new(getGladeFileName(),
-                    "openDirectoryFileDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(uploadXML);
-  dialog = GTK_FILE_CHOOSER(glade_xml_get_widget(uploadXML,
-                                                 "openDirectoryFileDialog"));
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
-    ret = gtk_file_chooser_get_filename(dialog);
+    = glade_xml_new (getGladeFileName (),
+                     "openDirectoryFileDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (uploadXML);
+  dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
+                                                   "openDirectoryFileDialog"));
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
+    ret = gtk_file_chooser_get_filename (dialog);
   else
     ret = NULL;
-  gtk_widget_destroy(GTK_WIDGET(dialog));
-  UNREF(uploadXML);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  UNREF (uploadXML);
   return ret;
 }
 #else /* MINGW */
 static char *
-selectFile() {
-  return plibc_ChooseFile(_("Choose the directory you want to open."),
-                          OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
+selectFile ()
+{
+  return plibc_ChooseFile (_("Choose the directory you want to open."),
+                           OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
 }
 #endif /* MINGW */
 
 static int
-spcb(const ECRS_FileInfo * fi,
-     const HashCode512 * key,
-     int isRoot,
-     void * closure) {
-  SearchList * list = closure;
-  fs_search_result_received(list,
-                            fi,
-                            list->uri);
+spcb (const ECRS_FileInfo * fi,
+      const HashCode512 * key, int isRoot, void *closure)
+{
+  SearchList *list = closure;
+  fs_search_result_received (list, fi, list->uri);
   return OK;
 }
 
 
-void on_open_menu_activate_fs(GtkWidget * dummy1,
-                              GtkWidget * dummy2) {
-  char * dn;
-  char * directory_data;
+void
+on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  char *dn;
+  char *directory_data;
   unsigned long long directory_data_len;
   size_t dlen;
-  struct ECRS_MetaData * md;
+  struct ECRS_MetaData *md;
   int fd;
-  SearchList * list;
-  struct ECRS_URI * uri;
-  const char * kws[2];
-  GtkNotebook * notebook;
+  SearchList *list;
+  struct ECRS_URI *uri;
+  const char *kws[2];
+  GtkNotebook *notebook;
 
-  dn = selectFile();
+  dn = selectFile ();
   if (dn == NULL)
     return;
-  if ( (YES != disk_file_test(NULL,
-                              dn)) ||
-       (OK != disk_file_size(NULL,
-                             dn,
-                             &directory_data_len,
-                             YES)) ) {
-    addLogEntry(_("Error accessing file `%s'."),
-                dn);
-    FREE(dn);
-    return;
-  }
-  fd = disk_file_open(NULL,
-                      dn,
-                      O_LARGEFILE |  O_RDONLY);
-  if (fd == -1) {
-    addLogEntry(_("Error opening file `%s'."),
-                dn);
-    FREE(dn);
-    return;
-  }
+  if ((YES != disk_file_test (NULL,
+                              dn)) ||
+      (OK != disk_file_size (NULL, dn, &directory_data_len, YES)))
+    {
+      addLogEntry (_("Error accessing file `%s'."), dn);
+      FREE (dn);
+      return;
+    }
+  fd = disk_file_open (NULL, dn, O_LARGEFILE | O_RDONLY);
+  if (fd == -1)
+    {
+      addLogEntry (_("Error opening file `%s'."), dn);
+      FREE (dn);
+      return;
+    }
   dlen = (size_t) directory_data_len;
-  directory_data = MMAP(NULL,
-                        dlen,
-                        PROT_READ,
-                        MAP_SHARED,
-                        fd,
-                        0);
-  if (directory_data == MAP_FAILED) {
-    addLogEntry(_("Error mapping file `%s' into memory."),
-                dn);
-    CLOSE(fd);
-    FREE(dn);
-    return;
-  }
+  directory_data = MMAP (NULL, dlen, PROT_READ, MAP_SHARED, fd, 0);
+  if (directory_data == MAP_FAILED)
+    {
+      addLogEntry (_("Error mapping file `%s' into memory."), dn);
+      CLOSE (fd);
+      FREE (dn);
+      return;
+    }
   kws[0] = dn;
   kws[1] = NULL;
-  uri = ECRS_keywordsToUri(kws);
+  uri = ECRS_keywordsToUri (kws);
   md = NULL;
-  list = fs_search_started(NULL,
-                           uri,
-                           0,
-                           0,
-                           NULL,
-                           FSUI_COMPLETED);
-  ECRS_freeUri(uri);
-  ECRS_listDirectory(NULL,
-                     directory_data,
-                     directory_data_len,
-                     &md,
-                     &spcb,
-                     list);
+  list = fs_search_started (NULL, uri, 0, 0, NULL, FSUI_COMPLETED);
+  ECRS_freeUri (uri);
+  ECRS_listDirectory (NULL,
+                      directory_data, directory_data_len, &md, &spcb, list);
   if (md != NULL)
-    ECRS_freeMetaData(md);
-  MUNMAP(directory_data, dlen);
-  CLOSE(fd);
-  FREE(dn);
+    ECRS_freeMetaData (md);
+  MUNMAP (directory_data, dlen);
+  CLOSE (fd);
+  FREE (dn);
 
   /* switch view -- select directory */
   notebook
-    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
-                                        "downloadNotebook"));
-  gtk_notebook_set_current_page(notebook,
-                                gtk_notebook_page_num(notebook,
-                                                      list->searchpage));
+    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+  gtk_notebook_set_current_page (notebook,
+                                 gtk_notebook_page_num (notebook,
+                                                        list->searchpage));
 
   notebook
-    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
-                                        "fsnotebook"));
-  gtk_notebook_set_current_page(notebook,
-                                gtk_notebook_page_num(notebook,
-                                                      glade_xml_get_widget(getMainXML(),
-                                                                           "fsdownloadvbox")));
+    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "fsnotebook"));
+  gtk_notebook_set_current_page (notebook,
+                                 gtk_notebook_page_num (notebook,
+                                                        glade_xml_get_widget
+                                                        (getMainXML (),
+                                                         "fsdownloadvbox")));
 }
 
 /* end of directory.c */
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 2d825f71..c58a18e4 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -39,136 +39,113 @@
  * by the download list.
  */
 static int
-addFilesToDirectory(const ECRS_FileInfo * fi,
-                    const HashCode512 * key,
-                    int isRoot,
-                    void * closure) {
-  DownloadList * list = closure;
+addFilesToDirectory (const ECRS_FileInfo * fi,
+                     const HashCode512 * key, int isRoot, void *closure)
+{
+  DownloadList *list = closure;
   GtkTreeIter iter;
   GtkTreeIter child;
   int i;
-  GtkTreePath * path;
-  GtkTreeModel * model;
+  GtkTreePath *path;
+  GtkTreeModel *model;
 
   if (isRoot == YES)
     return OK;
-  if (! gtk_tree_row_reference_valid(list->searchViewRowReference))
+  if (!gtk_tree_row_reference_valid (list->searchViewRowReference))
     return SYSERR;
-  model = GTK_TREE_MODEL(list->searchList->tree);
-  path = gtk_tree_row_reference_get_path(list->searchViewRowReference);
-  if (path == NULL) {
-    GE_BREAK(ectx, 0);
-    return SYSERR;
-  }
-  gtk_tree_model_get_iter(model,
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
+  model = GTK_TREE_MODEL (list->searchList->tree);
+  path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
+  if (path == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return SYSERR;
+    }
+  gtk_tree_model_get_iter (model, &iter, path);
+  gtk_tree_path_free (path);
   /* check for existing entry -- this function maybe called multiple
      times for the same directory entry */
-  for (i=gtk_tree_model_iter_n_children(model,
-                                        &iter)-1;i>=0;i--) {
-    if (TRUE == gtk_tree_model_iter_nth_child(model,
-                                              &child,
-                                              &iter,
-                                              i)) {
-      struct ECRS_URI * uri;
-      uri = NULL;
-      gtk_tree_model_get(model,
-                         &child,
-                         SEARCH_URI, &uri,
-                         -1);
-      if ( (uri != NULL) &&
-           (ECRS_equalsUri(uri,
-                           fi->uri)) )
-        return OK;
-    }
-  }
-  gtk_tree_store_append(GTK_TREE_STORE(model),
-                        &child,
-                        &iter);
-  addEntryToSearchTree(list->searchList,
-                       list,
-                       fi,
-                       &child);
+  for (i = gtk_tree_model_iter_n_children (model, &iter) - 1; i >= 0; i--)
+    {
+      if (TRUE == gtk_tree_model_iter_nth_child (model, &child, &iter, i))
+        {
+          struct ECRS_URI *uri;
+          uri = NULL;
+          gtk_tree_model_get (model, &child, SEARCH_URI, &uri, -1);
+          if ((uri != NULL) && (ECRS_equalsUri (uri, fi->uri)))
+            return OK;
+        }
+    }
+  gtk_tree_store_append (GTK_TREE_STORE (model), &child, &iter);
+  addEntryToSearchTree (list->searchList, list, fi, &child);
   return OK;
 }
 
 static void
-refreshDirectoryViewFromDisk(DownloadList * list) {
+refreshDirectoryViewFromDisk (DownloadList * list)
+{
   unsigned long long size;
-  char * data;
+  char *data;
   int fd;
-  char * fn;
-  struct ECRS_MetaData * meta;
+  char *fn;
+  struct ECRS_MetaData *meta;
   struct stat buf;
-  const char * f;
+  const char *f;
 
-  if ( (list->is_directory != YES) ||
-       (list->searchList == NULL) ||
-       (list->searchViewRowReference == NULL) ||
-       (! gtk_tree_row_reference_valid(list->searchViewRowReference)) )
+  if ((list->is_directory != YES) ||
+      (list->searchList == NULL) ||
+      (list->searchViewRowReference == NULL) ||
+      (!gtk_tree_row_reference_valid (list->searchViewRowReference)))
     return;
 
-  if (0 != stat(list->filename,
-                &buf))
+  if (0 != stat (list->filename, &buf))
     return;
-  if (S_ISDIR(buf.st_mode)) {
-    fn = MALLOC(strlen(list->filename) + strlen(GNUNET_DIRECTORY_EXT) + 1);
-    strcpy(fn, list->filename);
-    if (fn[strlen(fn)-1] == '/')
-      fn[strlen(fn)-1] = '\0';
-    strcat(fn, GNUNET_DIRECTORY_EXT);
-    if (0 != stat(list->filename,
-                  &buf)) {
-      FREE(fn);
-      return;
+  if (S_ISDIR (buf.st_mode))
+    {
+      fn =
+        MALLOC (strlen (list->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
+      strcpy (fn, list->filename);
+      if (fn[strlen (fn) - 1] == '/')
+        fn[strlen (fn) - 1] = '\0';
+      strcat (fn, GNUNET_DIRECTORY_EXT);
+      if (0 != stat (list->filename, &buf))
+        {
+          FREE (fn);
+          return;
+        }
+      f = fn;
+    }
+  else
+    {
+      fn = NULL;
+      f = list->filename;
     }
-    f = fn;
-  } else {
-    fn = NULL;
-    f = list->filename;
-  }
   size = buf.st_size;
-  if (size == 0) {
-    FREENONNULL(fn);
-    return;
-  }
-  fd = disk_file_open(ectx,
-                      list->filename,
-                      O_RDONLY);
-  if (fd == -1) {
-    FREENONNULL(fn);
-    return;
-  }
-  data = MMAP(NULL,
-              size,
-              PROT_READ,
-              MAP_SHARED,
-              fd,
-              0);
-  if ( (data == MAP_FAILED) ||
-       (data == NULL) ) {
-    GE_LOG_STRERROR_FILE(ectx,
-                         GE_ERROR | GE_ADMIN | GE_BULK,
-                         "mmap",
-                         f);
-    CLOSE(fd);
-    FREENONNULL(fn);
-    return;
-  }
-  FREENONNULL(fn);
+  if (size == 0)
+    {
+      FREENONNULL (fn);
+      return;
+    }
+  fd = disk_file_open (ectx, list->filename, O_RDONLY);
+  if (fd == -1)
+    {
+      FREENONNULL (fn);
+      return;
+    }
+  data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+  if ((data == MAP_FAILED) || (data == NULL))
+    {
+      GE_LOG_STRERROR_FILE (ectx, GE_ERROR | GE_ADMIN | GE_BULK, "mmap", f);
+      CLOSE (fd);
+      FREENONNULL (fn);
+      return;
+    }
+  FREENONNULL (fn);
   meta = NULL;
-  ECRS_listDirectory(ectx,
-                     data,
-                     size,
-                     &meta,
-                     &addFilesToDirectory,
-                     list);
-  MUNMAP(data, size);
-  CLOSE(fd);
+  ECRS_listDirectory (ectx, data, size, &meta, &addFilesToDirectory, list);
+  MUNMAP (data, size);
+  CLOSE (fd);
   if (meta != NULL)
-    ECRS_freeMetaData(meta);    
+    ECRS_freeMetaData (meta);
 }
 
 /**
@@ -177,162 +154,158 @@ refreshDirectoryViewFromDisk(DownloadList * list) {
  * the download summary.
  */
 DownloadList *
-fs_download_started(struct FSUI_DownloadList * fsui_dl,
-                    DownloadList * dl_parent,
-                    SearchList * sl_parent,
-                    unsigned long long total,
-                    unsigned int anonymityLevel,
-                    const ECRS_FileInfo * fi,
-                    const char * filename,
-                    unsigned long long completed,
-                    cron_t eta,
-                    FSUI_State state) {
-  DownloadList * list;
+fs_download_started (struct FSUI_DownloadList *fsui_dl,
+                     DownloadList * dl_parent,
+                     SearchList * sl_parent,
+                     unsigned long long total,
+                     unsigned int anonymityLevel,
+                     const ECRS_FileInfo * fi,
+                     const char *filename,
+                     unsigned long long completed,
+                     cron_t eta, FSUI_State state)
+{
+  DownloadList *list;
   GtkTreeIter iter;
   GtkTreeIter piter;
-  GtkTreePath * path;
+  GtkTreePath *path;
   unsigned long long size;
-  char * size_h;
-  const char * sname;
+  char *size_h;
+  const char *sname;
   int progress;
-  char * uri_name;
+  char *uri_name;
   gboolean valid;
-  struct ECRS_URI * u;
-  GtkTreeModel * model;
+  struct ECRS_URI *u;
+  GtkTreeModel *model;
 
   /* setup visualization */
-  list = MALLOC(sizeof(DownloadList));
-  memset(list,
-         0,
-         sizeof(DownloadList));
-  list->uri = ECRS_dupUri(fi->uri);
-  list->filename = STRDUP(filename);
-  if ( (dl_parent != NULL) &&
-       (NULL != (path = gtk_tree_row_reference_get_path(dl_parent->summaryViewRowReference) ) ) ) {
-    valid = gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
-                                    &piter,
-                                    path);
-    if (valid) {
-      gtk_tree_store_append(download_summary,
-                            &iter,
-                            &piter);
-    } else {
-      gtk_tree_store_append(download_summary,
-                            &iter,
-                            NULL);
-    }
-    gtk_tree_path_free(path);
-  } else {
-    gtk_tree_store_append(download_summary,
-                          &iter,
-                          NULL);
-  }
-  size = ECRS_fileSize(fi->uri);
-  size_h = string_get_fancy_byte_size(size);
-  sname = &filename[strlen(filename)-1];
-  while ( (sname > filename) &&
-          (sname[-1] != '/') &&
-          (sname[-1] != '\\') )
+  list = MALLOC (sizeof (DownloadList));
+  memset (list, 0, sizeof (DownloadList));
+  list->uri = ECRS_dupUri (fi->uri);
+  list->filename = STRDUP (filename);
+  if ((dl_parent != NULL) &&
+      (NULL !=
+       (path =
+        gtk_tree_row_reference_get_path (dl_parent->
+                                         summaryViewRowReference))))
+    {
+      valid = gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary),
+                                       &piter, path);
+      if (valid)
+        {
+          gtk_tree_store_append (download_summary, &iter, &piter);
+        }
+      else
+        {
+          gtk_tree_store_append (download_summary, &iter, NULL);
+        }
+      gtk_tree_path_free (path);
+    }
+  else
+    {
+      gtk_tree_store_append (download_summary, &iter, NULL);
+    }
+  size = ECRS_fileSize (fi->uri);
+  size_h = string_get_fancy_byte_size (size);
+  sname = &filename[strlen (filename) - 1];
+  while ((sname > filename) && (sname[-1] != '/') && (sname[-1] != '\\'))
     sname--;
   if (size != 0)
     progress = completed * 100 / size;
   else
     progress = 100;
-  uri_name = ECRS_uriToString(fi->uri);
-  gtk_tree_store_set(download_summary,
-                     &iter,
-                     DOWNLOAD_FILENAME, filename,
-                     DOWNLOAD_SHORTNAME, sname,
-                     DOWNLOAD_SIZE, size,
-                     DOWNLOAD_HSIZE, size_h,
-                     DOWNLOAD_PROGRESS, progress,
-                     DOWNLOAD_URISTRING, uri_name,
-                     DOWNLOAD_INTERNAL, list,
-                     -1);
-  FREE(uri_name);
-  FREE(size_h);
-  path = gtk_tree_model_get_path(GTK_TREE_MODEL(download_summary),
-                                 &iter);
+  uri_name = ECRS_uriToString (fi->uri);
+  gtk_tree_store_set (download_summary,
+                      &iter,
+                      DOWNLOAD_FILENAME, filename,
+                      DOWNLOAD_SHORTNAME, sname,
+                      DOWNLOAD_SIZE, size,
+                      DOWNLOAD_HSIZE, size_h,
+                      DOWNLOAD_PROGRESS, progress,
+                      DOWNLOAD_URISTRING, uri_name,
+                      DOWNLOAD_INTERNAL, list, -1);
+  FREE (uri_name);
+  FREE (size_h);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (download_summary), &iter);
   list->summaryViewRowReference
-    = gtk_tree_row_reference_new(GTK_TREE_MODEL(download_summary),
-                                 path);
-  gtk_tree_path_free(path);
+    = gtk_tree_row_reference_new (GTK_TREE_MODEL (download_summary), path);
+  gtk_tree_path_free (path);
   list->searchList = sl_parent;
   list->searchViewRowReference = NULL;
-  if (sl_parent != NULL) {
-    model = GTK_TREE_MODEL(sl_parent->tree);
-    if (dl_parent != NULL) {
-      /* have parent, must be download from
-         directory inside of search */
-         /* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the quick
-            solution is to #ifndef it */
+  if (sl_parent != NULL)
+    {
+      model = GTK_TREE_MODEL (sl_parent->tree);
+      if (dl_parent != NULL)
+        {
+          /* have parent, must be download from
+             directory inside of search */
+          /* FIXME: this requires GTK 2.8. Since it doesn't support Win9x, the quick
+             solution is to #ifndef it */
 #ifndef MINGW
-      GE_BREAK(ectx,
-               gtk_tree_row_reference_get_model(dl_parent->searchViewRowReference)
-               == model);
+          GE_BREAK (ectx,
+                    gtk_tree_row_reference_get_model (dl_parent->
+                                                      searchViewRowReference)
+                    == model);
 #endif
-      path = gtk_tree_row_reference_get_path(dl_parent->searchViewRowReference);
-      if (path != NULL) {
-        valid = gtk_tree_model_get_iter(model,
-                                        &piter,
-                                        path);
-        GE_BREAK(ectx, valid == TRUE);
-        if (valid == TRUE) {
-          valid = gtk_tree_model_iter_children(model,
-                                               &iter,
-                                               &piter);
-          GE_BREAK(ectx, valid == TRUE);
-        }
-      } else {
-        GE_BREAK(ectx, 0);
-        valid = FALSE;
-      }
-    } else {
-      /* no download-parent, must be top-level entry in search */
-      valid = gtk_tree_model_get_iter_first(model,
-                                            &iter);
-      GE_BREAK(ectx, valid == TRUE);
-    }
-    while (valid == TRUE) {
-      /* find matching entry */
-      gtk_tree_model_get(model,
-                         &iter,
-                         SEARCH_URI, &u,
-                         -1);
-      if (ECRS_equalsUri(u,
-                         fi->uri)) {
-        path = gtk_tree_model_get_path(model,
-                                       &iter);
-        list->searchViewRowReference
-          = gtk_tree_row_reference_new(model,
-                                       path);
-        gtk_tree_path_free(path);
-        gtk_tree_store_set(sl_parent->tree,
-                           &iter,
-                           SEARCH_CELL_BG_COLOR, getColorCode(URITRACK_DOWNLOAD_STARTED),
-                           -1);
-        break;
-      }
-      valid = gtk_tree_model_iter_next(model,
-                                       &iter);
-    }
-    if (valid == FALSE) {
-      /* did not find matching entry in search list -- bug!  Continue
-         without adding to to search list! */
-      GE_BREAK(ectx, 0);
-      list->searchList = NULL;
-    }
-  }
+          path =
+            gtk_tree_row_reference_get_path (dl_parent->
+                                             searchViewRowReference);
+          if (path != NULL)
+            {
+              valid = gtk_tree_model_get_iter (model, &piter, path);
+              GE_BREAK (ectx, valid == TRUE);
+              if (valid == TRUE)
+                {
+                  valid = gtk_tree_model_iter_children (model, &iter, &piter);
+                  GE_BREAK (ectx, valid == TRUE);
+                }
+            }
+          else
+            {
+              GE_BREAK (ectx, 0);
+              valid = FALSE;
+            }
+        }
+      else
+        {
+          /* no download-parent, must be top-level entry in search */
+          valid = gtk_tree_model_get_iter_first (model, &iter);
+          GE_BREAK (ectx, valid == TRUE);
+        }
+      while (valid == TRUE)
+        {
+          /* find matching entry */
+          gtk_tree_model_get (model, &iter, SEARCH_URI, &u, -1);
+          if (ECRS_equalsUri (u, fi->uri))
+            {
+              path = gtk_tree_model_get_path (model, &iter);
+              list->searchViewRowReference
+                = gtk_tree_row_reference_new (model, path);
+              gtk_tree_path_free (path);
+              gtk_tree_store_set (sl_parent->tree,
+                                  &iter,
+                                  SEARCH_CELL_BG_COLOR,
+                                  getColorCode (URITRACK_DOWNLOAD_STARTED),
+                                  -1);
+              break;
+            }
+          valid = gtk_tree_model_iter_next (model, &iter);
+        }
+      if (valid == FALSE)
+        {
+          /* did not find matching entry in search list -- bug!  Continue
+             without adding to to search list! */
+          GE_BREAK (ectx, 0);
+          list->searchList = NULL;
+        }
+    }
   list->fsui_list = fsui_dl;
   list->total = total;
-  list->is_directory = ECRS_isDirectory(fi->meta);
-  list->has_terminated = ( (state != FSUI_ACTIVE) &&
-                           (state != FSUI_PENDING) );
+  list->is_directory = ECRS_isDirectory (fi->meta);
+  list->has_terminated = ((state != FSUI_ACTIVE) && (state != FSUI_PENDING));
   list->next = download_head;
   download_head = list;
-  if ( (list->is_directory == YES) &&
-       (completed != 0) )
-    refreshDirectoryViewFromDisk(list);
+  if ((list->is_directory == YES) && (completed != 0))
+    refreshDirectoryViewFromDisk (list);
   return list;
 }
 
@@ -341,158 +314,166 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
  * summary and the preview of the directory
  * contents in the search page (if applicable).
  */
-void fs_download_update(DownloadList * list,
-                        unsigned long long completed,
-                        const char * data,
-                        unsigned int size) {
+void
+fs_download_update (DownloadList * list,
+                    unsigned long long completed,
+                    const char *data, unsigned int size)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
+  GtkTreePath *path;
   unsigned int val;
-  struct ECRS_MetaData * meta;
+  struct ECRS_MetaData *meta;
 
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  if (path == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  if (path == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary), &iter, path);
+  gtk_tree_path_free (path);
   if (list->total != 0)
     val = completed * 100 / list->total;
   else
     val = 100;
-  gtk_tree_store_set(download_summary,
-                     &iter,
-                     DOWNLOAD_PROGRESS, val,
-                     -1);
-  if ( (list->is_directory == YES) &&
-       (list->searchList != NULL) &&
-       (list->searchViewRowReference != NULL) ) {
-    meta = NULL;
-    ECRS_listDirectory(ectx,
-                       data,
-                       size,
-                       &meta,
-                       &addFilesToDirectory,
-                       list);
-    if (meta != NULL)
-      ECRS_freeMetaData(meta);
-  }
+  gtk_tree_store_set (download_summary, &iter, DOWNLOAD_PROGRESS, val, -1);
+  if ((list->is_directory == YES) &&
+      (list->searchList != NULL) && (list->searchViewRowReference != NULL))
+    {
+      meta = NULL;
+      ECRS_listDirectory (ectx,
+                          data, size, &meta, &addFilesToDirectory, list);
+      if (meta != NULL)
+        ECRS_freeMetaData (meta);
+    }
 }
 
 /**
  * A download has terminated successfully.  Update summary and
  * possibly refresh directory listing.
  */
-void fs_download_completed(DownloadList * downloadContext) {
+void
+fs_download_completed (DownloadList * downloadContext)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
-
-  if (downloadContext->searchViewRowReference != NULL) {
-    path = gtk_tree_row_reference_get_path(downloadContext->searchViewRowReference);
-    gtk_tree_model_get_iter(GTK_TREE_MODEL(downloadContext->searchList->tree),
-                            &iter,
-                            path);
-    gtk_tree_path_free(path);
-    gtk_tree_store_set(downloadContext->searchList->tree,
-                       &iter,
-                       SEARCH_CELL_BG_COLOR,  getColorCode(URITRACK_DOWNLOAD_COMPLETED),
-                       -1);
-  }
+  GtkTreePath *path;
+
+  if (downloadContext->searchViewRowReference != NULL)
+    {
+      path =
+        gtk_tree_row_reference_get_path (downloadContext->
+                                         searchViewRowReference);
+      gtk_tree_model_get_iter (GTK_TREE_MODEL
+                               (downloadContext->searchList->tree), &iter,
+                               path);
+      gtk_tree_path_free (path);
+      gtk_tree_store_set (downloadContext->searchList->tree,
+                          &iter,
+                          SEARCH_CELL_BG_COLOR,
+                          getColorCode (URITRACK_DOWNLOAD_COMPLETED), -1);
+    }
   downloadContext->has_terminated = YES;
-  refreshDirectoryViewFromDisk(downloadContext);
+  refreshDirectoryViewFromDisk (downloadContext);
 }
 
 /**
  * A download has been aborted.  Update summary and
  * possibly refresh directory listing.
  */
-void fs_download_aborted(DownloadList * downloadContext) {
+void
+fs_download_aborted (DownloadList * downloadContext)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
-
-  if (downloadContext->searchViewRowReference != NULL) {
-    path = gtk_tree_row_reference_get_path(downloadContext->searchViewRowReference);
-    gtk_tree_model_get_iter(GTK_TREE_MODEL(downloadContext->searchList->tree),
-                            &iter,
-                            path);
-    gtk_tree_path_free(path);
-    gtk_tree_store_set(downloadContext->searchList->tree,
-                       &iter,
-                       SEARCH_CELL_BG_COLOR,  getColorCode(URITRACK_DOWNLOAD_ABORTED),
-                       -1);
-  }
+  GtkTreePath *path;
+
+  if (downloadContext->searchViewRowReference != NULL)
+    {
+      path =
+        gtk_tree_row_reference_get_path (downloadContext->
+                                         searchViewRowReference);
+      gtk_tree_model_get_iter (GTK_TREE_MODEL
+                               (downloadContext->searchList->tree), &iter,
+                               path);
+      gtk_tree_path_free (path);
+      gtk_tree_store_set (downloadContext->searchList->tree,
+                          &iter,
+                          SEARCH_CELL_BG_COLOR,
+                          getColorCode (URITRACK_DOWNLOAD_ABORTED), -1);
+    }
   downloadContext->has_terminated = YES;
-  refreshDirectoryViewFromDisk(downloadContext);
+  refreshDirectoryViewFromDisk (downloadContext);
 }
 
 /**
  * A download has been stopped.  Remove from summary
  * and free associated resources.
  */
-void fs_download_stopped(DownloadList * list) {
+void
+fs_download_stopped (DownloadList * list)
+{
   GtkTreeIter iter;
   GtkTreeIter piter;
-  GtkTreePath * path;
-  DownloadList * prev;
+  GtkTreePath *path;
+  DownloadList *prev;
   int valid;
-  GtkTreeModel * model;
-
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  if (path == NULL) {
-    GE_BREAK(ectx, 0);
-  } else {
-    gtk_tree_model_get_iter(GTK_TREE_MODEL(download_summary),
-                            &iter,
-                            path);
-    gtk_tree_path_free(path);
-    gtk_tree_row_reference_free(list->summaryViewRowReference);
-    list->summaryViewRowReference = NULL;
-    gtk_tree_store_remove(download_summary,
-                          &iter);
-  }
-  FREE(list->filename);
-  ECRS_freeUri(list->uri);
+  GtkTreeModel *model;
+
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  if (path == NULL)
+    {
+      GE_BREAK (ectx, 0);
+    }
+  else
+    {
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (download_summary),
+                               &iter, path);
+      gtk_tree_path_free (path);
+      gtk_tree_row_reference_free (list->summaryViewRowReference);
+      list->summaryViewRowReference = NULL;
+      gtk_tree_store_remove (download_summary, &iter);
+    }
+  FREE (list->filename);
+  ECRS_freeUri (list->uri);
 
   /* if we have child-results in view, remove them! */
-  if (list->searchList != NULL) {
-    path = gtk_tree_row_reference_get_path(list->searchViewRowReference);
-    if (path == NULL) {
-      GE_BREAK(ectx, 0);
-    } else {
-      model = GTK_TREE_MODEL(list->searchList->tree);
-        gtk_tree_model_get_iter(model,
-                              &piter,
-                              path);
-      gtk_tree_path_free(path);
-      valid = gtk_tree_model_iter_children(model,
-                                           &iter,
-                                           &piter);
-      while (TRUE == valid)
-        valid = gtk_tree_store_remove(GTK_TREE_STORE(model),
-                                      &iter);
-    }
-  }
-  if (list->searchViewRowReference != NULL) {
-    gtk_tree_row_reference_free(list->searchViewRowReference);
-    list->searchViewRowReference = NULL;
-  }
-
-  if (download_head == list) {
-    download_head = list->next;
-  } else {
-    prev = download_head;
-    while ( (prev != NULL) &&
-            (prev->next != list) )
-      prev = prev->next;
-    if (prev != NULL)
-      prev->next = list->next;
-    else
-      GE_BREAK(ectx, 0);
-  }
-  FREE(list);
+  if (list->searchList != NULL)
+    {
+      path = gtk_tree_row_reference_get_path (list->searchViewRowReference);
+      if (path == NULL)
+        {
+          GE_BREAK (ectx, 0);
+        }
+      else
+        {
+          model = GTK_TREE_MODEL (list->searchList->tree);
+          gtk_tree_model_get_iter (model, &piter, path);
+          gtk_tree_path_free (path);
+          valid = gtk_tree_model_iter_children (model, &iter, &piter);
+          while (TRUE == valid)
+            valid = gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+        }
+    }
+  if (list->searchViewRowReference != NULL)
+    {
+      gtk_tree_row_reference_free (list->searchViewRowReference);
+      list->searchViewRowReference = NULL;
+    }
+
+  if (download_head == list)
+    {
+      download_head = list->next;
+    }
+  else
+    {
+      prev = download_head;
+      while ((prev != NULL) && (prev->next != list))
+        prev = prev->next;
+      if (prev != NULL)
+        prev->next = list->next;
+      else
+        GE_BREAK (ectx, 0);
+    }
+  FREE (list);
 }
 
 
@@ -506,59 +487,60 @@ void fs_download_stopped(DownloadList * list) {
  *  such a download is already active.
  */
 static int
-check_pending(const char * filename,
-              GtkTreeIter * parent) {
-  GtkTreeModel * model;
+check_pending (const char *filename, GtkTreeIter * parent)
+{
+  GtkTreeModel *model;
   GtkTreeIter iter;
-  char * name;
-
-  model = GTK_TREE_MODEL(download_summary);
-  if (gtk_tree_model_iter_children(model,
-                                   &iter,
-                                   parent)) {
-    do {        
-      gtk_tree_model_get(model,
-                         &iter,
-                         DOWNLOAD_FILENAME, &name,
-                         -1);
-      if ( (name != NULL) &&
-           (0 == strcmp(name, filename)) ) {
-        free(name);
-        return SYSERR;
-      }
-      if (name != NULL)
-        free(name);
-      if (SYSERR == check_pending(filename,
-                                  &iter))
-        return SYSERR;
-    } while (gtk_tree_model_iter_next(model,
-                                      &iter));
-  }
+  char *name;
+
+  model = GTK_TREE_MODEL (download_summary);
+  if (gtk_tree_model_iter_children (model, &iter, parent))
+    {
+      do
+        {
+          gtk_tree_model_get (model, &iter, DOWNLOAD_FILENAME, &name, -1);
+          if ((name != NULL) && (0 == strcmp (name, filename)))
+            {
+              free (name);
+              return SYSERR;
+            }
+          if (name != NULL)
+            free (name);
+          if (SYSERR == check_pending (filename, &iter))
+            return SYSERR;
+        }
+      while (gtk_tree_model_iter_next (model, &iter));
+    }
   return OK;
 }
 
-typedef struct {
-  char * uri_name;
-  struct ECRS_URI * idc_uri;
-  struct ECRS_MetaData * idc_meta;
-  char * idc_final_download_destination;
-  SearchList * searchContext;
-  DownloadList * parentContext;
+typedef struct
+{
+  char *uri_name;
+  struct ECRS_URI *idc_uri;
+  struct ECRS_MetaData *idc_meta;
+  char *idc_final_download_destination;
+  SearchList *searchContext;
+  DownloadList *parentContext;
   unsigned int anonymity;
   int recursive;
 } SDC;
 
-static void * init_download_helper(void * cls) {
-  SDC * sdc = cls;
-
-  FSUI_startDownload(ctx,
-                     sdc->anonymity,
-                     sdc->recursive,
-                     sdc->idc_uri,
-                     sdc->idc_meta,
-                     sdc->idc_final_download_destination,
-                     (sdc->searchContext != NULL) ? sdc->searchContext->fsui_list : NULL,
-                     (sdc->parentContext != NULL) ? sdc->parentContext->fsui_list : NULL);
+static void *
+init_download_helper (void *cls)
+{
+  SDC *sdc = cls;
+
+  FSUI_startDownload (ctx,
+                      sdc->anonymity,
+                      sdc->recursive,
+                      sdc->idc_uri,
+                      sdc->idc_meta,
+                      sdc->idc_final_download_destination,
+                      (sdc->searchContext !=
+                       NULL) ? sdc->searchContext->fsui_list : NULL,
+                      (sdc->parentContext !=
+                       NULL) ? sdc->parentContext->fsui_list : NULL);
   return NULL;
 }
 
@@ -567,21 +549,20 @@ static void * init_download_helper(void * cls) {
  * Start the download of the selected entry.
  */
 static void
-initiateDownload(GtkTreeModel * model,
-                 GtkTreePath * path,
-                 GtkTreeIter * iter,
-                 gpointer unused) {
+initiateDownload (GtkTreeModel * model,
+                  GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
+{
   SDC sdc;
-  char * final_download_dir;
+  char *final_download_dir;
   GtkTreeIter iiter;
-  char * tmp;
-  char * cname;
-  char * dname;
+  char *tmp;
+  char *cname;
+  char *dname;
   GtkTreePath *dirTreePath;
   char *dirPath;
   unsigned int dirPathLen;
-  char * idc_name;
-  char * idc_mime;
+  char *idc_name;
+  char *idc_mime;
 
   sdc.idc_uri = NULL;
   sdc.idc_meta = NULL;
@@ -589,178 +570,183 @@ initiateDownload(GtkTreeModel * model,
   idc_mime = NULL;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
-  gtk_tree_model_get(model,
-                     iter,
-                     SEARCH_NAME, &idc_name,
-                     SEARCH_URI, &sdc.idc_uri,
-                     SEARCH_META, &sdc.idc_meta,
-                     SEARCH_MIME, &idc_mime,
-                     SEARCH_INTERNAL, &sdc.searchContext,
-                     SEARCH_INTERNAL_PARENT, &sdc.parentContext,
-                     -1);
-  if ( (sdc.idc_uri == NULL) ||
-       (! (ECRS_isFileUri(sdc.idc_uri) ||
-           ECRS_isLocationUri(sdc.idc_uri) ) ) ) {
-    GE_BREAK(ectx, 0);
-    FREENONNULL(idc_name);
-    FREENONNULL(idc_mime);
-    return;
-  }
-  sdc.uri_name = ECRS_uriToString(sdc.idc_uri);
-  if ( (sdc.uri_name == NULL) ||
-       (strlen(sdc.uri_name) <
-        strlen(ECRS_URI_PREFIX) +
-        strlen(ECRS_FILE_INFIX)) ) {
-    GE_BREAK(ectx, 0);
-    FREENONNULL(sdc.uri_name);
-    FREENONNULL(idc_name);
-    FREENONNULL(idc_mime);
-    return;
-  }
+  gtk_tree_model_get (model,
+                      iter,
+                      SEARCH_NAME, &idc_name,
+                      SEARCH_URI, &sdc.idc_uri,
+                      SEARCH_META, &sdc.idc_meta,
+                      SEARCH_MIME, &idc_mime,
+                      SEARCH_INTERNAL, &sdc.searchContext,
+                      SEARCH_INTERNAL_PARENT, &sdc.parentContext, -1);
+  if ((sdc.idc_uri == NULL) ||
+      (!(ECRS_isFileUri (sdc.idc_uri) || ECRS_isLocationUri (sdc.idc_uri))))
+    {
+      GE_BREAK (ectx, 0);
+      FREENONNULL (idc_name);
+      FREENONNULL (idc_mime);
+      return;
+    }
+  sdc.uri_name = ECRS_uriToString (sdc.idc_uri);
+  if ((sdc.uri_name == NULL) ||
+      (strlen (sdc.uri_name) <
+       strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)))
+    {
+      GE_BREAK (ectx, 0);
+      FREENONNULL (sdc.uri_name);
+      FREENONNULL (idc_name);
+      FREENONNULL (idc_mime);
+      return;
+    }
   /* reduce "//" to "/" */
-  if (idc_name != NULL) {
-    while (strstr(idc_name, "//") != NULL)
-      memcpy(strstr(idc_name, "//"),
-             strstr(idc_name, "//") + 1,
-             strlen(strstr(idc_name, "//")));
-  }
+  if (idc_name != NULL)
+    {
+      while (strstr (idc_name, "//") != NULL)
+        memcpy (strstr (idc_name, "//"),
+                strstr (idc_name, "//") + 1,
+                strlen (strstr (idc_name, "//")));
+    }
   /* if no name given or just "/", produce better name */
-  if ( (idc_name == NULL) ||
-       (0 == strcmp("/", idc_name)) ) {
+  if ((idc_name == NULL) || (0 == strcmp ("/", idc_name)))
+    {
 #ifdef WINDOWS
-    char * filehash;
-
-    GE_ASSERT(NULL,
-              strlen(sdc.uri_name) > strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX));
-    FREENONNULL(idc_name);
-    filehash = STRDUP(&sdc.uri_name[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]);
-    filehash[16] = 0;
-    idc_name = STRDUP(filehash);
-    FREENONNULL(filehash);
+      char *filehash;
+
+      GE_ASSERT (NULL,
+                 strlen (sdc.uri_name) >
+                 strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
+      FREENONNULL (idc_name);
+      filehash =
+        STRDUP (&sdc.
+                uri_name[strlen (ECRS_URI_PREFIX) +
+                         strlen (ECRS_FILE_INFIX)]);
+      filehash[16] = 0;
+      idc_name = STRDUP (filehash);
+      FREENONNULL (filehash);
 #else
-    GE_ASSERT(NULL,
-              strlen(sdc.uri_name) > strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX));
-    FREENONNULL(idc_name);
-    idc_name = STRDUP(&sdc.uri_name[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)]);
+      GE_ASSERT (NULL,
+                 strlen (sdc.uri_name) >
+                 strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX));
+      FREENONNULL (idc_name);
+      idc_name =
+        STRDUP (&sdc.
+                uri_name[strlen (ECRS_URI_PREFIX) +
+                         strlen (ECRS_FILE_INFIX)]);
 #endif
-  }
+    }
 
   /* dname = directory portion of idc_name */
   cname = idc_name;
-  dname = STRDUP(idc_name);
-  cname = &dname[strlen(dname)-1];
+  dname = STRDUP (idc_name);
+  cname = &dname[strlen (dname) - 1];
   if (cname != dname)
-    cname--; /* ignore tailing '/' */
-  while ( (cname != dname) &&
-          (*cname != DIR_SEPARATOR) )
+    cname--;                    /* ignore tailing '/' */
+  while ((cname != dname) && (*cname != DIR_SEPARATOR))
     cname--;
-  if (*cname == DIR_SEPARATOR) {
-    *cname = '\0';
-    FREE(idc_name);
-    idc_name = STRDUP(cname + 1);
-  } else {
-    *cname = '\0';
-  }
+  if (*cname == DIR_SEPARATOR)
+    {
+      *cname = '\0';
+      FREE (idc_name);
+      idc_name = STRDUP (cname + 1);
+    }
+  else
+    {
+      *cname = '\0';
+    }
   cname = NULL;
 
-  GC_get_configuration_value_filename(cfg,
-                                      "FS",
-                                      "INCOMINGDIR",
-                                      "$HOME/gnunet-downloads/",
-                                      &final_download_dir);
-  if (strlen(dname) > 0) {
-    tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
-    strcpy(tmp, final_download_dir);
-    if (tmp[strlen(tmp)] != DIR_SEPARATOR)
-      strcat(tmp, DIR_SEPARATOR_STR);
-    if (dname[0] == DIR_SEPARATOR)
-      strcat(tmp, &dname[1]);
-    else
-      strcat(tmp, dname);
-    FREE(final_download_dir);
-    final_download_dir = tmp;
-  }
-  FREE(dname);
+  GC_get_configuration_value_filename (cfg,
+                                       "FS",
+                                       "INCOMINGDIR",
+                                       "$HOME/gnunet-downloads/",
+                                       &final_download_dir);
+  if (strlen (dname) > 0)
+    {
+      tmp = MALLOC (strlen (final_download_dir) + strlen (dname) + 2);
+      strcpy (tmp, final_download_dir);
+      if (tmp[strlen (tmp)] != DIR_SEPARATOR)
+        strcat (tmp, DIR_SEPARATOR_STR);
+      if (dname[0] == DIR_SEPARATOR)
+        strcat (tmp, &dname[1]);
+      else
+        strcat (tmp, dname);
+      FREE (final_download_dir);
+      final_download_dir = tmp;
+    }
+  FREE (dname);
   dname = NULL;
   /* If file is inside a directory, get the full path */
-  dirTreePath = gtk_tree_path_copy(path);
-  dirPath = MALLOC(1);
+  dirTreePath = gtk_tree_path_copy (path);
+  dirPath = MALLOC (1);
   dirPath[0] = '\0';
   dirPathLen = 0;
-  while (gtk_tree_path_get_depth(dirTreePath) > 1) {
-    char * dirname;
-    char * newPath;
-
-    if (! gtk_tree_path_up(dirTreePath))
-      break;
-    if (! gtk_tree_model_get_iter(model,
-                                  &iiter,
-                                  dirTreePath))
-      break;
-    gtk_tree_model_get(model,
-                       &iiter,
-                       SEARCH_NAME, &dirname,
-                       -1);
-    dirPathLen = strlen(dirPath) + strlen(dirname) + strlen(DIR_SEPARATOR_STR) + 1;
-    newPath = MALLOC(dirPathLen + 1);
-    strcpy(newPath, dirname);
-    if (newPath[strlen(newPath)-1] != DIR_SEPARATOR)
-      strcat(newPath, DIR_SEPARATOR_STR);
-    strcat(newPath, dirPath);
-    FREE(dirPath);
-    dirPath = newPath;
-    free(dirname);
-  }
-  gtk_tree_path_free(dirTreePath);
+  while (gtk_tree_path_get_depth (dirTreePath) > 1)
+    {
+      char *dirname;
+      char *newPath;
+
+      if (!gtk_tree_path_up (dirTreePath))
+        break;
+      if (!gtk_tree_model_get_iter (model, &iiter, dirTreePath))
+        break;
+      gtk_tree_model_get (model, &iiter, SEARCH_NAME, &dirname, -1);
+      dirPathLen =
+        strlen (dirPath) + strlen (dirname) + strlen (DIR_SEPARATOR_STR) + 1;
+      newPath = MALLOC (dirPathLen + 1);
+      strcpy (newPath, dirname);
+      if (newPath[strlen (newPath) - 1] != DIR_SEPARATOR)
+        strcat (newPath, DIR_SEPARATOR_STR);
+      strcat (newPath, dirPath);
+      FREE (dirPath);
+      dirPath = newPath;
+      free (dirname);
+    }
+  gtk_tree_path_free (dirTreePath);
 
   /* construct completed/directory/real-filename */
-  sdc.idc_final_download_destination = MALLOC(strlen(final_download_dir) + 2 +
-                                              strlen(idc_name) + strlen(GNUNET_DIRECTORY_EXT) +
-                                              strlen(dirPath));
-  strcpy(sdc.idc_final_download_destination,
-         final_download_dir);
-  if (sdc.idc_final_download_destination[strlen(sdc.idc_final_download_destination)-1] != DIR_SEPARATOR)
-    strcat(sdc.idc_final_download_destination,
-           DIR_SEPARATOR_STR);
-  strcat(sdc.idc_final_download_destination,
-         dirPath);
-  strcat(sdc.idc_final_download_destination,
-         idc_name);
-  sdc.anonymity = getSpinButtonValue(sdc.searchContext->searchXML,
-                                     "downloadAnonymitySpinButton");
-  sdc.recursive = getToggleButtonValue(sdc.searchContext->searchXML,
-                                       "downloadRecursiveCheckButton");
-  if (OK == check_pending(idc_name,
-                          NULL)) {
-    addLogEntry(_("Downloading `%s'\n"),
-                idc_name);
-    run_with_save_calls(&init_download_helper,
-                        &sdc);
-  } else {
-    addLogEntry(_("ERROR: already downloading `%s'"),
-                idc_name);
-  }
-  FREE(sdc.uri_name);
-  FREE(dirPath);
-  FREE(sdc.idc_final_download_destination);
-  FREENONNULL(final_download_dir);
-  FREENONNULL(idc_name);
-  FREENONNULL(idc_mime);
+  sdc.idc_final_download_destination =
+    MALLOC (strlen (final_download_dir) + 2 + strlen (idc_name) +
+            strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
+  strcpy (sdc.idc_final_download_destination, final_download_dir);
+  if (sdc.
+      idc_final_download_destination[strlen
+                                     (sdc.idc_final_download_destination) -
+                                     1] != DIR_SEPARATOR)
+    strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
+  strcat (sdc.idc_final_download_destination, dirPath);
+  strcat (sdc.idc_final_download_destination, idc_name);
+  sdc.anonymity = getSpinButtonValue (sdc.searchContext->searchXML,
+                                      "downloadAnonymitySpinButton");
+  sdc.recursive = getToggleButtonValue (sdc.searchContext->searchXML,
+                                        "downloadRecursiveCheckButton");
+  if (OK == check_pending (idc_name, NULL))
+    {
+      addLogEntry (_("Downloading `%s'\n"), idc_name);
+      run_with_save_calls (&init_download_helper, &sdc);
+    }
+  else
+    {
+      addLogEntry (_("ERROR: already downloading `%s'"), idc_name);
+    }
+  FREE (sdc.uri_name);
+  FREE (dirPath);
+  FREE (sdc.idc_final_download_destination);
+  FREENONNULL (final_download_dir);
+  FREENONNULL (idc_name);
+  FREENONNULL (idc_mime);
 }
 
 /**
  * The download button in the search dialog was
  * clicked.  Download all selected entries.
  */
-void on_downloadButton_clicked_fs(GtkWidget * treeview,
-                                  GtkWidget * downloadButton) {
-  GtkTreeSelection * selection;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  ggc_tree_selection_selected_foreach
-    (selection,
-     &initiateDownload,
-     NULL);
+void
+on_downloadButton_clicked_fs (GtkWidget * treeview,
+                              GtkWidget * downloadButton)
+{
+  GtkTreeSelection *selection;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+  ggc_tree_selection_selected_foreach (selection, &initiateDownload, NULL);
 }
 
 
@@ -773,161 +759,151 @@ void on_downloadButton_clicked_fs(GtkWidget * treeview,
  * - support for user-specified filename
  * - enable button only if valid URI is entered
  */
-void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
-                                               GtkWidget * downloadButton) {
-  const char * uris;
-  char * urid;
-  char * final_download_dir;
-  const char * dname;
+void
+on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
+                                           GtkWidget * downloadButton)
+{
+  const char *uris;
+  char *urid;
+  char *final_download_dir;
+  const char *dname;
   SDC sdc;
 
-  uris = gtk_entry_get_text(GTK_ENTRY(entry));
-  urid = STRDUP(uris);
-  gtk_entry_set_text(GTK_ENTRY(entry),
-                     ECRS_URI_PREFIX);
-  sdc.idc_uri = ECRS_stringToUri(ectx, urid);
-  if (sdc.idc_uri == NULL) {
-    addLogEntry(_("Invalid URI `%s'"), urid);
-    FREE(urid);
-    return;
-  }
-  if (ECRS_isKeywordUri(sdc.idc_uri)) {
-    addLogEntry(_("Please use the search function for keyword (KSK) URIs!"));
-    FREE(urid);
-    ECRS_freeUri(sdc.idc_uri);
-    return;
-  } else if (ECRS_isLocationUri(sdc.idc_uri)) {
-    addLogEntry(_("Location URIs are not yet supported"));
-    FREE(urid);
-    ECRS_freeUri(sdc.idc_uri);
-    return;
-  }
-  GC_get_configuration_value_filename(cfg,
-                                      "FS",
-                                      "INCOMINGDIR",
-                                      "$HOME/gnunet-downloads/",
-                                      &final_download_dir);
-  disk_directory_create(ectx, final_download_dir);
-  dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)];
-  sdc.idc_final_download_destination = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
-  strcpy(sdc.idc_final_download_destination,
-         final_download_dir);
-  FREE(final_download_dir);
-  if (sdc.idc_final_download_destination[strlen(sdc.idc_final_download_destination)] != DIR_SEPARATOR)
-    strcat(sdc.idc_final_download_destination,
-           DIR_SEPARATOR_STR);
-  strcat(sdc.idc_final_download_destination,
-         dname);
-
-  addLogEntry(_("Downloading `%s'\n"),
-              uris);
-  sdc.idc_meta = ECRS_createMetaData();
-  sdc.anonymity = getSpinButtonValue(getMainXML(),
-                                     "fsstatusAnonymitySpin");
+  uris = gtk_entry_get_text (GTK_ENTRY (entry));
+  urid = STRDUP (uris);
+  gtk_entry_set_text (GTK_ENTRY (entry), ECRS_URI_PREFIX);
+  sdc.idc_uri = ECRS_stringToUri (ectx, urid);
+  if (sdc.idc_uri == NULL)
+    {
+      addLogEntry (_("Invalid URI `%s'"), urid);
+      FREE (urid);
+      return;
+    }
+  if (ECRS_isKeywordUri (sdc.idc_uri))
+    {
+      addLogEntry (_
+                   ("Please use the search function for keyword (KSK) URIs!"));
+      FREE (urid);
+      ECRS_freeUri (sdc.idc_uri);
+      return;
+    }
+  else if (ECRS_isLocationUri (sdc.idc_uri))
+    {
+      addLogEntry (_("Location URIs are not yet supported"));
+      FREE (urid);
+      ECRS_freeUri (sdc.idc_uri);
+      return;
+    }
+  GC_get_configuration_value_filename (cfg,
+                                       "FS",
+                                       "INCOMINGDIR",
+                                       "$HOME/gnunet-downloads/",
+                                       &final_download_dir);
+  disk_directory_create (ectx, final_download_dir);
+  dname = &uris[strlen (ECRS_URI_PREFIX) + strlen (ECRS_FILE_INFIX)];
+  sdc.idc_final_download_destination =
+    MALLOC (strlen (final_download_dir) + strlen (dname) + 2);
+  strcpy (sdc.idc_final_download_destination, final_download_dir);
+  FREE (final_download_dir);
+  if (sdc.
+      idc_final_download_destination[strlen
+                                     (sdc.idc_final_download_destination)] !=
+      DIR_SEPARATOR)
+    strcat (sdc.idc_final_download_destination, DIR_SEPARATOR_STR);
+  strcat (sdc.idc_final_download_destination, dname);
+
+  addLogEntry (_("Downloading `%s'\n"), uris);
+  sdc.idc_meta = ECRS_createMetaData ();
+  sdc.anonymity = getSpinButtonValue (getMainXML (), "fsstatusAnonymitySpin");
   sdc.recursive = NO;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
-  run_with_save_calls(&init_download_helper,
-                      &sdc);
-  ECRS_freeMetaData(sdc.idc_meta);
-  FREE(sdc.idc_final_download_destination);
-  FREE(urid);
+  run_with_save_calls (&init_download_helper, &sdc);
+  ECRS_freeMetaData (sdc.idc_meta);
+  FREE (sdc.idc_final_download_destination);
+  FREE (urid);
 }
 
-struct FCBC {
-  int (*method)(struct FSUI_Context * ctx,
-                struct FSUI_DownloadList * list);
-  struct FSUI_DownloadList * argument;
+struct FCBC
+{
+  int (*method) (struct FSUI_Context * ctx, struct FSUI_DownloadList * list);
+  struct FSUI_DownloadList *argument;
 };
 
-static void * fsui_callback(void * cls) {
-  struct FCBC * fcbc = cls;
-  fcbc->method(ctx,
-               fcbc->argument);
+static void *
+fsui_callback (void *cls)
+{
+  struct FCBC *fcbc = cls;
+  fcbc->method (ctx, fcbc->argument);
   return NULL;
 }
 
 static void
-clearCompletedDownloadCallback(GtkTreeModel * model,
-                               GtkTreePath * path,
-                               GtkTreeIter * iter,
-                               gpointer unused) {
-  DownloadList * dl;
+clearCompletedDownloadCallback (GtkTreeModel * model,
+                                GtkTreePath * path,
+                                GtkTreeIter * iter, gpointer unused)
+{
+  DownloadList *dl;
   struct FCBC fcbc;
 
-  GE_ASSERT(ectx,
-            model == GTK_TREE_MODEL(download_summary));
-  gtk_tree_model_get(model,
-                     iter,
-                     DOWNLOAD_INTERNAL, &dl,
-                     -1);
-  if ( (FALSE == gtk_tree_model_iter_has_child(model,
-                                               iter)) &&
-       (dl->has_terminated) ) {
-    fcbc.method = &FSUI_stopDownload;
-    fcbc.argument = dl->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-  }
+  GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+  gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
+  if ((FALSE == gtk_tree_model_iter_has_child (model,
+                                               iter)) && (dl->has_terminated))
+    {
+      fcbc.method = &FSUI_stopDownload;
+      fcbc.argument = dl->fsui_list;
+      run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
-void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
-                                                 GtkWidget * clearButton) {
-  ggc_tree_model_foreach(GTK_TREE_MODEL(download_summary),
-                         &clearCompletedDownloadCallback,
-                         NULL);
+void
+on_clearCompletedDownloadsButton_clicked_fs (void *unused,
+                                             GtkWidget * clearButton)
+{
+  ggc_tree_model_foreach (GTK_TREE_MODEL (download_summary),
+                          &clearCompletedDownloadCallback, NULL);
 }
 
 static void
-fsuiCallDownloadCallback(GtkTreeModel * model,
-                         GtkTreePath * path,
-                         GtkTreeIter * iter,
-                         gpointer fsui_call) {
-  DownloadList * dl;
+fsuiCallDownloadCallback (GtkTreeModel * model,
+                          GtkTreePath * path,
+                          GtkTreeIter * iter, gpointer fsui_call)
+{
+  DownloadList *dl;
   struct FCBC fcbc;
 
-  GE_ASSERT(ectx,
-            model == GTK_TREE_MODEL(download_summary));
-  gtk_tree_model_get(model,
-                     iter,
-                     DOWNLOAD_INTERNAL, &dl,
-                     -1);
+  GE_ASSERT (ectx, model == GTK_TREE_MODEL (download_summary));
+  gtk_tree_model_get (model, iter, DOWNLOAD_INTERNAL, &dl, -1);
   fcbc.method = fsui_call;
   fcbc.argument = dl->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  run_with_save_calls (&fsui_callback, &fcbc);
 }
 
-void on_abortDownloadButton_clicked_fs(void * unused,
-                                       GtkWidget * abortButton) {
-  GtkTreeSelection * selection;
-  GtkWidget * downloadList;
+void
+on_abortDownloadButton_clicked_fs (void *unused, GtkWidget * abortButton)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget(getMainXML(),
-                                      "activeDownloadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
+  downloadList = glade_xml_get_widget (getMainXML (), "activeDownloadsList");
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallDownloadCallback,
-     &FSUI_abortDownload);
+    (selection, &fsuiCallDownloadCallback, &FSUI_abortDownload);
 }
 
-void on_stopDownloadButton_clicked_fs(void * unused,
-                                      GtkWidget * stopButton) {
-  GtkTreeSelection * selection;
-  GtkWidget * downloadList;
+void
+on_stopDownloadButton_clicked_fs (void *unused, GtkWidget * stopButton)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget(getMainXML(),
-                                      "activeDownloadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
+  downloadList = glade_xml_get_widget (getMainXML (), "activeDownloadsList");
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallDownloadCallback,
-     &FSUI_abortDownload);
+    (selection, &fsuiCallDownloadCallback, &FSUI_abortDownload);
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallDownloadCallback,
-     &FSUI_stopDownload);
+    (selection, &fsuiCallDownloadCallback, &FSUI_stopDownload);
 }
 
 /* end of download.c */
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h
index d03be966..9f09f263 100644
--- a/src/plugins/fs/download.h
+++ b/src/plugins/fs/download.h
@@ -31,27 +31,24 @@
 #include <GNUnet/gnunet_fsui_lib.h>
 #include "fs.h"
 
-DownloadList *
-fs_download_started(struct FSUI_DownloadList * fsui_dl,
-                    DownloadList * dl_parent,
-                    SearchList * sl_parent,
-                    unsigned long long total,
-                    unsigned int anonymityLevel,
-                    const ECRS_FileInfo * fi,
-                    const char * filename,
-                    unsigned long long completed,
-                    cron_t eta,
-                    FSUI_State state);
-
-void fs_download_update(DownloadList * downloadContext,
-                        unsigned long long completed,
-                        const char * data,
-                        unsigned int size);
-
-void fs_download_completed(DownloadList * downloadContext);
-
-void fs_download_aborted(DownloadList * downloadContext);
-
-void fs_download_stopped(DownloadList * downloadContext);
+DownloadList *fs_download_started (struct FSUI_DownloadList *fsui_dl,
+                                   DownloadList * dl_parent,
+                                   SearchList * sl_parent,
+                                   unsigned long long total,
+                                   unsigned int anonymityLevel,
+                                   const ECRS_FileInfo * fi,
+                                   const char *filename,
+                                   unsigned long long completed,
+                                   cron_t eta, FSUI_State state);
+
+void fs_download_update (DownloadList * downloadContext,
+                         unsigned long long completed,
+                         const char *data, unsigned int size);
+
+void fs_download_completed (DownloadList * downloadContext);
+
+void fs_download_aborted (DownloadList * downloadContext);
+
+void fs_download_stopped (DownloadList * downloadContext);
 
 #endif
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index a586e362..0e5798f5 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -56,7 +56,7 @@ EXTRACTOR_ExtractorList *Extractors;
 GtkWidget *musicinsertdialog;
 
 GtkTreeViewColumn *filename_list_col, *title_list_col, *artist_list_col,
-        *album_list_col, *type_list_col, *format_list_col, *keywords_list_col;
+  *album_list_col, *type_list_col, *format_list_col, *keywords_list_col;
 
 GtkWidget *filelist_popup;
 
@@ -66,260 +66,236 @@ main (int argc, char *argv[])
 
 
 
-        gtk_init (&argc, &argv);
+  gtk_init (&argc, &argv);
 
-        show_musicinsertdialog ();
+  show_musicinsertdialog ();
 
-        gtk_main ();
-        return 0;
+  gtk_main ();
+  return 0;
 }
 
 void
 show_musicinsertdialog ()
 {
-        musicinsertXML =
-                glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog",
-                               PACKAGE_NAME);
-        glade_xml_signal_autoconnect (musicinsertXML);
+  musicinsertXML =
+    glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", PACKAGE_NAME);
+  glade_xml_signal_autoconnect (musicinsertXML);
 /* libglade*/
 
 
-        gtk_set_locale ();
+  gtk_set_locale ();
 
-        musicinsertdialog =
-                glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
+  musicinsertdialog =
+    glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
 
 /*
  * Create the 3 ComboBoxEntry manually (libglade doesn't handle this well :
  * should use gtk_combo_box_entry_new_text instead of gtk_combo_box_entry_new)
  */
-        artistcombobox =
-                GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
-        albumcombobox = GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
-        typecombobox = GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
-
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "Ogg (application/ogg)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "MP3 (audio/mpeg)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "MPC (application/x-musepack)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox), "AAC");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "WMA (audio/x-ms-wma)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "FLAC (audio/flac)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox), "APE");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "WAV (application/x-wav)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "REAL (audio/vnd.rn-realaudio)");
-        gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
-                                   "MIDI (audio/x-midi)");
-
-        GtkWidget *globaltable =
-                glade_xml_get_widget (musicinsertXML, "globaltable");
-        gtk_table_attach (GTK_TABLE (globaltable),
-                          GTK_WIDGET (artistcombobox), 1, 3, 1, 2,
-                          GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-        gtk_table_attach (GTK_TABLE (globaltable), GTK_WIDGET (albumcombobox),
-                          1, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0,
-                          0);
-        gtk_table_attach (GTK_TABLE (globaltable), GTK_WIDGET (typecombobox),
-                          1, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0,
-                          0);
-
-        gtk_widget_show (GTK_WIDGET (artistcombobox));
-        gtk_widget_show (GTK_WIDGET (albumcombobox));
-        gtk_widget_show (GTK_WIDGET (typecombobox));
-
-        /*
-         * treeview creation
-         */
-
-        /* liststore model */
-        filelist_store =
-                gtk_list_store_new (COLS_NUMBER, G_TYPE_STRING, G_TYPE_STRING,
-                                    G_TYPE_STRING, G_TYPE_STRING,
-                                    G_TYPE_STRING, G_TYPE_STRING,
-                                    G_TYPE_STRING, G_TYPE_STRING);
-
-        /* view */
-        GtkWidget *filelist =
-                glade_xml_get_widget (musicinsertXML, "filelist");
-        gtk_tree_view_set_model (GTK_TREE_VIEW (filelist),
-                                 GTK_TREE_MODEL (filelist_store));
-
-        /* cells definition */
-        GtkCellRenderer *filename_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (filename_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *title_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (title_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *artist_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (artist_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *album_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (album_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *type_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (type_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *format_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (format_renderer, "editable", TRUE, NULL);
-        GtkCellRenderer *keywords_renderer = gtk_cell_renderer_text_new ();
-        g_object_set (keywords_renderer, "editable", TRUE, NULL);
-
-
-        g_signal_connect ((gpointer) filename_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & filename_col_num);
-        g_signal_connect ((gpointer) title_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & title_col_num);
-        g_signal_connect ((gpointer) artist_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & artist_col_num);
-        g_signal_connect ((gpointer) album_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & album_col_num);
-        g_signal_connect ((gpointer) type_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & type_col_num);
-        g_signal_connect ((gpointer) format_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & format_col_num);
-        g_signal_connect ((gpointer) keywords_renderer, "edited",
-                          G_CALLBACK (on_renderer_edited),
-                          (gpointer) & keywords_col_num);
-
-        /* columns definition */
-        filename_list_col =
-                gtk_tree_view_column_new_with_attributes (_
-                                                          ("Published filename"),
-                                                          filename_renderer,
-                                                          "text",
-                                                          FILENAME_COL, NULL);
-        title_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Title"),
-                                                          title_renderer,
-                                                          "text", TITLE_COL,
-                                                          NULL);
-        artist_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Artist"),
-                                                          artist_renderer,
-                                                          "text", ARTIST_COL,
-                                                          NULL);
-        album_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Album"),
-                                                          album_renderer,
-                                                          "text", ALBUM_COL,
-                                                          NULL);
-        type_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Type"),
-                                                          type_renderer,
-                                                          "text", TYPE_COL,
-                                                          NULL);
-        format_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Format"),
-                                                          format_renderer,
-                                                          "text", FORMAT_COL,
-                                                          NULL);
-        keywords_list_col =
-                gtk_tree_view_column_new_with_attributes (_("Keywords"),
-                                                          keywords_renderer,
-                                                          "text",
-                                                          KEYWORDS_COL, NULL);
+  artistcombobox = GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
+  albumcombobox = GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
+  typecombobox = GTK_COMBO_BOX_ENTRY (gtk_combo_box_entry_new_text ());
+
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "Ogg (application/ogg)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "MP3 (audio/mpeg)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "MPC (application/x-musepack)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox), "AAC");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "WMA (audio/x-ms-wma)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "FLAC (audio/flac)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox), "APE");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "WAV (application/x-wav)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "REAL (audio/vnd.rn-realaudio)");
+  gtk_combo_box_append_text (GTK_COMBO_BOX (typecombobox),
+                             "MIDI (audio/x-midi)");
+
+  GtkWidget *globaltable =
+    glade_xml_get_widget (musicinsertXML, "globaltable");
+  gtk_table_attach (GTK_TABLE (globaltable),
+                    GTK_WIDGET (artistcombobox), 1, 3, 1, 2,
+                    GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_table_attach (GTK_TABLE (globaltable), GTK_WIDGET (albumcombobox),
+                    1, 3, 2, 3, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+  gtk_table_attach (GTK_TABLE (globaltable), GTK_WIDGET (typecombobox),
+                    1, 3, 3, 4, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
+
+  gtk_widget_show (GTK_WIDGET (artistcombobox));
+  gtk_widget_show (GTK_WIDGET (albumcombobox));
+  gtk_widget_show (GTK_WIDGET (typecombobox));
+
+  /*
+   * treeview creation
+   */
+
+  /* liststore model */
+  filelist_store =
+    gtk_list_store_new (COLS_NUMBER, G_TYPE_STRING, G_TYPE_STRING,
+                        G_TYPE_STRING, G_TYPE_STRING,
+                        G_TYPE_STRING, G_TYPE_STRING,
+                        G_TYPE_STRING, G_TYPE_STRING);
+
+  /* view */
+  GtkWidget *filelist = glade_xml_get_widget (musicinsertXML, "filelist");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (filelist),
+                           GTK_TREE_MODEL (filelist_store));
+
+  /* cells definition */
+  GtkCellRenderer *filename_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (filename_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *title_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (title_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *artist_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (artist_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *album_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (album_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *type_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (type_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *format_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (format_renderer, "editable", TRUE, NULL);
+  GtkCellRenderer *keywords_renderer = gtk_cell_renderer_text_new ();
+  g_object_set (keywords_renderer, "editable", TRUE, NULL);
+
+
+  g_signal_connect ((gpointer) filename_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & filename_col_num);
+  g_signal_connect ((gpointer) title_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & title_col_num);
+  g_signal_connect ((gpointer) artist_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & artist_col_num);
+  g_signal_connect ((gpointer) album_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & album_col_num);
+  g_signal_connect ((gpointer) type_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & type_col_num);
+  g_signal_connect ((gpointer) format_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & format_col_num);
+  g_signal_connect ((gpointer) keywords_renderer, "edited",
+                    G_CALLBACK (on_renderer_edited),
+                    (gpointer) & keywords_col_num);
+
+  /* columns definition */
+  filename_list_col =
+    gtk_tree_view_column_new_with_attributes (_
+                                              ("Published filename"),
+                                              filename_renderer,
+                                              "text", FILENAME_COL, NULL);
+  title_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Title"),
+                                              title_renderer,
+                                              "text", TITLE_COL, NULL);
+  artist_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Artist"),
+                                              artist_renderer,
+                                              "text", ARTIST_COL, NULL);
+  album_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Album"),
+                                              album_renderer,
+                                              "text", ALBUM_COL, NULL);
+  type_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Type"),
+                                              type_renderer,
+                                              "text", TYPE_COL, NULL);
+  format_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Format"),
+                                              format_renderer,
+                                              "text", FORMAT_COL, NULL);
+  keywords_list_col =
+    gtk_tree_view_column_new_with_attributes (_("Keywords"),
+                                              keywords_renderer,
+                                              "text", KEYWORDS_COL, NULL);
 
 /* Allow sorting for all columns */
-        gtk_tree_view_column_set_sort_column_id (filename_list_col,
-                                                 FILENAME_COL);
-        gtk_tree_view_column_set_sort_column_id (title_list_col, TITLE_COL);
-        gtk_tree_view_column_set_sort_column_id (artist_list_col, ARTIST_COL);
-        gtk_tree_view_column_set_sort_column_id (album_list_col, ALBUM_COL);
-        gtk_tree_view_column_set_sort_column_id (type_list_col, TYPE_COL);
-        gtk_tree_view_column_set_sort_column_id (format_list_col, FORMAT_COL);
-        gtk_tree_view_column_set_sort_column_id (keywords_list_col,
-                                                 KEYWORDS_COL);
-
-        /* Allow to resize all columns */
-        gtk_tree_view_column_set_resizable (filename_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (title_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (artist_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (album_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (type_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (format_list_col, TRUE);
-        gtk_tree_view_column_set_resizable (keywords_list_col, TRUE);
-
-        /* Hide unedeed columns */
-        gtk_tree_view_column_set_visible (artist_list_col, FALSE);
-        gtk_tree_view_column_set_visible (album_list_col, FALSE);
-        gtk_tree_view_column_set_visible (type_list_col, FALSE);
-        gtk_tree_view_column_set_visible (keywords_list_col, FALSE);
-
-        /* Set a smart option */
-        gtk_tree_view_get_hover_expand (GTK_TREE_VIEW (filelist));
-
-        /* add columns to view */
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     filename_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     title_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     artist_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     album_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), type_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     format_list_col);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (filelist),
-                                     keywords_list_col);
-
-        /* Expand columns */
-        gtk_tree_view_column_set_expand (filename_list_col, TRUE);
-        gtk_tree_view_column_set_expand (artist_list_col, TRUE);
-        gtk_tree_view_column_set_expand (album_list_col, TRUE);
-        gtk_tree_view_column_set_expand (type_list_col, TRUE);
-        gtk_tree_view_column_set_expand (format_list_col, TRUE);
-        gtk_tree_view_column_set_expand (keywords_list_col, TRUE);
-
-        /* Allow multiple selections */
-        GtkTreeSelection *filelist_selection =
-                gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
-        gtk_tree_selection_set_mode (filelist_selection,
-                                     GTK_SELECTION_MULTIPLE);
-
-
-
-        AlbumList = NULL;
-        ArtistList = NULL;
-
-        Extractors = EXTRACTOR_loadDefaultLibraries ();
-        Extractors =
-                EXTRACTOR_loadConfigLibraries (Extractors,
-                                               "libextractor_filename");
+  gtk_tree_view_column_set_sort_column_id (filename_list_col, FILENAME_COL);
+  gtk_tree_view_column_set_sort_column_id (title_list_col, TITLE_COL);
+  gtk_tree_view_column_set_sort_column_id (artist_list_col, ARTIST_COL);
+  gtk_tree_view_column_set_sort_column_id (album_list_col, ALBUM_COL);
+  gtk_tree_view_column_set_sort_column_id (type_list_col, TYPE_COL);
+  gtk_tree_view_column_set_sort_column_id (format_list_col, FORMAT_COL);
+  gtk_tree_view_column_set_sort_column_id (keywords_list_col, KEYWORDS_COL);
+
+  /* Allow to resize all columns */
+  gtk_tree_view_column_set_resizable (filename_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (title_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (artist_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (album_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (type_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (format_list_col, TRUE);
+  gtk_tree_view_column_set_resizable (keywords_list_col, TRUE);
+
+  /* Hide unedeed columns */
+  gtk_tree_view_column_set_visible (artist_list_col, FALSE);
+  gtk_tree_view_column_set_visible (album_list_col, FALSE);
+  gtk_tree_view_column_set_visible (type_list_col, FALSE);
+  gtk_tree_view_column_set_visible (keywords_list_col, FALSE);
+
+  /* Set a smart option */
+  gtk_tree_view_get_hover_expand (GTK_TREE_VIEW (filelist));
+
+  /* add columns to view */
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), filename_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), title_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), artist_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), album_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), type_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), format_list_col);
+  gtk_tree_view_append_column (GTK_TREE_VIEW (filelist), keywords_list_col);
+
+  /* Expand columns */
+  gtk_tree_view_column_set_expand (filename_list_col, TRUE);
+  gtk_tree_view_column_set_expand (artist_list_col, TRUE);
+  gtk_tree_view_column_set_expand (album_list_col, TRUE);
+  gtk_tree_view_column_set_expand (type_list_col, TRUE);
+  gtk_tree_view_column_set_expand (format_list_col, TRUE);
+  gtk_tree_view_column_set_expand (keywords_list_col, TRUE);
+
+  /* Allow multiple selections */
+  GtkTreeSelection *filelist_selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
+  gtk_tree_selection_set_mode (filelist_selection, GTK_SELECTION_MULTIPLE);
+
+
+
+  AlbumList = NULL;
+  ArtistList = NULL;
+
+  Extractors = EXTRACTOR_loadDefaultLibraries ();
+  Extractors =
+    EXTRACTOR_loadConfigLibraries (Extractors, "libextractor_filename");
 
 /* Create the popup menu */
-        filelist_popup = gtk_menu_new ();
-        GtkWidget *select_all_menu_item =
-                gtk_menu_item_new_with_label (_("Select all files"));
-        GtkWidget *delete_menu_item =
-                gtk_menu_item_new_with_label (_("Remove selected files"));
-        gtk_menu_attach (GTK_MENU (filelist_popup), select_all_menu_item, 0,
-                         1, 0, 1);
-        gtk_menu_attach (GTK_MENU (filelist_popup), delete_menu_item, 0, 1, 1,
-                         2);
-        gtk_widget_show (select_all_menu_item);
-        gtk_widget_show (delete_menu_item);
-        gtk_signal_connect (GTK_OBJECT (filelist), "button-press-event",
-                            GTK_SIGNAL_FUNC (popup_delete), (gpointer) NULL);
-        gtk_signal_connect (GTK_OBJECT (select_all_menu_item), "activate",
-                            GTK_SIGNAL_FUNC (select_all_files),
-                            (gpointer) TRUE);
-        gtk_signal_connect (GTK_OBJECT (delete_menu_item), "activate",
-                            GTK_SIGNAL_FUNC (remove_file_from_list),
-                            (gpointer) NULL);
-
-        /*
-         * show the main window
-         */
-        gtk_widget_show (musicinsertdialog);
+  filelist_popup = gtk_menu_new ();
+  GtkWidget *select_all_menu_item =
+    gtk_menu_item_new_with_label (_("Select all files"));
+  GtkWidget *delete_menu_item =
+    gtk_menu_item_new_with_label (_("Remove selected files"));
+  gtk_menu_attach (GTK_MENU (filelist_popup), select_all_menu_item, 0,
+                   1, 0, 1);
+  gtk_menu_attach (GTK_MENU (filelist_popup), delete_menu_item, 0, 1, 1, 2);
+  gtk_widget_show (select_all_menu_item);
+  gtk_widget_show (delete_menu_item);
+  gtk_signal_connect (GTK_OBJECT (filelist), "button-press-event",
+                      GTK_SIGNAL_FUNC (popup_delete), (gpointer) NULL);
+  gtk_signal_connect (GTK_OBJECT (select_all_menu_item), "activate",
+                      GTK_SIGNAL_FUNC (select_all_files), (gpointer) TRUE);
+  gtk_signal_connect (GTK_OBJECT (delete_menu_item), "activate",
+                      GTK_SIGNAL_FUNC (remove_file_from_list),
+                      (gpointer) NULL);
+
+  /*
+   * show the main window
+   */
+  gtk_widget_show (musicinsertdialog);
 }
 
 /**
@@ -329,18 +305,17 @@ show_musicinsertdialog ()
  */
 EXTRACTOR_KeywordList *
 get_EXTRACTORKeywords (const EXTRACTOR_ExtractorList
-                       * exList, const char *filename)
+                       * exList, const char *filename)
 {
-        EXTRACTOR_KeywordList *keyList;
-
-        keyList =
-                EXTRACTOR_getKeywords ((EXTRACTOR_ExtractorList *) exList,
-                                       filename);
-        keyList =
-                EXTRACTOR_removeDuplicateKeywords (keyList,
-                                                   EXTRACTOR_DUPLICATES_REMOVE_UNKNOWN);
-        keyList = EXTRACTOR_removeEmptyKeywords (keyList);
-        return keyList;
+  EXTRACTOR_KeywordList *keyList;
+
+  keyList =
+    EXTRACTOR_getKeywords ((EXTRACTOR_ExtractorList *) exList, filename);
+  keyList =
+    EXTRACTOR_removeDuplicateKeywords (keyList,
+                                       EXTRACTOR_DUPLICATES_REMOVE_UNKNOWN);
+  keyList = EXTRACTOR_removeEmptyKeywords (keyList);
+  return keyList;
 }
 
 
@@ -352,90 +327,75 @@ get_EXTRACTORKeywords (const EXTRACTOR_ExtractorList
 void
 set_File_Keywords (const gchar * filename)
 {
-        char *keywords[7];
-        GtkTreeIter pIter;
-
-        EXTRACTOR_KeywordList *KeywordList =
-                get_EXTRACTORKeywords (Extractors, filename);
-
-
-        keywords[0] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_FILENAME,
-                                                KeywordList);
-
-        keywords[1] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_FILENAME,
-                                                KeywordList);
-
-        keywords[2] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_TITLE, KeywordList);
-
-        keywords[3] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_ARTIST,
-                                                KeywordList);
-        if (keywords[3] != '\0'
-            &&
-            (g_list_find_custom
-             (ArtistList, keywords[3], (GCompareFunc) strcmp) == NULL))
-        {
-                ArtistList = g_list_append (ArtistList, STRDUP (keywords[3]));
-                gtk_combo_box_append_text (GTK_COMBO_BOX
-                                           (artistcombobox), keywords[3]);
-        }
-
-        keywords[4] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_ALBUM, KeywordList);
-        if (keywords[4] != '\0'
-            &&
-            (g_list_find_custom
-             (AlbumList, keywords[4], (GCompareFunc) strcmp)) == NULL)
-        {
-                AlbumList = g_list_append (AlbumList, STRDUP (keywords[4]));
-                gtk_combo_box_append_text (GTK_COMBO_BOX
-                                           (albumcombobox), keywords[4]);
-        }
-
-        keywords[5] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_MIMETYPE,
-                                                KeywordList);
-        if (keywords[5] != '\0')
-        {
-                if ((g_list_find_custom
-                     (TypeList, keywords[5], (GCompareFunc) strcmp)) == NULL)
-                        TypeList =
-                                g_list_append (TypeList,
-                                               STRDUP (keywords[5]));
-
-                if (strcmp (keywords[5], "application/ogg") == 0)
-                        gtk_combo_box_set_active (GTK_COMBO_BOX
-                                                  (typecombobox), FORMAT_OGG);
-                else if (strcmp (keywords[5], "audio/mpeg") == 0)
-                        gtk_combo_box_set_active
-                                (GTK_COMBO_BOX (typecombobox), FORMAT_MP3);
-                else if (strcmp (keywords[5], "application/x-wav") == 0)
-                        gtk_combo_box_set_active
-                                (GTK_COMBO_BOX (typecombobox), FORMAT_WAV);
-                else if (strcmp (keywords[5], "audio/vnd.rn-realaudio") == 0)
-                        gtk_combo_box_set_active
-                                (GTK_COMBO_BOX (typecombobox), FORMAT_REAL);
-        }
-        else
-        {
-                TypeList = g_list_append (TypeList, STRDUP ("unspecified"));
-        }
-
-        keywords[6] =
-                (char *) EXTRACTOR_extractLast (EXTRACTOR_FORMAT,
-                                                KeywordList);
-
-        gtk_list_store_append (filelist_store, &pIter);
-        gtk_list_store_set (filelist_store, &pIter, REAL_FILENAME_COL,
-                            keywords[0], FILENAME_COL, keywords[1], TITLE_COL,
-                            keywords[2], ARTIST_COL, keywords[3], ALBUM_COL,
-                            keywords[4], TYPE_COL, keywords[5], FORMAT_COL,
-                            keywords[6], KEYWORDS_COL, "", -1);
-        EXTRACTOR_freeKeywords (KeywordList);
-        return;
+  char *keywords[7];
+  GtkTreeIter pIter;
+
+  EXTRACTOR_KeywordList *KeywordList =
+    get_EXTRACTORKeywords (Extractors, filename);
+
+
+  keywords[0] =
+    (char *) EXTRACTOR_extractLast (EXTRACTOR_FILENAME, KeywordList);
+
+  keywords[1] =
+    (char *) EXTRACTOR_extractLast (EXTRACTOR_FILENAME, KeywordList);
+
+  keywords[2] = (char *) EXTRACTOR_extractLast (EXTRACTOR_TITLE, KeywordList);
+
+  keywords[3] =
+    (char *) EXTRACTOR_extractLast (EXTRACTOR_ARTIST, KeywordList);
+  if (keywords[3] != '\0'
+      &&
+      (g_list_find_custom
+       (ArtistList, keywords[3], (GCompareFunc) strcmp) == NULL))
+    {
+      ArtistList = g_list_append (ArtistList, STRDUP (keywords[3]));
+      gtk_combo_box_append_text (GTK_COMBO_BOX (artistcombobox), keywords[3]);
+    }
+
+  keywords[4] = (char *) EXTRACTOR_extractLast (EXTRACTOR_ALBUM, KeywordList);
+  if (keywords[4] != '\0'
+      &&
+      (g_list_find_custom
+       (AlbumList, keywords[4], (GCompareFunc) strcmp)) == NULL)
+    {
+      AlbumList = g_list_append (AlbumList, STRDUP (keywords[4]));
+      gtk_combo_box_append_text (GTK_COMBO_BOX (albumcombobox), keywords[4]);
+    }
+
+  keywords[5] =
+    (char *) EXTRACTOR_extractLast (EXTRACTOR_MIMETYPE, KeywordList);
+  if (keywords[5] != '\0')
+    {
+      if ((g_list_find_custom
+           (TypeList, keywords[5], (GCompareFunc) strcmp)) == NULL)
+        TypeList = g_list_append (TypeList, STRDUP (keywords[5]));
+
+      if (strcmp (keywords[5], "application/ogg") == 0)
+        gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), FORMAT_OGG);
+      else if (strcmp (keywords[5], "audio/mpeg") == 0)
+        gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), FORMAT_MP3);
+      else if (strcmp (keywords[5], "application/x-wav") == 0)
+        gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), FORMAT_WAV);
+      else if (strcmp (keywords[5], "audio/vnd.rn-realaudio") == 0)
+        gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), FORMAT_REAL);
+    }
+  else
+    {
+      TypeList = g_list_append (TypeList, STRDUP ("unspecified"));
+    }
+
+  keywords[6] =
+    (char *) EXTRACTOR_extractLast (EXTRACTOR_FORMAT, KeywordList);
+
+  gtk_list_store_append (filelist_store, &pIter);
+  gtk_list_store_set (filelist_store, &pIter, REAL_FILENAME_COL,
+                      keywords[0], FILENAME_COL, keywords[1], TITLE_COL,
+                      keywords[2], ARTIST_COL, keywords[3], ALBUM_COL,
+                      keywords[4], TYPE_COL, keywords[5], FORMAT_COL,
+                      keywords[6], KEYWORDS_COL, "", -1);
+  EXTRACTOR_freeKeywords (KeywordList);
+  return;
 }
 
 /**
@@ -445,28 +405,28 @@ void
 activateComboBoxes ()
 {
 
-        if (gtk_combo_box_get_active (GTK_COMBO_BOX (albumcombobox)) < 0
-            &&
-            gtk_tree_model_iter_n_children (gtk_combo_box_get_model
-                                            (GTK_COMBO_BOX (albumcombobox)),
-                                            NULL) != 0)
-                gtk_combo_box_set_active (GTK_COMBO_BOX (albumcombobox), 0);
-
-        if (gtk_combo_box_get_active (GTK_COMBO_BOX (artistcombobox)) < 0
-            &&
-            gtk_tree_model_iter_n_children (gtk_combo_box_get_model
-                                            (GTK_COMBO_BOX (artistcombobox)),
-                                            NULL) != 0)
-                gtk_combo_box_set_active (GTK_COMBO_BOX (artistcombobox), 0);
-
-        if (gtk_combo_box_get_active (GTK_COMBO_BOX (typecombobox)) < 0
-            &&
-            gtk_tree_model_iter_n_children (gtk_combo_box_get_model
-                                            (GTK_COMBO_BOX (typecombobox)),
-                                            NULL) != 0)
-                gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), 0);
-
-        return;
+  if (gtk_combo_box_get_active (GTK_COMBO_BOX (albumcombobox)) < 0
+      &&
+      gtk_tree_model_iter_n_children (gtk_combo_box_get_model
+                                      (GTK_COMBO_BOX (albumcombobox)),
+                                      NULL) != 0)
+    gtk_combo_box_set_active (GTK_COMBO_BOX (albumcombobox), 0);
+
+  if (gtk_combo_box_get_active (GTK_COMBO_BOX (artistcombobox)) < 0
+      &&
+      gtk_tree_model_iter_n_children (gtk_combo_box_get_model
+                                      (GTK_COMBO_BOX (artistcombobox)),
+                                      NULL) != 0)
+    gtk_combo_box_set_active (GTK_COMBO_BOX (artistcombobox), 0);
+
+  if (gtk_combo_box_get_active (GTK_COMBO_BOX (typecombobox)) < 0
+      &&
+      gtk_tree_model_iter_n_children (gtk_combo_box_get_model
+                                      (GTK_COMBO_BOX (typecombobox)),
+                                      NULL) != 0)
+    gtk_combo_box_set_active (GTK_COMBO_BOX (typecombobox), 0);
+
+  return;
 }
 
 /**
@@ -475,205 +435,198 @@ activateComboBoxes ()
 void
 updateColumns ()
 {
-        if (g_list_length (ArtistList) > 1)
-                gtk_tree_view_column_set_visible (type_list_col, TRUE);
-        else
-                gtk_tree_view_column_set_visible (type_list_col, FALSE);
-
-        if (g_list_length (AlbumList) > 1)
-                gtk_tree_view_column_set_visible (type_list_col, TRUE);
-        else
-                gtk_tree_view_column_set_visible (type_list_col, FALSE);
-
-        if (g_list_length (TypeList) > 1)
-                gtk_tree_view_column_set_visible (type_list_col, TRUE);
-        else
-                gtk_tree_view_column_set_visible (type_list_col, FALSE);
-
-        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
-                                              (filelist_store), FILENAME_COL,
-                                              GTK_SORT_ASCENDING);
+  if (g_list_length (ArtistList) > 1)
+    gtk_tree_view_column_set_visible (type_list_col, TRUE);
+  else
+    gtk_tree_view_column_set_visible (type_list_col, FALSE);
+
+  if (g_list_length (AlbumList) > 1)
+    gtk_tree_view_column_set_visible (type_list_col, TRUE);
+  else
+    gtk_tree_view_column_set_visible (type_list_col, FALSE);
+
+  if (g_list_length (TypeList) > 1)
+    gtk_tree_view_column_set_visible (type_list_col, TRUE);
+  else
+    gtk_tree_view_column_set_visible (type_list_col, FALSE);
+
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE
+                                        (filelist_store), FILENAME_COL,
+                                        GTK_SORT_ASCENDING);
 }
 
 gboolean
 insertfiles ()
 {
-        struct ECRS_MetaData *dirmetadata;
-        struct ECRS_MetaData *tempmetadata;
-        GArray *filesmetadatas, *files;
-        gchar *temptext;
-        gchar **dirkeywords;
-        gchararray *tempkeywords;
-        gchar **tempmetas, *dirmetas[8];
-        gchar *separator = ";";
-        int i, n;
-        guint useforallflags;
-        GtkWidget *keywordsentry;
-        GtkTreeIter fileiter;
-        GtkToggleButton *artisttogglebutton;
-        GtkToggleButton *albumtogglebutton;
-        GtkToggleButton *keywordstogglebutton;
-        GtkToggleButton *commentstogglebutton;
-
-        /* Test if files are present */
-        if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filelist_store),
-                                                        &fileiter))
-        {
-                gchar *error_message =
-                        STRDUP (_
-                                ("No files to insert ! Please add files to the list before validating."));
-                GtkWidget *message_dialog =
-                        gtk_message_dialog_new (GTK_WINDOW
-                                                (musicinsertdialog),
-                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                GTK_MESSAGE_ERROR,
-                                                GTK_BUTTONS_CLOSE,
-                                                "%s", error_message);
-                gtk_dialog_run (GTK_DIALOG (message_dialog));
-                gtk_widget_destroy (message_dialog);
-                FREE (error_message);
-                return FALSE;
-        }
-
-
-    /* Manage album metadatas */
-
-        dirmetadata = ECRS_createMetaData ();
-
-        dirmetas[0] =
-                gtk_combo_box_get_active_text (GTK_COMBO_BOX
-                                               (artistcombobox));
-        if (dirmetas[0])
-                ECRS_addToMetaData (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
-
-        dirmetas[1] =
-                gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
-        if (dirmetas[1])
-                ECRS_addToMetaData (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
-
-        keywordsentry =
-                glade_xml_get_widget (musicinsertXML, "keywordsentry");
-        temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
-        dirkeywords = NULL;
-        if (temptext)
-                dirkeywords = g_strsplit (temptext, separator, 255);
-        n = 0;
-        while (dirkeywords[n])
-        {
-                ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
-            n++;
-        }
-        /* Add a standard keyword to allow finding all available music albums
-        * on AFS in one search */
-        ECRS_addToMetaData (dirmetadata,
-                                                EXTRACTOR_KEYWORDS,
-                                                "music album");
-
-
-        /* Manage files metadatas */
-        artisttogglebutton = GTK_TOGGLE_BUTTON(glade_xml_get_widget (musicinsertXML, "artisttogglebutton"));
-        albumtogglebutton = GTK_TOGGLE_BUTTON(glade_xml_get_widget (musicinsertXML, "albumtogglebutton"));
-        keywordstogglebutton = GTK_TOGGLE_BUTTON(glade_xml_get_widget (musicinsertXML, "keywordstogglebutton"));
-        commentstogglebutton = GTK_TOGGLE_BUTTON(glade_xml_get_widget (musicinsertXML, "commentstogglebutton"));
-
-    useforallflags = 0;
-    useforallflags = gtk_toggle_button_get_active (artisttogglebutton) << 0;
-    useforallflags = gtk_toggle_button_get_active (albumtogglebutton) << 1;
-    useforallflags = gtk_toggle_button_get_active (keywordstogglebutton) << 2;
-    useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
-
-    filesmetadatas = g_array_sized_new (FALSE, FALSE, sizeof (struct ECRS_MetaData *), 20);
-        files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
-        i = 0;
-        do
-        {
-                tempmetadata = ECRS_createMetaData();
-            tempmetas = malloc (sizeof(gchar *) * 8);
-                g_array_append_val (filesmetadatas,  tempmetadata);
-                gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
-                                &fileiter,
-                                            REAL_FILENAME_COL, &tempmetas[0],
-                                            FILENAME_COL, &tempmetas[1],
-                                TITLE_COL, &tempmetas[2],
-                                ARTIST_COL, &tempmetas[3],
-                                            ALBUM_COL, &tempmetas[4],
-                                TYPE_COL, &tempmetas[5],
-                                FORMAT_COL, &tempmetas[6],
-                                                        KEYWORDS_COL, &tempmetas[7],
-                                                    -1);
-                g_array_append_val (files, tempmetas[0]);
-        
-                
-                if (tempmetas[1])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME,
-                                            tempmetas[1]);
-                if ((useforallflags & 0x1) && dirmetas[0])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME,
-                                            dirmetas[0]);       
-                else if (!(useforallflags & 0x1) && tempmetas[2])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_TITLE,
-                                            tempmetas[2]);
-                if ((useforallflags & 0x2) && dirmetas[1])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ARTIST,
-                                            dirmetas[1]);
-                else if (!(useforallflags & 0x2)&& tempmetas[3])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME,
-                                            tempmetas[3]);      
-                if (tempmetas[4])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ALBUM,
-                                            tempmetas[4]);
-                if (tempmetas[5])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_MIMETYPE,
-                                            tempmetas[5]);
-                if (tempmetas[6])
-                        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FORMAT,
-                                            tempmetas[6]);
-                
-                if (!(useforallflags & 0x1))
-                {
-                   n = 0;
-                   while (dirkeywords[n])
-           {
-                      ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
-                  n++;
-                   }
-            }
-                else if (tempmetas[7])
-                {
-                        tempkeywords = g_strsplit (temptext, separator, 255);
-                        n = 0;
-                        while (tempkeywords[n])
-                        {
-                                ECRS_addToMetaData (tempmetadata,
-                                                    EXTRACTOR_KEYWORDS,
-                                                    tempkeywords[n]);
-                                n++;
-                        }
-                        g_strfreev (tempkeywords);
-                /* Add a standard keyword to allow finding all available music files
-                 * on AFS in one search */
-                    ECRS_addToMetaData (tempmetadata,
-                                                    EXTRACTOR_KEYWORDS,
-                                                    "music");
-                }
-
-                FREE (tempmetas);
-                i++;
-        }
-        while (gtk_tree_model_iter_next (GTK_TREE_MODEL(filelist_store), &fileiter));
-
-        g_strfreev (dirkeywords);
-
-        /* TODO : take care of the 'Insert as an album'/'Insert files separately' options
-         *  and create or not a gnunet directory containing the files
-         *
-     * TODO : Create a file and album description from metadatas - an idea :
-         * Artist: Song (Album) - Type and Format # for files
-     * Artist: Album - Type and number of the files # or album
-         *
-         * TODO : really call FSUI_upload() to insert these files */
-
-        return TRUE;
+  struct ECRS_MetaData *dirmetadata;
+  struct ECRS_MetaData *tempmetadata;
+  GArray *filesmetadatas, *files;
+  gchar *temptext;
+  gchar **dirkeywords;
+  gchararray *tempkeywords;
+  gchar **tempmetas, *dirmetas[8];
+  gchar *separator = ";";
+  int i, n;
+  guint useforallflags;
+  GtkWidget *keywordsentry;
+  GtkTreeIter fileiter;
+  GtkToggleButton *artisttogglebutton;
+  GtkToggleButton *albumtogglebutton;
+  GtkToggleButton *keywordstogglebutton;
+  GtkToggleButton *commentstogglebutton;
+
+  /* Test if files are present */
+  if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (filelist_store),
+                                      &fileiter))
+    {
+      gchar *error_message =
+        STRDUP (_
+                ("No files to insert ! Please add files to the list before validating."));
+      GtkWidget *message_dialog =
+        gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_ERROR,
+                                GTK_BUTTONS_CLOSE,
+                                "%s", error_message);
+      gtk_dialog_run (GTK_DIALOG (message_dialog));
+      gtk_widget_destroy (message_dialog);
+      FREE (error_message);
+      return FALSE;
+    }
+
+
+  /* Manage album metadatas */
+
+  dirmetadata = ECRS_createMetaData ();
+
+  dirmetas[0] =
+    gtk_combo_box_get_active_text (GTK_COMBO_BOX (artistcombobox));
+  if (dirmetas[0])
+    ECRS_addToMetaData (dirmetadata, EXTRACTOR_ARTIST, dirmetas[0]);
+
+  dirmetas[1] = gtk_combo_box_get_active_text (GTK_COMBO_BOX (albumcombobox));
+  if (dirmetas[1])
+    ECRS_addToMetaData (dirmetadata, EXTRACTOR_ALBUM, dirmetas[1]);
+
+  keywordsentry = glade_xml_get_widget (musicinsertXML, "keywordsentry");
+  temptext = (gchar *) gtk_entry_get_text (GTK_ENTRY (keywordsentry));
+  dirkeywords = NULL;
+  if (temptext)
+    dirkeywords = g_strsplit (temptext, separator, 255);
+  n = 0;
+  while (dirkeywords[n])
+    {
+      ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
+      n++;
+    }
+  /* Add a standard keyword to allow finding all available music albums
+   * on AFS in one search */
+  ECRS_addToMetaData (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
+
+
+  /* Manage files metadatas */
+  artisttogglebutton =
+    GTK_TOGGLE_BUTTON (glade_xml_get_widget
+                       (musicinsertXML, "artisttogglebutton"));
+  albumtogglebutton =
+    GTK_TOGGLE_BUTTON (glade_xml_get_widget
+                       (musicinsertXML, "albumtogglebutton"));
+  keywordstogglebutton =
+    GTK_TOGGLE_BUTTON (glade_xml_get_widget
+                       (musicinsertXML, "keywordstogglebutton"));
+  commentstogglebutton =
+    GTK_TOGGLE_BUTTON (glade_xml_get_widget
+                       (musicinsertXML, "commentstogglebutton"));
+
+  useforallflags = 0;
+  useforallflags = gtk_toggle_button_get_active (artisttogglebutton) << 0;
+  useforallflags = gtk_toggle_button_get_active (albumtogglebutton) << 1;
+  useforallflags = gtk_toggle_button_get_active (keywordstogglebutton) << 2;
+  useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
+
+  filesmetadatas =
+    g_array_sized_new (FALSE, FALSE, sizeof (struct ECRS_MetaData *), 20);
+  files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
+  i = 0;
+  do
+    {
+      tempmetadata = ECRS_createMetaData ();
+      tempmetas = malloc (sizeof (gchar *) * 8);
+      g_array_append_val (filesmetadatas, tempmetadata);
+      gtk_tree_model_get (GTK_TREE_MODEL (filelist_store),
+                          &fileiter,
+                          REAL_FILENAME_COL, &tempmetas[0],
+                          FILENAME_COL, &tempmetas[1],
+                          TITLE_COL, &tempmetas[2],
+                          ARTIST_COL, &tempmetas[3],
+                          ALBUM_COL, &tempmetas[4],
+                          TYPE_COL, &tempmetas[5],
+                          FORMAT_COL, &tempmetas[6],
+                          KEYWORDS_COL, &tempmetas[7], -1);
+      g_array_append_val (files, tempmetas[0]);
+
+
+      if (tempmetas[1])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[1]);
+      if ((useforallflags & 0x1) && dirmetas[0])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, dirmetas[0]);
+      else if (!(useforallflags & 0x1) && tempmetas[2])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
+      if ((useforallflags & 0x2) && dirmetas[1])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
+      else if (!(useforallflags & 0x2) && tempmetas[3])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FILENAME, tempmetas[3]);
+      if (tempmetas[4])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
+      if (tempmetas[5])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_MIMETYPE, tempmetas[5]);
+      if (tempmetas[6])
+        ECRS_addToMetaData (tempmetadata, EXTRACTOR_FORMAT, tempmetas[6]);
+
+      if (!(useforallflags & 0x1))
+        {
+          n = 0;
+          while (dirkeywords[n])
+            {
+              ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS,
+                                  dirkeywords[n]);
+              n++;
+            }
+        }
+      else if (tempmetas[7])
+        {
+          tempkeywords = g_strsplit (temptext, separator, 255);
+          n = 0;
+          while (tempkeywords[n])
+            {
+              ECRS_addToMetaData (tempmetadata,
+                                  EXTRACTOR_KEYWORDS, tempkeywords[n]);
+              n++;
+            }
+          g_strfreev (tempkeywords);
+          /* Add a standard keyword to allow finding all available music files
+           * on AFS in one search */
+          ECRS_addToMetaData (tempmetadata, EXTRACTOR_KEYWORDS, "music");
+        }
+
+      FREE (tempmetas);
+      i++;
+    }
+  while (gtk_tree_model_iter_next
+         (GTK_TREE_MODEL (filelist_store), &fileiter));
+
+  g_strfreev (dirkeywords);
+
+  /* TODO : take care of the 'Insert as an album'/'Insert files separately' options
+   *  and create or not a gnunet directory containing the files
+   *
+   * TODO : Create a file and album description from metadatas - an idea :
+   * Artist: Song (Album) - Type and Format # for files
+   * Artist: Album - Type and number of the files # or album
+   *
+   * TODO : really call FSUI_upload() to insert these files */
+
+  return TRUE;
 }
 
 /* Callback functions */
@@ -684,9 +637,9 @@ insertfiles ()
 void
 on_musicinsertdialog_destroy (GtkObject * object, gpointer user_data)
 {
-        EXTRACTOR_removeAll (Extractors);
-        UNREF (musicinsertXML);
-        musicinsertXML = NULL;
+  EXTRACTOR_removeAll (Extractors);
+  UNREF (musicinsertXML);
+  musicinsertXML = NULL;
 }
 
 /**
@@ -695,8 +648,8 @@ on_musicinsertdialog_destroy (GtkObject * object, gpointer user_data)
 void
 on_cancelbutton_clicked (GtkButton * button, gpointer user_data)
 {
-        gtk_widget_destroy (musicinsertdialog);
-        return;
+  gtk_widget_destroy (musicinsertdialog);
+  return;
 }
 
 /**
@@ -705,9 +658,9 @@ on_cancelbutton_clicked (GtkButton * button, gpointer user_data)
 void
 on_okbutton_clicked (GtkButton * button, gpointer user_data)
 {
-        if (insertfiles ())
-                gtk_widget_destroy (musicinsertdialog);
-        return ;
+  if (insertfiles ())
+    gtk_widget_destroy (musicinsertdialog);
+  return;
 }
 
 /**
@@ -716,112 +669,98 @@ on_okbutton_clicked (GtkButton * button, gpointer user_data)
 void
 on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
 {
-        gchar *path;
-        GtkWidget *musicinsertdialog =
-                glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
-        /* choose the directory to list */
-        GtkWidget *filechooser =
-                gtk_file_chooser_dialog_new (_
-                                             ("Choose the directory to insert..."),
-GTK_WINDOW (musicinsertdialog),
-GTK_FILE_CHOOSER_ACTION_OPEN,
-GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-NULL);
-        gtk_file_chooser_set_action (GTK_FILE_CHOOSER (filechooser),
-                                     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-        gtk_window_set_modal (GTK_WINDOW (filechooser), TRUE);
-        switch (gtk_dialog_run (GTK_DIALOG (filechooser)))
-        {
-        case GTK_RESPONSE_ACCEPT:
-                /* get the path */
-                path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER
-                                                      (filechooser));
-                gtk_widget_destroy (filechooser);
-                break;
-        default:
-                gtk_widget_destroy (filechooser);
-                return;
-        }
-
-        /* list directory and fill the fields */
-        GDir *directory;
-        GString *long_filename;
-        GError *dir_opening_error;
-        GSList *file_error_list = NULL;
-        gchar *filename;
-        if ((directory = g_dir_open (path, 0, &dir_opening_error)))
-        {
-                while ((filename = (gchar *) g_dir_read_name (directory)))
-                {
-                        long_filename = g_string_new (path);
-                        g_string_append_c (long_filename, DIR_SEPARATOR);
-                        g_string_append (long_filename, filename);
-                        if (!(ACCESS (long_filename->str, F_OK | R_OK)))
-                        {
-                                if (!
-                                    (g_file_test
-                                     (long_filename->str,
-                                      G_FILE_TEST_IS_DIR)))
-                                        set_File_Keywords (long_filename->
-                                                           str);
-                        }
-                        else
-                        {
-                                file_error_list =
-                                        g_slist_append (file_error_list,
-                                                        filename);
-                                g_string_free (long_filename, TRUE);
-                        }
-                }
-
-                g_free (path);
-                activateComboBoxes ();
-                updateColumns ();
-                if (g_slist_length (file_error_list) > 0)
-                {
-                        GString *file_error_message =
-                                g_string_new (_
-                                              ("The following files won't be added for I could not read them :"));
-                        while ((file_error_list =
-                                g_slist_next (file_error_list)))
-                        {
-                                g_string_append_c (file_error_message, '\n');
-                                g_string_append (file_error_message,
-                                                 (gchar *) file_error_list->
-                                                 data);
-                        }
-                        GtkWidget *file_error_dialog =
-                                gtk_message_dialog_new (GTK_WINDOW
-                                                        (musicinsertdialog),
-                                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                        GTK_MESSAGE_ERROR,
-                                                        GTK_BUTTONS_CLOSE,
-                                                        file_error_message->
-                                                        str);
-                        gtk_dialog_run (GTK_DIALOG (file_error_dialog));
-                        gtk_widget_destroy (file_error_dialog);
-                        g_string_free (file_error_message, TRUE);
-                }
-                g_dir_close (directory);
-        }
-        else
-        {
-                gchar *error_message =
-                        STRDUP (_("Could not open the directory :\n"));
-                GtkWidget *message_dialog =
-                        gtk_message_dialog_new (GTK_WINDOW
-                                                (musicinsertdialog),
-                                                GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                GTK_MESSAGE_ERROR,
-                                                GTK_BUTTONS_CLOSE,
-                                                "%s%s", error_message,
-                                                dir_opening_error->message);
-                gtk_dialog_run (GTK_DIALOG (message_dialog));
-                gtk_widget_destroy (message_dialog);
-                g_free (error_message);
-                g_error_free (dir_opening_error);
-        }
+  gchar *path;
+  GtkWidget *musicinsertdialog =
+    glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
+  /* choose the directory to list */
+  GtkWidget *filechooser =
+    gtk_file_chooser_dialog_new (_("Choose the directory to insert..."),
+                                 GTK_WINDOW (musicinsertdialog),
+                                 GTK_FILE_CHOOSER_ACTION_OPEN,
+                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                 NULL);
+  gtk_file_chooser_set_action (GTK_FILE_CHOOSER (filechooser),
+                               GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+  gtk_window_set_modal (GTK_WINDOW (filechooser), TRUE);
+  switch (gtk_dialog_run (GTK_DIALOG (filechooser)))
+    {
+    case GTK_RESPONSE_ACCEPT:
+      /* get the path */
+      path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooser));
+      gtk_widget_destroy (filechooser);
+      break;
+    default:
+      gtk_widget_destroy (filechooser);
+      return;
+    }
+
+  /* list directory and fill the fields */
+  GDir *directory;
+  GString *long_filename;
+  GError *dir_opening_error;
+  GSList *file_error_list = NULL;
+  gchar *filename;
+  if ((directory = g_dir_open (path, 0, &dir_opening_error)))
+    {
+      while ((filename = (gchar *) g_dir_read_name (directory)))
+        {
+          long_filename = g_string_new (path);
+          g_string_append_c (long_filename, DIR_SEPARATOR);
+          g_string_append (long_filename, filename);
+          if (!(ACCESS (long_filename->str, F_OK | R_OK)))
+            {
+              if (!(g_file_test (long_filename->str, G_FILE_TEST_IS_DIR)))
+                set_File_Keywords (long_filename->str);
+            }
+          else
+            {
+              file_error_list = g_slist_append (file_error_list, filename);
+              g_string_free (long_filename, TRUE);
+            }
+        }
+
+      g_free (path);
+      activateComboBoxes ();
+      updateColumns ();
+      if (g_slist_length (file_error_list) > 0)
+        {
+          GString *file_error_message =
+            g_string_new (_
+                          ("The following files won't be added for I could not read them :"));
+          while ((file_error_list = g_slist_next (file_error_list)))
+            {
+              g_string_append_c (file_error_message, '\n');
+              g_string_append (file_error_message,
+                               (gchar *) file_error_list->data);
+            }
+          GtkWidget *file_error_dialog =
+            gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_MESSAGE_ERROR,
+                                    GTK_BUTTONS_CLOSE,
+                                    file_error_message->str);
+          gtk_dialog_run (GTK_DIALOG (file_error_dialog));
+          gtk_widget_destroy (file_error_dialog);
+          g_string_free (file_error_message, TRUE);
+        }
+      g_dir_close (directory);
+    }
+  else
+    {
+      gchar *error_message = STRDUP (_("Could not open the directory :\n"));
+      GtkWidget *message_dialog =
+        gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_ERROR,
+                                GTK_BUTTONS_CLOSE,
+                                "%s%s", error_message,
+                                dir_opening_error->message);
+      gtk_dialog_run (GTK_DIALOG (message_dialog));
+      gtk_widget_destroy (message_dialog);
+      g_free (error_message);
+      g_error_free (dir_opening_error);
+    }
 }
 
 /**
@@ -830,82 +769,75 @@ NULL);
 void
 on_fileaddbutton_clicked (GtkButton * button, gpointer user_data)
 {
-        GSList *pathlist;
-        GtkWidget *musicinsertdialog =
-                glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
-        /* choose the file to add */
-        GtkWidget *filechooser =
-                gtk_file_chooser_dialog_new (_("Choose files to insert..."),
-                                             GTK_WINDOW (musicinsertdialog),
-                                             GTK_FILE_CHOOSER_ACTION_OPEN,
-                                             GTK_STOCK_CANCEL,
-                                             GTK_RESPONSE_CANCEL,
-                                             GTK_STOCK_OPEN,
-                                             GTK_RESPONSE_ACCEPT, NULL);
-        gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (filechooser),
-                                              TRUE);
-        gtk_window_set_modal (GTK_WINDOW (filechooser), TRUE);
-
-        if (gtk_dialog_run (GTK_DIALOG (filechooser)) == GTK_RESPONSE_ACCEPT)
-        {
-                GSList *file_error_list = NULL;
-                /* get the path */
-                pathlist =
-                        gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER
-                                                        (filechooser));
-                gtk_widget_destroy (filechooser);
-                do
-                {
-                        if (!(ACCESS (pathlist->data, F_OK | R_OK)))
-                        {
-                                set_File_Keywords (pathlist->data);
-                        }
-                        else
-                        {
-                                file_error_list =
-                                        g_slist_append (file_error_list,
-                                                        pathlist->data);
-                        }
-                }
-                while ((pathlist = g_slist_next (pathlist)));
-                g_slist_free (pathlist);
-
-                activateComboBoxes ();
-                updateColumns ();
-
-                if (g_slist_length (file_error_list) > 0)
-                {
-                        GString *file_error_message =
-                                g_string_new (_
-                                              ("The following files won't be added for I could not read them :"));
-                        while ((file_error_list =
-                                g_slist_next (file_error_list)))
-                        {
-                                g_string_append_c (file_error_message, '\n');
-                                g_string_append (file_error_message,
-                                                 (gchar *) file_error_list->
-                                                 data);
-                        }
-
-                        GtkWidget *file_error_dialog =
-                                gtk_message_dialog_new (GTK_WINDOW
-                                                        (musicinsertdialog),
-                                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                        GTK_MESSAGE_ERROR,
-                                                        GTK_BUTTONS_CLOSE,
-                                                        file_error_message->
-                                                        str);
-                        gtk_dialog_run (GTK_DIALOG (file_error_dialog));
-                        g_string_free (file_error_message, TRUE);
-                        gtk_widget_destroy (file_error_dialog);
-                }
-                return;
-        }
-        else
-        {
-                gtk_widget_destroy (filechooser);
-                return;
-        }
+  GSList *pathlist;
+  GtkWidget *musicinsertdialog =
+    glade_xml_get_widget (musicinsertXML, "musicinsertdialog");
+  /* choose the file to add */
+  GtkWidget *filechooser =
+    gtk_file_chooser_dialog_new (_("Choose files to insert..."),
+                                 GTK_WINDOW (musicinsertdialog),
+                                 GTK_FILE_CHOOSER_ACTION_OPEN,
+                                 GTK_STOCK_CANCEL,
+                                 GTK_RESPONSE_CANCEL,
+                                 GTK_STOCK_OPEN,
+                                 GTK_RESPONSE_ACCEPT, NULL);
+  gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (filechooser), TRUE);
+  gtk_window_set_modal (GTK_WINDOW (filechooser), TRUE);
+
+  if (gtk_dialog_run (GTK_DIALOG (filechooser)) == GTK_RESPONSE_ACCEPT)
+    {
+      GSList *file_error_list = NULL;
+      /* get the path */
+      pathlist =
+        gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (filechooser));
+      gtk_widget_destroy (filechooser);
+      do
+        {
+          if (!(ACCESS (pathlist->data, F_OK | R_OK)))
+            {
+              set_File_Keywords (pathlist->data);
+            }
+          else
+            {
+              file_error_list =
+                g_slist_append (file_error_list, pathlist->data);
+            }
+        }
+      while ((pathlist = g_slist_next (pathlist)));
+      g_slist_free (pathlist);
+
+      activateComboBoxes ();
+      updateColumns ();
+
+      if (g_slist_length (file_error_list) > 0)
+        {
+          GString *file_error_message =
+            g_string_new (_
+                          ("The following files won't be added for I could not read them :"));
+          while ((file_error_list = g_slist_next (file_error_list)))
+            {
+              g_string_append_c (file_error_message, '\n');
+              g_string_append (file_error_message,
+                               (gchar *) file_error_list->data);
+            }
+
+          GtkWidget *file_error_dialog =
+            gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
+                                    GTK_DIALOG_DESTROY_WITH_PARENT,
+                                    GTK_MESSAGE_ERROR,
+                                    GTK_BUTTONS_CLOSE,
+                                    file_error_message->str);
+          gtk_dialog_run (GTK_DIALOG (file_error_dialog));
+          g_string_free (file_error_message, TRUE);
+          gtk_widget_destroy (file_error_dialog);
+        }
+      return;
+    }
+  else
+    {
+      gtk_widget_destroy (filechooser);
+      return;
+    }
 }
 
 /**
@@ -914,10 +846,9 @@ on_fileaddbutton_clicked (GtkButton * button, gpointer user_data)
 void
 on_radioinsert_toggled (GtkRadioButton * radiobutton, gpointer user_data)
 {
-        gtk_widget_set_sensitive (GTK_WIDGET
-                                  (glade_xml_get_widget
-                                   (musicinsertXML, "copyfilesbutton")),
-                                  FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET
+                            (glade_xml_get_widget
+                             (musicinsertXML, "copyfilesbutton")), FALSE);
 }
 
 /**
@@ -926,75 +857,73 @@ on_radioinsert_toggled (GtkRadioButton * radiobutton, gpointer user_data)
 void
 on_radioindex_toggled (GtkRadioButton * radiobutton, gpointer user_data)
 {
-        gtk_widget_set_sensitive
-                (GTK_WIDGET
-                 (glade_xml_get_widget (musicinsertXML, "copyfilesbutton")),
-                 TRUE);
+  gtk_widget_set_sensitive
+    (GTK_WIDGET
+     (glade_xml_get_widget (musicinsertXML, "copyfilesbutton")), TRUE);
 }
 
 /**
  * @brief Hide or show the album column when needed
  */
 void on_albumtogglebutton_toggled
-        (GtkToggleButton * togglebutton, gpointer user_data)
+  (GtkToggleButton * togglebutton, gpointer user_data)
 {
-        if (gtk_toggle_button_get_active (togglebutton))
-                gtk_tree_view_column_set_visible (album_list_col, FALSE);
-        else
-                gtk_tree_view_column_set_visible (album_list_col, TRUE);
+  if (gtk_toggle_button_get_active (togglebutton))
+    gtk_tree_view_column_set_visible (album_list_col, FALSE);
+  else
+    gtk_tree_view_column_set_visible (album_list_col, TRUE);
 }
 
 /**
  * @brief Hide or show the artist column when needed
  */
 void on_artisttogglebutton_toggled
-        (GtkToggleButton * togglebutton, gpointer user_data)
+  (GtkToggleButton * togglebutton, gpointer user_data)
 {
-        if (gtk_toggle_button_get_active (togglebutton))
-                gtk_tree_view_column_set_visible (artist_list_col, FALSE);
-        else
-                gtk_tree_view_column_set_visible (artist_list_col, TRUE);
+  if (gtk_toggle_button_get_active (togglebutton))
+    gtk_tree_view_column_set_visible (artist_list_col, FALSE);
+  else
+    gtk_tree_view_column_set_visible (artist_list_col, TRUE);
 }
 
 /**
  * @brief Hide or show the keywords column when needed
  */
 void on_keywordstogglebutton_toggled
-        (GtkToggleButton * togglebutton, gpointer user_data)
+  (GtkToggleButton * togglebutton, gpointer user_data)
 {
-        if (gtk_toggle_button_get_active (togglebutton))
-                gtk_tree_view_column_set_visible (keywords_list_col, FALSE);
-        else
-                gtk_tree_view_column_set_visible (keywords_list_col, TRUE);
+  if (gtk_toggle_button_get_active (togglebutton))
+    gtk_tree_view_column_set_visible (keywords_list_col, FALSE);
+  else
+    gtk_tree_view_column_set_visible (keywords_list_col, TRUE);
 }
 
 /**
  * @brief Make to user able to modify the per-file data
  */
 void on_renderer_edited
-        (GtkCellRendererText *
-         cellrenderertext,
-         gchar * path_string, gchar * new_text, gpointer user_data)
+  (GtkCellRendererText *
+   cellrenderertext,
+   gchar * path_string, gchar * new_text, gpointer user_data)
 {
-        GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
-        GtkTreeIter iter;
-        gtk_tree_model_get_iter (GTK_TREE_MODEL (filelist_store), &iter,
-                                 path);
-        gtk_list_store_set (filelist_store, &iter,
-                            (gint) * ((gint *) user_data), new_text, -1);
-        gtk_tree_path_free (path);
+  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
+  GtkTreeIter iter;
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (filelist_store), &iter, path);
+  gtk_list_store_set (filelist_store, &iter,
+                      (gint) * ((gint *) user_data), new_text, -1);
+  gtk_tree_path_free (path);
 }
 
 gboolean
 popup_delete (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 {
-        if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3))
-        {
-                gtk_menu_popup (GTK_MENU (filelist_popup), NULL, NULL, NULL,
-                                NULL, event->button, event->time);
-                return TRUE;
-        }
-        return FALSE;
+  if ((event->type == GDK_BUTTON_PRESS) && (event->button == 3))
+    {
+      gtk_menu_popup (GTK_MENU (filelist_popup), NULL, NULL, NULL,
+                      NULL, event->button, event->time);
+      return TRUE;
+    }
+  return FALSE;
 }
 
 /**
@@ -1003,43 +932,40 @@ popup_delete (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
 void
 remove_file_from_list (gpointer user_data)
 {
-        GtkTreeIter iter;
-        GtkWidget *filelist =
-                glade_xml_get_widget (musicinsertXML, "filelist");
-        GtkTreeSelection *selection =
-                gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
-        GList *selected_paths =
-                gtk_tree_selection_get_selected_rows (selection,
-                                                      (GtkTreeModel **)
-                              &filelist_store);
-        GList *selected_refs = NULL;
-        GtkTreePath *path;
+  GtkTreeIter iter;
+  GtkWidget *filelist = glade_xml_get_widget (musicinsertXML, "filelist");
+  GtkTreeSelection *selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
+  GList *selected_paths = gtk_tree_selection_get_selected_rows (selection,
+                                                                (GtkTreeModel
+                                                                 **) &
+                                                                filelist_store);
+  GList *selected_refs = NULL;
+  GtkTreePath *path;
 /* Get static references from paths */
-        while (selected_paths)
-        {
-                selected_refs = g_list_append (selected_refs,
-                                               gtk_tree_row_reference_new
-                                               (GTK_TREE_MODEL
-                                                (filelist_store),
-                                                selected_paths->data));
-                selected_paths = g_list_next (selected_paths);
-        }
-        g_list_foreach (selected_paths, (GFunc) gtk_tree_path_free, NULL);
-        g_list_free (selected_paths);
+  while (selected_paths)
+    {
+      selected_refs = g_list_append (selected_refs,
+                                     gtk_tree_row_reference_new
+                                     (GTK_TREE_MODEL
+                                      (filelist_store),
+                                      selected_paths->data));
+      selected_paths = g_list_next (selected_paths);
+    }
+  g_list_foreach (selected_paths, (GFunc) gtk_tree_path_free, NULL);
+  g_list_free (selected_paths);
 
 /* Remove items from references */
-        while (selected_refs)
-        {
-                path = gtk_tree_row_reference_get_path (selected_refs->data);
-                gtk_tree_model_get_iter (GTK_TREE_MODEL (filelist_store),
-                                         &iter, path);
-                gtk_list_store_remove (filelist_store, &iter);
-                gtk_tree_path_free (path);
-                selected_refs = g_list_next (selected_refs);
-        }
-        g_list_foreach (selected_paths, (GFunc) gtk_tree_row_reference_free,
-                        NULL);
-        g_list_free (selected_paths);
+  while (selected_refs)
+    {
+      path = gtk_tree_row_reference_get_path (selected_refs->data);
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (filelist_store), &iter, path);
+      gtk_list_store_remove (filelist_store, &iter);
+      gtk_tree_path_free (path);
+      selected_refs = g_list_next (selected_refs);
+    }
+  g_list_foreach (selected_paths, (GFunc) gtk_tree_row_reference_free, NULL);
+  g_list_free (selected_paths);
 }
 
 /**
@@ -1048,9 +974,8 @@ remove_file_from_list (gpointer user_data)
 void
 select_all_files (gpointer user_data)
 {
-        GtkWidget *filelist =
-                glade_xml_get_widget (musicinsertXML, "filelist");
-        GtkTreeSelection *selection =
-                gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
-        gtk_tree_selection_select_all (selection);
+  GtkWidget *filelist = glade_xml_get_widget (musicinsertXML, "filelist");
+  GtkTreeSelection *selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW (filelist));
+  gtk_tree_selection_select_all (selection);
 }
diff --git a/src/plugins/fs/extensions/musicinsert.h b/src/plugins/fs/extensions/musicinsert.h
index fcfb07c1..40d6ef55 100644
--- a/src/plugins/fs/extensions/musicinsert.h
+++ b/src/plugins/fs/extensions/musicinsert.h
@@ -76,7 +76,7 @@ const gint keywords_col_num = KEYWORDS_COL;
 
 
 EXTRACTOR_KeywordList *get_EXTRACTORKeywords (const EXTRACTOR_ExtractorList *
-                                              exList, const gchar * filename);
+                                              exList, const gchar * filename);
 void set_File_Keywords (const gchar * filename);
 void activateComboBoxes ();
 void updateColumns ();
@@ -101,26 +101,26 @@ void on_radioindex_toggled (GtkRadioButton * radiobutton, gpointer user_data);
 
 void
 on_albumtogglebutton_toggled (GtkToggleButton * togglebutton,
-                              gpointer user_data);
+                              gpointer user_data);
 
 void
 on_artisttogglebutton_toggled (GtkToggleButton * togglebutton,
-                               gpointer user_data);
+                               gpointer user_data);
 
 void
 on_typetogglebutton_toggled (GtkToggleButton * togglebutton,
-                             gpointer user_data);
+                             gpointer user_data);
 
 void
 on_keywordstogglebutton_toggled (GtkToggleButton * togglebutton,
-                                 gpointer user_data);
+                                 gpointer user_data);
 
 void
 on_renderer_edited (GtkCellRendererText * cellrenderertext,
-                    gchar * arg1, gchar * arg2, gpointer user_data);
+                    gchar * arg1, gchar * arg2, gpointer user_data);
 
 gboolean popup_delete (GtkWidget * widget,
-                       GdkEventButton * event, gpointer user_data);
+                       GdkEventButton * event, gpointer user_data);
 
 void remove_file_from_list (gpointer user_data);
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 6661cae5..aae21346 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -35,23 +35,23 @@
 #include "collection.h"
 #include "namespace.h"
 
-struct FSUI_Context * ctx;
+struct FSUI_Context *ctx;
 
-struct GE_Context * ectx;
+struct GE_Context *ectx;
 
-struct GC_Configuration * cfg;
+struct GC_Configuration *cfg;
 
-SearchList * search_head;
+SearchList *search_head;
 
-DownloadList * download_head;
+DownloadList *download_head;
 
-UploadList * upload_head;
+UploadList *upload_head;
 
-GtkListStore * search_summary;
+GtkListStore *search_summary;
 
-GtkTreeStore * download_summary;
+GtkTreeStore *download_summary;
 
-GtkTreeStore * upload_summary;
+GtkTreeStore *upload_summary;
 
 /**
  * Last right-click event coordinates in summary.
@@ -64,22 +64,24 @@ static unsigned int last_x;
 static unsigned int last_y;
 
 
-void on_updateIntervalComboEntry_changed_fs(GtkWidget * button,
-                                            GtkWidget * entryBox) {
-  const char * time;
+void
+on_updateIntervalComboEntry_changed_fs (GtkWidget * button,
+                                        GtkWidget * entryBox)
+{
+  const char *time;
   TIME_T t;
-  GtkEntry * entry;
-
-  entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entryBox)));
-  time = gtk_entry_get_text(entry);
-  if (OK != parseTimeInterval(time,
-                              &t)) {
-    gtk_widget_set_sensitive(button,
-                             FALSE);
-  } else {
-    gtk_widget_set_sensitive(button,
-                             TRUE);
-  }
+  GtkEntry *entry;
+
+  entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (entryBox)));
+  time = gtk_entry_get_text (entry);
+  if (OK != parseTimeInterval (time, &t))
+    {
+      gtk_widget_set_sensitive (button, FALSE);
+    }
+  else
+    {
+      gtk_widget_set_sensitive (button, TRUE);
+    }
 }
 
 
@@ -87,305 +89,295 @@ void on_updateIntervalComboEntry_changed_fs(GtkWidget * button,
  * The selection of the download summary changed.
  * Update button status.
  */
-void on_anonymity_spin_changed_fs(GtkWidget * w,
-                                  gpointer dummy) {
+void
+on_anonymity_spin_changed_fs (GtkWidget * w, gpointer dummy)
+{
   gint val;
   GdkColor color;
-  GtkSpinButton * spin;
-
-  spin = GTK_SPIN_BUTTON(w);
-  if (spin == NULL) {
-    GE_BREAK(NULL, 0);
-    return;
-  }
-  val = gtk_spin_button_get_value_as_int(spin);
-  if (val == 0) {
-    if ( (TRUE == gdk_color_parse("red",
-                                  &color)) &&
-         (TRUE == gdk_colormap_alloc_color(gdk_colormap_get_system(),
-                                           &color,
-                                           FALSE,
-                                           TRUE)) )
-      gtk_widget_modify_base(w,
-                           GTK_STATE_NORMAL,
-                           &color);
-  } else
-    gtk_widget_modify_base(w,
-                         GTK_STATE_NORMAL,
-                         NULL);
+  GtkSpinButton *spin;
+
+  spin = GTK_SPIN_BUTTON (w);
+  if (spin == NULL)
+    {
+      GE_BREAK (NULL, 0);
+      return;
+    }
+  val = gtk_spin_button_get_value_as_int (spin);
+  if (val == 0)
+    {
+      if ((TRUE == gdk_color_parse ("red",
+                                    &color)) &&
+          (TRUE == gdk_colormap_alloc_color (gdk_colormap_get_system (),
+                                             &color, FALSE, TRUE)))
+        gtk_widget_modify_base (w, GTK_STATE_NORMAL, &color);
+    }
+  else
+    gtk_widget_modify_base (w, GTK_STATE_NORMAL, NULL);
 
 
 }
 
 static void *
-saveEventProcessor(void * cls) {
-  const FSUI_Event * event = cls;
-  void * ret;
+saveEventProcessor (void *cls)
+{
+  const FSUI_Event *event = cls;
+  void *ret;
 
   ret = NULL;
-  switch (event->type) {
-    /* search events */
-  case FSUI_search_started:
-    ret = fs_search_started(event->data.SearchStarted.sc.pos,
-                            event->data.SearchStarted.searchURI,
-                            event->data.SearchStarted.anonymityLevel,
-                            0,
-                            NULL,
-                            FSUI_ACTIVE);
-    break;
-  case FSUI_search_result:
-    fs_search_result_received(event->data.SearchResult.sc.cctx,
-                              &event->data.SearchResult.fi,
-                              event->data.SearchResult.searchURI);
-    break;
-  case FSUI_search_error:
-    fs_search_aborted(event->data.SearchError.sc.cctx);
-    break;
-  case FSUI_search_aborted:
-    fs_search_aborted(event->data.SearchAborted.sc.cctx);
-    break;
-  case FSUI_search_completed:
-    // FIXME...
-    fs_search_aborted(event->data.SearchCompleted.sc.cctx);
-    break;
-  case FSUI_search_suspended:
-    fs_search_aborted(event->data.SearchSuspended.sc.cctx);
-    break;
-  case FSUI_search_resumed:
-    ret = fs_search_started(event->data.SearchResumed.sc.pos,
-                            event->data.SearchResumed.searchURI,
-                            event->data.SearchResumed.anonymityLevel,
-                            event->data.SearchResumed.fisSize,
-                            event->data.SearchResumed.fis,
-                            event->data.SearchResumed.state);
-    break;
-  case FSUI_search_stopped:
-    fs_search_stopped(event->data.SearchStopped.sc.cctx);
-    break;
-
-    /* download events */
-  case FSUI_download_aborted:
-    fs_download_aborted(event->data.DownloadAborted.dc.cctx);
-    break;
-  case FSUI_download_error:
-    fs_download_aborted(event->data.DownloadError.dc.cctx);
-    break;
-  case FSUI_download_suspended:
-    fs_download_stopped(event->data.DownloadSuspended.dc.cctx);
-    break;
-  case FSUI_download_progress:
-    fs_download_update(event->data.DownloadProgress.dc.cctx,
-                       event->data.DownloadProgress.completed,
-                       event->data.DownloadProgress.last_block,
-                       event->data.DownloadProgress.last_size);
-    break;
-  case FSUI_download_completed:
-    fs_download_completed(event->data.DownloadCompleted.dc.cctx);
-    break;
-  case FSUI_download_stopped:
-    fs_download_stopped(event->data.DownloadStopped.dc.cctx);
-    break;
-  case FSUI_download_started:
-    ret = fs_download_started(event->data.DownloadStarted.dc.pos,
-                              event->data.DownloadStarted.dc.pcctx,
-                              event->data.DownloadStarted.dc.sctx,
-                              event->data.DownloadStarted.total,
-                              event->data.DownloadStarted.anonymityLevel,
-                              &event->data.DownloadStarted.fi,
-                              event->data.DownloadStarted.filename,
-                              0,
-                              get_time(),
-                              FSUI_ACTIVE);
-    break;
-  case FSUI_download_resumed:
-    ret = fs_download_started(event->data.DownloadResumed.dc.pos,
-                              event->data.DownloadResumed.dc.pcctx,
-                              event->data.DownloadResumed.dc.sctx,
-                              event->data.DownloadResumed.total,
-                              event->data.DownloadResumed.anonymityLevel,
-                              &event->data.DownloadResumed.fi,
-                              event->data.DownloadResumed.filename,
-                              event->data.DownloadResumed.completed,
-                              event->data.DownloadResumed.eta,
-                              event->data.DownloadResumed.state);
-    break;
-
-    /* upload events */
-  case FSUI_upload_progress:
-    fs_upload_update(event->data.UploadProgress.uc.cctx,
-                     event->data.UploadProgress.completed);
-    break;
-  case FSUI_upload_completed:
-    fs_upload_complete(event->data.UploadCompleted.uc.cctx,
-                       event->data.UploadCompleted.uri);
-    break;
-  case FSUI_upload_error:
-    fs_upload_error(event->data.UploadError.uc.cctx);
-    break;
-  case FSUI_upload_aborted:
-    fs_upload_error(event->data.UploadAborted.uc.cctx);
-    break;
-  case FSUI_upload_stopped:
-    fs_upload_stopped(event->data.UploadStopped.uc.cctx);
-    break;
-  case FSUI_upload_suspended:
-    fs_upload_stopped(event->data.UploadSuspended.uc.cctx);
-    break;
-  case FSUI_upload_started:
-    ret = fs_upload_started(event->data.UploadStarted.uc.pos,
-                            event->data.UploadStarted.uc.pcctx,
-                            event->data.UploadStarted.filename,
-                            NULL,
-                            event->data.UploadStarted.total,
-                            0,
-                            FSUI_ACTIVE);
-    break;
-  case FSUI_upload_resumed:
-    ret = fs_upload_started(event->data.UploadResumed.uc.pos,
-                            event->data.UploadResumed.uc.pcctx,
-                            event->data.UploadResumed.filename,
-                            event->data.UploadResumed.uri,
-                            event->data.UploadResumed.total,
-                            event->data.UploadResumed.completed,
-                            event->data.UploadResumed.state);
-    break;
-    /* TODO: unindex events */
-  default:
-    GE_BREAK(ectx, 0);
-    GE_LOG(ectx,
-           GE_ERROR,
-           _("Unhandled (unknown) FSUI event: %u.\n"),
-           event->type);
-    break;
-  }
+  switch (event->type)
+    {
+      /* search events */
+    case FSUI_search_started:
+      ret = fs_search_started (event->data.SearchStarted.sc.pos,
+                               event->data.SearchStarted.searchURI,
+                               event->data.SearchStarted.anonymityLevel,
+                               0, NULL, FSUI_ACTIVE);
+      break;
+    case FSUI_search_result:
+      fs_search_result_received (event->data.SearchResult.sc.cctx,
+                                 &event->data.SearchResult.fi,
+                                 event->data.SearchResult.searchURI);
+      break;
+    case FSUI_search_error:
+      fs_search_aborted (event->data.SearchError.sc.cctx);
+      break;
+    case FSUI_search_aborted:
+      fs_search_aborted (event->data.SearchAborted.sc.cctx);
+      break;
+    case FSUI_search_completed:
+      // FIXME...
+      fs_search_aborted (event->data.SearchCompleted.sc.cctx);
+      break;
+    case FSUI_search_suspended:
+      fs_search_aborted (event->data.SearchSuspended.sc.cctx);
+      break;
+    case FSUI_search_resumed:
+      ret = fs_search_started (event->data.SearchResumed.sc.pos,
+                               event->data.SearchResumed.searchURI,
+                               event->data.SearchResumed.anonymityLevel,
+                               event->data.SearchResumed.fisSize,
+                               event->data.SearchResumed.fis,
+                               event->data.SearchResumed.state);
+      break;
+    case FSUI_search_stopped:
+      fs_search_stopped (event->data.SearchStopped.sc.cctx);
+      break;
+
+      /* download events */
+    case FSUI_download_aborted:
+      fs_download_aborted (event->data.DownloadAborted.dc.cctx);
+      break;
+    case FSUI_download_error:
+      fs_download_aborted (event->data.DownloadError.dc.cctx);
+      break;
+    case FSUI_download_suspended:
+      fs_download_stopped (event->data.DownloadSuspended.dc.cctx);
+      break;
+    case FSUI_download_progress:
+      fs_download_update (event->data.DownloadProgress.dc.cctx,
+                          event->data.DownloadProgress.completed,
+                          event->data.DownloadProgress.last_block,
+                          event->data.DownloadProgress.last_size);
+      break;
+    case FSUI_download_completed:
+      fs_download_completed (event->data.DownloadCompleted.dc.cctx);
+      break;
+    case FSUI_download_stopped:
+      fs_download_stopped (event->data.DownloadStopped.dc.cctx);
+      break;
+    case FSUI_download_started:
+      ret = fs_download_started (event->data.DownloadStarted.dc.pos,
+                                 event->data.DownloadStarted.dc.pcctx,
+                                 event->data.DownloadStarted.dc.sctx,
+                                 event->data.DownloadStarted.total,
+                                 event->data.DownloadStarted.anonymityLevel,
+                                 &event->data.DownloadStarted.fi,
+                                 event->data.DownloadStarted.filename,
+                                 0, get_time (), FSUI_ACTIVE);
+      break;
+    case FSUI_download_resumed:
+      ret = fs_download_started (event->data.DownloadResumed.dc.pos,
+                                 event->data.DownloadResumed.dc.pcctx,
+                                 event->data.DownloadResumed.dc.sctx,
+                                 event->data.DownloadResumed.total,
+                                 event->data.DownloadResumed.anonymityLevel,
+                                 &event->data.DownloadResumed.fi,
+                                 event->data.DownloadResumed.filename,
+                                 event->data.DownloadResumed.completed,
+                                 event->data.DownloadResumed.eta,
+                                 event->data.DownloadResumed.state);
+      break;
+
+      /* upload events */
+    case FSUI_upload_progress:
+      fs_upload_update (event->data.UploadProgress.uc.cctx,
+                        event->data.UploadProgress.completed);
+      break;
+    case FSUI_upload_completed:
+      fs_upload_complete (event->data.UploadCompleted.uc.cctx,
+                          event->data.UploadCompleted.uri);
+      break;
+    case FSUI_upload_error:
+      fs_upload_error (event->data.UploadError.uc.cctx);
+      break;
+    case FSUI_upload_aborted:
+      fs_upload_error (event->data.UploadAborted.uc.cctx);
+      break;
+    case FSUI_upload_stopped:
+      fs_upload_stopped (event->data.UploadStopped.uc.cctx);
+      break;
+    case FSUI_upload_suspended:
+      fs_upload_stopped (event->data.UploadSuspended.uc.cctx);
+      break;
+    case FSUI_upload_started:
+      ret = fs_upload_started (event->data.UploadStarted.uc.pos,
+                               event->data.UploadStarted.uc.pcctx,
+                               event->data.UploadStarted.filename,
+                               NULL,
+                               event->data.UploadStarted.total,
+                               0, FSUI_ACTIVE);
+      break;
+    case FSUI_upload_resumed:
+      ret = fs_upload_started (event->data.UploadResumed.uc.pos,
+                               event->data.UploadResumed.uc.pcctx,
+                               event->data.UploadResumed.filename,
+                               event->data.UploadResumed.uri,
+                               event->data.UploadResumed.total,
+                               event->data.UploadResumed.completed,
+                               event->data.UploadResumed.state);
+      break;
+      /* TODO: unindex events */
+    default:
+      GE_BREAK (ectx, 0);
+      GE_LOG (ectx,
+              GE_ERROR,
+              _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
+      break;
+    }
   return ret;
 }
 
 static void *
-eventProcessor(void * unused,
-               const FSUI_Event * event) {
-  return gtkSaveCall(&saveEventProcessor,
-                     (void*) event);
+eventProcessor (void *unused, const FSUI_Event * event)
+{
+  return gtkSaveCall (&saveEventProcessor, (void *) event);
 }
 
 /**
  * The selection of the upload summary changed.
  * Update button status.
  */
-static void on_upload_summary_selection_changed(gpointer signal,
-                                                gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                                             "activeUploadsList")));
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "cancelUploadButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "stopUploadButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_upload_summary_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (getMainXML (), "activeUploadsList")));
+  button = glade_xml_get_widget (getMainXML (), "cancelUploadButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
+  button = glade_xml_get_widget (getMainXML (), "stopUploadButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The selection of the download summary changed.
  * Update button status.
  */
-static void on_download_summary_selection_changed(gpointer signal,
-                                                  gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                                             "activeDownloadsList")));
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "abortDownloadButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "stopDownloadButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_download_summary_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (getMainXML (), "activeDownloadsList")));
+  button = glade_xml_get_widget (getMainXML (), "abortDownloadButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
+  button = glade_xml_get_widget (getMainXML (), "stopDownloadButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The selection of the download summary changed.
  * Update button status.
  */
-static void on_search_summary_selection_changed(gpointer signal,
-                                                gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                                             "activeSearchesSummary")));
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "cancelSearchButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
-  button
-    = glade_xml_get_widget(getMainXML(),
-                           "stopSearchButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_search_summary_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (getMainXML (), "activeSearchesSummary")));
+  button = glade_xml_get_widget (getMainXML (), "cancelSearchButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
+  button = glade_xml_get_widget (getMainXML (), "stopSearchButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 static int
-on_upload_copy_uri_activate(void * cls,
-                            GtkWidget * searchEntry) {
-  GtkTreeView * uploadList = cls;
+on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
+{
+  GtkTreeView *uploadList = cls;
   GtkTreePath *path;
   GtkTreeIter iter;
-  struct ECRS_URI * uri;
-  char * str;
-  GtkClipboard * clip;
+  struct ECRS_URI *uri;
+  char *str;
+  GtkClipboard *clip;
 
   path = NULL;
-  if (FALSE == gtk_tree_view_get_path_at_pos(uploadList,
-                                             last_x,
-                                             last_y,
-                                             &path,
-                                             NULL,
-                                             NULL,
-                                             NULL)) {
-    GE_BREAK(NULL, 0);
-    return FALSE;
-  }
-  if (FALSE == gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
-                                       &iter,
-                                       path)) {
-    GE_BREAK(NULL, 0);
-    gtk_tree_path_free(path);
-    return FALSE;
-  }
-  gtk_tree_path_free(path);
+  if (FALSE == gtk_tree_view_get_path_at_pos (uploadList,
+                                              last_x,
+                                              last_y,
+                                              &path, NULL, NULL, NULL))
+    {
+      GE_BREAK (NULL, 0);
+      return FALSE;
+    }
+  if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
+                                        &iter, path))
+    {
+      GE_BREAK (NULL, 0);
+      gtk_tree_path_free (path);
+      return FALSE;
+    }
+  gtk_tree_path_free (path);
   uri = NULL;
-  gtk_tree_model_get(GTK_TREE_MODEL(upload_summary),
-                     &iter,
-                     UPLOAD_URISTRING, &str,
-                     -1);
-  clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-  gtk_clipboard_set_text(clip,
-                         str,
-                         strlen(str));
-  FREE(str);
+  gtk_tree_model_get (GTK_TREE_MODEL (upload_summary),
+                      &iter, UPLOAD_URISTRING, &str, -1);
+  clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  gtk_clipboard_set_text (clip, str, strlen (str));
+  FREE (str);
   return FALSE;
 }
 
 static gint
-upload_click_handler(void * cls,
-                     GdkEvent *event) {
-  GtkTreeView * uploadList = cls;
-  GtkMenu * menu;
-  GtkWidget * entry;
-  GdkEventButton * event_button;
+upload_click_handler (void *cls, GdkEvent * event)
+{
+  GtkTreeView *uploadList = cls;
+  GtkMenu *menu;
+  GtkWidget *entry;
+  GdkEventButton *event_button;
 
   g_return_val_if_fail (event != NULL, FALSE);
   if (event->type != GDK_BUTTON_PRESS)
@@ -395,24 +387,19 @@ upload_click_handler(void * cls,
     return FALSE;
   last_x = event_button->x;
   last_y = event_button->y;
-  entry = gtk_menu_item_new_with_label(_("_Copy URI to Clipboard"));
+  entry = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
   g_signal_connect_swapped (entry,
-                            "activate",
-                            G_CALLBACK(on_upload_copy_uri_activate),
-                            uploadList);
-  gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(entry))),
-                              TRUE);
-  gtk_widget_show(entry);
-  menu = GTK_MENU(gtk_menu_new());
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-                        entry);
+                            "activate",
+                            G_CALLBACK (on_upload_copy_uri_activate),
+                            uploadList);
+  gtk_label_set_use_underline (GTK_LABEL
+                               (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
+  gtk_widget_show (entry);
+  menu = GTK_MENU (gtk_menu_new ());
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
   gtk_menu_popup (menu,
-                  NULL,
-                  NULL,
-                  NULL,
-                  NULL,
-                  event_button->button,
-                  event_button->time);
+                  NULL,
+                  NULL, NULL, NULL, event_button->button, event_button->time);
   return TRUE;
 }
 
@@ -420,328 +407,297 @@ upload_click_handler(void * cls,
  * Setup the summary views (in particular the models
  * and the renderers).
  */
-static void fs_summary_start() {
-  GtkComboBoxEntry * searchCB;
-  GtkWidget * uploadEntry;
-  GtkTreeView * searchList;
-  GtkTreeView * downloadList;
-  GtkTreeView * uploadList;
-  GtkListStore * model;
-  GtkCellRenderer * renderer;
-  GtkTreeViewColumn * column;
+static void
+fs_summary_start ()
+{
+  GtkComboBoxEntry *searchCB;
+  GtkWidget *uploadEntry;
+  GtkTreeView *searchList;
+  GtkTreeView *downloadList;
+  GtkTreeView *uploadList;
+  GtkListStore *model;
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
   int col;
 
   /* keyword list setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
-                                               "fssearchKeywordComboBoxEntry"));
-  model = gtk_list_store_new(1,
-                             G_TYPE_STRING /* search string*/ );
-  gtk_combo_box_set_model(GTK_COMBO_BOX(searchCB),
-                          GTK_TREE_MODEL(model));
-  gtk_combo_box_entry_set_text_column(searchCB,
-                                      0);
+    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+                                                 "fssearchKeywordComboBoxEntry"));
+  model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ );
+  gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
+  gtk_combo_box_entry_set_text_column (searchCB, 0);
 
   /* search namespace selection setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY(glade_xml_get_widget(getMainXML(),
-                                               "searchNamespaceComboBoxEntry"));
-
-  model = gtk_list_store_new(NS_SEARCH_NUM,
-                             G_TYPE_STRING, /* what we show */
-                             G_TYPE_STRING, /* EncName of namespace */
-                             G_TYPE_POINTER, /* ECRS MetaData */
-                             G_TYPE_INT);  /* Meta-data about namespace */
-  gtk_combo_box_set_model(GTK_COMBO_BOX(searchCB),
-                          GTK_TREE_MODEL(model));
-  gtk_combo_box_entry_set_text_column(searchCB,
-                                      NS_SEARCH_DESCRIPTION);
+    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (getMainXML (),
+                                                 "searchNamespaceComboBoxEntry"));
+
+  model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING,     /* what we show */
+                              G_TYPE_STRING,    /* EncName of namespace */
+                              G_TYPE_POINTER,   /* ECRS MetaData */
+                              G_TYPE_INT);      /* Meta-data about namespace */
+  gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
+  gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 
   /* search summary setup */
-  searchList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                  "activeSearchesSummary"));
-  search_summary =
-    gtk_list_store_new(SEARCH_SUMMARY_NUM,
-                       G_TYPE_STRING, /* name */
-                       G_TYPE_INT,    /* # results */
-                       G_TYPE_POINTER);  /* internal: search list */
-  gtk_tree_view_set_model(searchList,
-                          GTK_TREE_MODEL(search_summary));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(searchList),
-                              GTK_SELECTION_MULTIPLE);
-  g_signal_connect_data(gtk_tree_view_get_selection(searchList),
-                        "changed",
-                        G_CALLBACK(&on_search_summary_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(searchList,
-                                                    -1,
-                                                    _("Query"),
-                                                    renderer,
-                                                    "text", SEARCH_SUMMARY_NAME,
-                                              NULL);
-  column = gtk_tree_view_get_column(searchList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_SUMMARY_NAME);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(searchList,
-                                                    -1,
-                                                    _("Results"),
-                                                    renderer,
-                                                    "text", SEARCH_SUMMARY_RESULT_COUNT,
-                                                    NULL);
-  column = gtk_tree_view_get_column(searchList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_SUMMARY_RESULT_COUNT);
-  gtk_tree_view_column_set_resizable(column, TRUE);
+  searchList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+                                                    "activeSearchesSummary"));
+  search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING,       /* name */
+                                       G_TYPE_INT,      /* # results */
+                                       G_TYPE_POINTER); /* internal: search list */
+  gtk_tree_view_set_model (searchList, GTK_TREE_MODEL (search_summary));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (searchList),
+                               GTK_SELECTION_MULTIPLE);
+  g_signal_connect_data (gtk_tree_view_get_selection (searchList),
+                         "changed",
+                         G_CALLBACK (&on_search_summary_selection_changed),
+                         NULL, NULL, 0);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (searchList,
+                                                     -1,
+                                                     _("Query"),
+                                                     renderer,
+                                                     "text",
+                                                     SEARCH_SUMMARY_NAME,
+                                                     NULL);
+  column = gtk_tree_view_get_column (searchList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_SUMMARY_NAME);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (searchList,
+                                                     -1,
+                                                     _("Results"),
+                                                     renderer,
+                                                     "text",
+                                                     SEARCH_SUMMARY_RESULT_COUNT,
+                                                     NULL);
+  column = gtk_tree_view_get_column (searchList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column,
+                                           SEARCH_SUMMARY_RESULT_COUNT);
+  gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* download summary setup */
-  downloadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                    "activeDownloadsList"));
-  download_summary =
-    gtk_tree_store_new(DOWNLOAD_NUM,
-                       G_TYPE_STRING, /* name (full-path file name) */
-                       G_TYPE_STRING, /* name (user-friendly name) */
-                       G_TYPE_UINT64,  /* size */
-                       G_TYPE_STRING, /* human readable size */
-                       G_TYPE_INT,  /* progress */
-                       G_TYPE_STRING, /* uri as string */
-                       G_TYPE_POINTER); /* internal download list ptr */
-  gtk_tree_view_set_model(downloadList,
-                          GTK_TREE_MODEL(download_summary));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(downloadList),
-                              GTK_SELECTION_MULTIPLE);
-  g_signal_connect_data(gtk_tree_view_get_selection(downloadList),
-                        "changed",
-                        G_CALLBACK(&on_download_summary_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-
-  renderer = gtk_cell_renderer_text_new();
+  downloadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+                                                      "activeDownloadsList"));
+  download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING,   /* name (full-path file name) */
+                                         G_TYPE_STRING, /* name (user-friendly name) */
+                                         G_TYPE_UINT64, /* size */
+                                         G_TYPE_STRING, /* human readable size */
+                                         G_TYPE_INT,    /* progress */
+                                         G_TYPE_STRING, /* uri as string */
+                                         G_TYPE_POINTER);       /* internal download list ptr */
+  gtk_tree_view_set_model (downloadList, GTK_TREE_MODEL (download_summary));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (downloadList),
+                               GTK_SELECTION_MULTIPLE);
+  g_signal_connect_data (gtk_tree_view_get_selection (downloadList),
+                         "changed",
+                         G_CALLBACK (&on_download_summary_selection_changed),
+                         NULL, NULL, 0);
+
+  renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "xalign", 1.00, NULL);
-  col = gtk_tree_view_insert_column_with_attributes(downloadList,
-                                                    -1,
-                                                    _("Size"),
-                                                    renderer,
-                                                    "text", DOWNLOAD_HSIZE,
-                                                    NULL);
-
-  column = gtk_tree_view_get_column(downloadList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_SIZE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-
-  renderer = gtk_cell_renderer_progress_new();
-  col = gtk_tree_view_insert_column_with_attributes(downloadList,
-                                                    -1,
-                                                    _("Name"),
-                                                    renderer,
-                                                    "value", DOWNLOAD_PROGRESS,
-                                                    "text", DOWNLOAD_SHORTNAME,
-                                                    NULL);
-  g_object_set(G_OBJECT(renderer),
-               "width", 400,
-               NULL);
-  column = gtk_tree_view_get_column(downloadList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, DOWNLOAD_PROGRESS);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(downloadList,
-                                                    -1,
-                                                    _("URI"),
-                                                    renderer,
-                                                    "text", DOWNLOAD_URISTRING,
-                                                    NULL);
-  g_object_set(G_OBJECT(renderer),
-               "wrap-width", 30,
-               "width-chars", 30,
-               "ellipsize", PANGO_ELLIPSIZE_END,
-               NULL);
-  column = gtk_tree_view_get_column(downloadList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
+  col = gtk_tree_view_insert_column_with_attributes (downloadList,
+                                                     -1,
+                                                     _("Size"),
+                                                     renderer,
+                                                     "text", DOWNLOAD_HSIZE,
+                                                     NULL);
+
+  column = gtk_tree_view_get_column (downloadList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, DOWNLOAD_SIZE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+
+  renderer = gtk_cell_renderer_progress_new ();
+  col = gtk_tree_view_insert_column_with_attributes (downloadList,
+                                                     -1,
+                                                     _("Name"),
+                                                     renderer,
+                                                     "value",
+                                                     DOWNLOAD_PROGRESS,
+                                                     "text",
+                                                     DOWNLOAD_SHORTNAME,
+                                                     NULL);
+  g_object_set (G_OBJECT (renderer), "width", 400, NULL);
+  column = gtk_tree_view_get_column (downloadList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, DOWNLOAD_PROGRESS);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (downloadList,
+                                                     -1,
+                                                     _("URI"),
+                                                     renderer,
+                                                     "text",
+                                                     DOWNLOAD_URISTRING,
+                                                     NULL);
+  g_object_set (G_OBJECT (renderer), "wrap-width", 30, "width-chars", 30,
+                "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  column = gtk_tree_view_get_column (downloadList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* upload summary setup */
-  uploadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
-                                                  "activeUploadsList"));
+  uploadList = GTK_TREE_VIEW (glade_xml_get_widget (getMainXML (),
+                                                    "activeUploadsList"));
   g_signal_connect_swapped (uploadList,
-                            "button-press-event",
-                            G_CALLBACK(upload_click_handler),
-                            uploadList);
-  upload_summary =
-    gtk_tree_store_new(UPLOAD_NUM,
-                       G_TYPE_STRING, /* filename */
-                       G_TYPE_INT,    /* progress */
-                       G_TYPE_STRING, /* URI as string */
-                       G_TYPE_POINTER);  /* UploadList */
-  gtk_tree_view_set_model(uploadList,
-                          GTK_TREE_MODEL(upload_summary));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(uploadList),
-                              GTK_SELECTION_MULTIPLE);
-  g_signal_connect_data(gtk_tree_view_get_selection(uploadList),
-                        "changed",
-                        G_CALLBACK(&on_upload_summary_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-
-  renderer = gtk_cell_renderer_progress_new();
-  col = gtk_tree_view_insert_column_with_attributes(uploadList,
-                                                    -1,
-                                                    _("Filename"),
-                                                    renderer,
-                                                    "text", UPLOAD_FILENAME,
-                                                    "value", UPLOAD_PROGRESS,
-                                                    NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList,
-                                                              col - 1),
-                                     TRUE);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(uploadList,
-                                                    -1,
-                                                    _("URI"),
-                                                    renderer,
-                                                    "text", UPLOAD_URISTRING,
-                                                    NULL);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList,
-                                                              col - 1),
-                                     TRUE);
+                            "button-press-event",
+                            G_CALLBACK (upload_click_handler), uploadList);
+  upload_summary = gtk_tree_store_new (UPLOAD_NUM, G_TYPE_STRING,       /* filename */
+                                       G_TYPE_INT,      /* progress */
+                                       G_TYPE_STRING,   /* URI as string */
+                                       G_TYPE_POINTER); /* UploadList */
+  gtk_tree_view_set_model (uploadList, GTK_TREE_MODEL (upload_summary));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (uploadList),
+                               GTK_SELECTION_MULTIPLE);
+  g_signal_connect_data (gtk_tree_view_get_selection (uploadList),
+                         "changed",
+                         G_CALLBACK (&on_upload_summary_selection_changed),
+                         NULL, NULL, 0);
+
+  renderer = gtk_cell_renderer_progress_new ();
+  col = gtk_tree_view_insert_column_with_attributes (uploadList,
+                                                     -1,
+                                                     _("Filename"),
+                                                     renderer,
+                                                     "text", UPLOAD_FILENAME,
+                                                     "value", UPLOAD_PROGRESS,
+                                                     NULL);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (uploadList,
+                                                                col - 1),
+                                      TRUE);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (uploadList,
+                                                     -1,
+                                                     _("URI"),
+                                                     renderer,
+                                                     "text", UPLOAD_URISTRING,
+                                                     NULL);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column (uploadList,
+                                                                col - 1),
+                                      TRUE);
   /* upload entry setup */
   uploadEntry
-    = glade_xml_get_widget(getMainXML(),
-                           "uploadFilenameComboBoxEntry");
-
-  model = gtk_list_store_new(1, G_TYPE_STRING);
-  gtk_combo_box_set_model(GTK_COMBO_BOX(uploadEntry),
-                          GTK_TREE_MODEL(model));
-  gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(uploadEntry),
-                                      0);
+    = glade_xml_get_widget (getMainXML (), "uploadFilenameComboBoxEntry");
+
+  model = gtk_list_store_new (1, G_TYPE_STRING);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry),
+                           GTK_TREE_MODEL (model));
+  gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (uploadEntry), 0);
 }
 
 /**
  * Shutdown the summary dialogs.
  */
-static void fs_summary_stop() {
-  struct ECRS_MetaData * meta;
-  GtkComboBox * searchCB;
-  GtkTreeModel * model;
+static void
+fs_summary_stop ()
+{
+  struct ECRS_MetaData *meta;
+  GtkComboBox *searchCB;
+  GtkTreeModel *model;
   GtkTreeIter iter;
 
   searchCB
-    = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
-                                         "searchNamespaceComboBoxEntry"));
-  model = gtk_combo_box_get_model(searchCB);
-  if (gtk_tree_model_get_iter_first(model,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(model,
-                         &iter,
-                         NS_SEARCH_METADATA, &meta,
-                         -1);
-      gtk_list_store_set(GTK_LIST_STORE(model),
-                         &iter,
-                         NS_SEARCH_METADATA, NULL,
-                         -1);
-      if (meta != NULL)
-        ECRS_freeMetaData(meta);
-    } while (gtk_list_store_remove(GTK_LIST_STORE(model),
-                                   &iter));
-  }
+    = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+                                           "searchNamespaceComboBoxEntry"));
+  model = gtk_combo_box_get_model (searchCB);
+  if (gtk_tree_model_get_iter_first (model, &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (model, &iter, NS_SEARCH_METADATA, &meta, -1);
+          gtk_list_store_set (GTK_LIST_STORE (model),
+                              &iter, NS_SEARCH_METADATA, NULL, -1);
+          if (meta != NULL)
+            ECRS_freeMetaData (meta);
+        }
+      while (gtk_list_store_remove (GTK_LIST_STORE (model), &iter));
+    }
 
 }
 
-void init_fs(struct GE_Context * e,
-             struct GC_Configuration * c) {
-  GtkWidget * tab;
-  GtkWidget * book;
+void
+init_fs (struct GE_Context *e, struct GC_Configuration *c)
+{
+  GtkWidget *tab;
+  GtkWidget *book;
   gint num;
 
   ectx = e;
   cfg = c;
-  CO_init(ectx, cfg);
-  tab
-    = glade_xml_get_widget(getMainXML(),
-                           "fsnotebook");
-  gtk_widget_show(tab);
-  book
-    = glade_xml_get_widget(getMainXML(), "mainnotebook");
-  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(book));
-  gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1);
-  gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num);
-  fs_summary_start();
-  fs_collection_start();
-  fs_namespace_start();
-  ctx = FSUI_start(ectx,
-                   cfg,
-                   "gnunet-gtk",
-                   8, /* FIXME: allow user to configure download parallelism */
-                   YES,
-                   &eventProcessor,
-                   NULL);
+  CO_init (ectx, cfg);
+  tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+  gtk_widget_show (tab);
+  book = glade_xml_get_widget (getMainXML (), "mainnotebook");
+  num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
+  fs_summary_start ();
+  fs_collection_start ();
+  fs_namespace_start ();
+  ctx = FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */
+                    YES, &eventProcessor, NULL);
 }
 
-static void * hide_save_call(void * arg) {
-  GtkWidget * tab;
+static void *
+hide_save_call (void *arg)
+{
+  GtkWidget *tab;
 
-  tab
-    = glade_xml_get_widget(getMainXML(),
-                           "fsnotebook");
-  gtk_widget_hide(tab);
+  tab = glade_xml_get_widget (getMainXML (), "fsnotebook");
+  gtk_widget_hide (tab);
   return NULL;
 }
 
-static void * cleanup_save_call(void * arg) {
-  fs_summary_stop();
-  fs_namespace_stop();
+static void *
+cleanup_save_call (void *arg)
+{
+  fs_summary_stop ();
+  fs_namespace_stop ();
   return NULL;
 }
 
-void done_fs() {
-  gtkSaveCall(&hide_save_call, NULL);
-  FSUI_stop(ctx);
-  gtkSaveCall(&cleanup_save_call, NULL);
-  CO_done();
+void
+done_fs ()
+{
+  gtkSaveCall (&hide_save_call, NULL);
+  FSUI_stop (ctx);
+  gtkSaveCall (&cleanup_save_call, NULL);
+  CO_done ();
 }
 
 
-const char * getColorCode(enum URITRACK_STATE state) {
+const char *
+getColorCode (enum URITRACK_STATE state)
+{
   if (state & (URITRACK_DIRECTORY_ADDED))
     return "blue";
   if (state & (URITRACK_INSERTED || URITRACK_INDEXED))
     return "cyan";
-  if ( (state & URITRACK_DOWNLOAD_STARTED) &&
-       (0 == (state &
-              (URITRACK_DOWNLOAD_COMPLETED |
-               URITRACK_DOWNLOAD_ABORTED)) ) )
+  if ((state & URITRACK_DOWNLOAD_STARTED) &&
+      (0 == (state &
+             (URITRACK_DOWNLOAD_COMPLETED | URITRACK_DOWNLOAD_ABORTED))))
     return "yellow";
   if (state & URITRACK_DOWNLOAD_COMPLETED)
     return "springgreen";
   if (state & URITRACK_DOWNLOAD_ABORTED)
     return "red";
-  if (state & (URITRACK_SEARCH_RESULT |
-               URITRACK_DIRECTORY_FOUND) )
+  if (state & (URITRACK_SEARCH_RESULT | URITRACK_DIRECTORY_FOUND))
     return "gray";
   return "white";
 }
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 2e54415b..14b691e0 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -36,7 +36,8 @@
  * On search box, for namespace selection
  * (for input of search URI; lists known namespaces).
  */
-enum {
+enum
+{
   NS_SEARCH_DESCRIPTION = 0,
   NS_SEARCH_ENCNAME,
   NS_SEARCH_METADATA,
@@ -48,7 +49,8 @@ enum {
  * For listing of search results for main search.
  * Represents a search result.
  */
-enum {
+enum
+{
   SEARCH_NAME = 0,
   SEARCH_SIZE,
   SEARCH_HSIZE,
@@ -68,7 +70,8 @@ enum {
  * Search entry in search summary list.
  * Represents a search process.
  */
-enum {
+enum
+{
   SEARCH_SUMMARY_NAME = 0,
   SEARCH_SUMMARY_RESULT_COUNT,
   SEARCH_SUMMARY_INTERNAL,
@@ -78,18 +81,20 @@ enum {
 /**
  * Entry in download summary.
  */
-enum {
+enum
+{
   DOWNLOAD_FILENAME = 0,
   DOWNLOAD_SHORTNAME,
   DOWNLOAD_SIZE,
   DOWNLOAD_HSIZE,
   DOWNLOAD_PROGRESS,
   DOWNLOAD_URISTRING,
-  DOWNLOAD_INTERNAL, /* struct DL */
+  DOWNLOAD_INTERNAL,            /* struct DL */
   DOWNLOAD_NUM
 };
 
-enum {
+enum
+{
   NAMESPACE_FILENAME = 0,
   NAMESPACE_SIZE,
   NAMESPACE_HSIZE,
@@ -99,7 +104,8 @@ enum {
   NAMESPACE_NUM
 };
 
-enum {
+enum
+{
   IN_NAMESPACE_FILENAME = 0,
   IN_NAMESPACE_SIZE,
   IN_NAMESPACE_HSIZE,
@@ -117,7 +123,8 @@ enum {
 /**
  * Entry in upload summary.
  */
-enum {
+enum
+{
   UPLOAD_FILENAME = 0,
   UPLOAD_PROGRESS,
   UPLOAD_URISTRING,
@@ -125,14 +132,16 @@ enum {
   UPLOAD_NUM
 };
 
-enum {
+enum
+{
   META_TYPE = 0,
   META_STYPE,
   META_VALUE,
   META_NUM,
 };
 
-enum {
+enum
+{
   KTYPE_STRING = 0,
   KTYPE_TYPE,
   KTYPE_NUM,
@@ -142,62 +151,63 @@ enum {
 /**
  * @brief linked list of pages in the search notebook
  */
-typedef struct SL {
-  struct SL * next;
+typedef struct SL
+{
+  struct SL *next;
   /**
    * Reference to the glade XML context that was
    * used to create the search page.
    */
-  GladeXML * searchXML;
+  GladeXML *searchXML;
 
   /**
    * Reference to the glade XML context that was
    * used to create the search label.
    */
-  GladeXML * labelXML;
+  GladeXML *labelXML;
 
   /**
    * Tree view widget that is used to display the
    * search results.
    */
-  GtkTreeView * treeview;
+  GtkTreeView *treeview;
 
   /**
    * Model of the tree view.
    */
-  GtkTreeStore * tree;
+  GtkTreeStore *tree;
 
   /**
    * The label used in the notebook page.
    */
-  GtkWidget * tab_label;
+  GtkWidget *tab_label;
 
   /**
    * The notebook page that is associated with this
    * search.
    */
-  GtkWidget * searchpage;
+  GtkWidget *searchpage;
 
   /**
    * Path to the entry in the summary list
    * for this search.
    */
-  GtkTreeRowReference * summaryViewRowReference;
+  GtkTreeRowReference *summaryViewRowReference;
 
   /**
    * URI for this search.
    */
-  struct ECRS_URI * uri;
+  struct ECRS_URI *uri;
 
   /**
    * String describing the search.
    */
-  char * searchString;
+  char *searchString;
 
   /**
    * FSUI search handle.
    */
-  struct FSUI_SearchList * fsui_list;
+  struct FSUI_SearchList *fsui_list;
 
   /**
    * Number of results received so far.
@@ -217,29 +227,30 @@ typedef struct SL {
 } SearchList;
 
 
-typedef struct DL {
-  struct DL * next;
+typedef struct DL
+{
+  struct DL *next;
 
   /**
    * URI of the download.
    */
-  struct ECRS_URI * uri;
+  struct ECRS_URI *uri;
 
   /**
    * Where is the download being saved to?
    */
-  char * filename;
+  char *filename;
 
   /**
    * Path in the summary view for this download.
    */
-  GtkTreeRowReference * summaryViewRowReference;
+  GtkTreeRowReference *summaryViewRowReference;
 
   /**
    * Search that this download belongs to.
    * Maybe NULL.
    */
-  struct SL * searchList;
+  struct SL *searchList;
 
   /**
    * Path in the search view that this
@@ -247,12 +258,12 @@ typedef struct DL {
    * if search has been closed or if download
    * was initiated from URI without search.
    */
-  GtkTreeRowReference * searchViewRowReference;
+  GtkTreeRowReference *searchViewRowReference;
 
   /**
    * FSUI reference for the download.
    */
-  struct FSUI_DownloadList * fsui_list;
+  struct FSUI_DownloadList *fsui_list;
 
   /**
    * Total size of the download.
@@ -268,25 +279,26 @@ typedef struct DL {
 
 } DownloadList;
 
-typedef struct UL {
-  struct UL * next;
+typedef struct UL
+{
+  struct UL *next;
 
   /**
    * Which file or directory are we uploading?
    */
-  char * filename;
+  char *filename;
 
   /**
    * Path in the summary view for this download.
    */
-  GtkTreeRowReference * summaryViewRowReference;
+  GtkTreeRowReference *summaryViewRowReference;
 
-  struct FSUI_UploadList * fsui_list;
+  struct FSUI_UploadList *fsui_list;
 
   /**
    * Set to final URI upon successful completion.
    */
-  struct ECRS_URI * uri;
+  struct ECRS_URI *uri;
 
   /**
    * Total size of the upload.
@@ -299,25 +311,25 @@ typedef struct UL {
 
 } UploadList;
 
-extern struct FSUI_Context * ctx;
+extern struct FSUI_Context *ctx;
 
-extern struct GE_Context * ectx;
+extern struct GE_Context *ectx;
 
-extern struct GC_Configuration * cfg;
+extern struct GC_Configuration *cfg;
 
-extern SearchList * search_head;
+extern SearchList *search_head;
 
-extern DownloadList * download_head;
+extern DownloadList *download_head;
 
-extern UploadList * upload_head;
+extern UploadList *upload_head;
 
-extern GtkListStore * search_summary;
+extern GtkListStore *search_summary;
 
-extern GtkTreeStore * download_summary;
+extern GtkTreeStore *download_summary;
 
-extern GtkTreeStore * upload_summary;
+extern GtkTreeStore *upload_summary;
 
-const char * getColorCode(enum URITRACK_STATE state);
+const char *getColorCode (enum URITRACK_STATE state);
 
 
 #endif
diff --git a/src/plugins/fs/helper.c b/src/plugins/fs/helper.c
index f371505e..a0957628 100644
--- a/src/plugins/fs/helper.c
+++ b/src/plugins/fs/helper.c
@@ -37,91 +37,64 @@
  * @param val set to the computed time
  * @return OK on success, SYSERR on error
  */
-int parseTime(const char * t,
-              TIME_T * param) {
+int
+parseTime (const char *t, TIME_T * param)
+{
   int pos;
   int start;
   unsigned int val;
-  char * tmp;
+  char *tmp;
   cron_t ret;
 
   ret = 0;
   pos = 0;
 
-  while (t[pos] != '\0') {
-    start = pos;
-    while ( (isdigit(t[pos])) &&
-            (t[pos] != '\0') )
-      pos++;
-    tmp = STRNDUP(&t[start],
-                  pos - start);
-    if (1 != sscanf(tmp,
-                    "%u",
-                    &val) )
-      return -1; /* parse error */
-    FREE(tmp);
-    while ( t[pos] == ' ')
-      pos++;
-    start = pos;
-    while ( (t[pos] != ' ') &&
-            (t[pos] != '\0') )
-      pos++;
-    if (0 == strncasecmp(&t[start],
-                         _("ms"),
-                         strlen(_("ms"))))
-      ret += cronMILLIS * val;
-    if (0 == strncasecmp(&t[start],
-                         _("minutes"),
-                         strlen(_("minutes"))))
-      ret += cronMINUTES * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("seconds"),
-                              strlen(_("seconds"))))
-      ret += cronSECONDS * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("hours"),
-                              strlen(_("hours"))))
-      ret += cronHOURS * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("days"),
-                              strlen(_("days"))))
-      ret += cronDAYS  * val;
-    else
-    if (0 == strncasecmp(&t[start],
-                         _("minute"),
-                         strlen(_("minute"))))
-      ret += cronMINUTES * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("second"),
-                              strlen(_("second"))))
-      ret += cronSECONDS * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("hour"),
-                              strlen(_("hour"))))
-      ret += cronHOURS * val;
-    else if (0 == strncasecmp(&t[start],
-                              _("day"),
-                              strlen(_("day"))))
-      ret += cronDAYS  * val;
-    else if (0 == strncasecmp(&t[start],
-                         "m",
-                         strlen("m")))
-      ret += cronMINUTES * val;
-    else if (0 == strncasecmp(&t[start],
-                              "s",
-                              strlen("s")))
-      ret += cronSECONDS * val;
-    else if (0 == strncasecmp(&t[start],
-                              "h",
-                              strlen("h")))
-      ret += cronHOURS * val;
-    else
-      return SYSERR; /* parse error */
-    while ( t[pos] == ' ')
-      pos++;
-  }
+  while (t[pos] != '\0')
+    {
+      start = pos;
+      while ((isdigit (t[pos])) && (t[pos] != '\0'))
+        pos++;
+      tmp = STRNDUP (&t[start], pos - start);
+      if (1 != sscanf (tmp, "%u", &val))
+        return -1;              /* parse error */
+      FREE (tmp);
+      while (t[pos] == ' ')
+        pos++;
+      start = pos;
+      while ((t[pos] != ' ') && (t[pos] != '\0'))
+        pos++;
+      if (0 == strncasecmp (&t[start], _("ms"), strlen (_("ms"))))
+        ret += cronMILLIS * val;
+      if (0 == strncasecmp (&t[start], _("minutes"), strlen (_("minutes"))))
+        ret += cronMINUTES * val;
+      else if (0 == strncasecmp (&t[start],
+                                 _("seconds"), strlen (_("seconds"))))
+        ret += cronSECONDS * val;
+      else if (0 == strncasecmp (&t[start], _("hours"), strlen (_("hours"))))
+        ret += cronHOURS * val;
+      else if (0 == strncasecmp (&t[start], _("days"), strlen (_("days"))))
+        ret += cronDAYS * val;
+      else
+        if (0 == strncasecmp (&t[start], _("minute"), strlen (_("minute"))))
+        ret += cronMINUTES * val;
+      else if (0 == strncasecmp (&t[start],
+                                 _("second"), strlen (_("second"))))
+        ret += cronSECONDS * val;
+      else if (0 == strncasecmp (&t[start], _("hour"), strlen (_("hour"))))
+        ret += cronHOURS * val;
+      else if (0 == strncasecmp (&t[start], _("day"), strlen (_("day"))))
+        ret += cronDAYS * val;
+      else if (0 == strncasecmp (&t[start], "m", strlen ("m")))
+        ret += cronMINUTES * val;
+      else if (0 == strncasecmp (&t[start], "s", strlen ("s")))
+        ret += cronSECONDS * val;
+      else if (0 == strncasecmp (&t[start], "h", strlen ("h")))
+        ret += cronHOURS * val;
+      else
+        return SYSERR;          /* parse error */
+      while (t[pos] == ' ')
+        pos++;
+    }
   *param = ret / cronSECONDS;
   return OK;
 }
-
-
diff --git a/src/plugins/fs/helper.h b/src/plugins/fs/helper.h
index f91940a8..9fa44a69 100644
--- a/src/plugins/fs/helper.h
+++ b/src/plugins/fs/helper.h
@@ -35,15 +35,12 @@
  * @param the title of the new label
  * @returns the created widget to pack into the page header
  */
-GtkWidget *
-buildSearchTabLabel(GtkWidget *searchPage,
-                    const char *title);
+GtkWidget *buildSearchTabLabel (GtkWidget * searchPage, const char *title);
 
 
-GtkWidget *
-makeSearchResultFrame(struct GC_Configuration * cfg,
-                      GtkWidget ** treeview,
-                      GtkWidget ** anonSpin);
+GtkWidget *makeSearchResultFrame (struct GC_Configuration *cfg,
+                                  GtkWidget ** treeview,
+                                  GtkWidget ** anonSpin);
 
 /**
  * Parse a time given in the form
@@ -52,7 +49,6 @@ makeSearchResultFrame(struct GC_Configuration * cfg,
  * @param val set to the computed time
  * @return OK on success, SYSERR on error
  */
-int parseTime(const char * t,
-              TIME_T * val);
+int parseTime (const char *t, TIME_T * val);
 
 #endif
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index c1665251..b5861ebf 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -31,602 +31,541 @@
 #include "fs.h"
 #include <extractor.h>
 
-static int publishMetaData(EXTRACTOR_KeywordType type,
-                           const char * data,
-                           void * cls) {
-  GtkListStore * store = cls;
-  const char * stype;
+static int
+publishMetaData (EXTRACTOR_KeywordType type, const char *data, void *cls)
+{
+  GtkListStore *store = cls;
+  const char *stype;
   GtkTreeIter iter;
 
-  stype = EXTRACTOR_getKeywordTypeAsString(type);
-  if (stype == NULL) /* wrong LE version!? */
+  stype = EXTRACTOR_getKeywordTypeAsString (type);
+  if (stype == NULL)            /* wrong LE version!? */
     stype = _("unknown");
-  gtk_list_store_append(store,
-                        &iter);
-  gtk_list_store_set(store,
-                     &iter,
-                     META_TYPE, type,
-                     META_STYPE, stype,
-                     META_VALUE, data,
-                     -1);
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store,
+                      &iter,
+                      META_TYPE, type,
+                      META_STYPE, stype, META_VALUE, data, -1);
   return OK;
 }
 
-void createMetaDataListTreeView(GladeXML * xml,
-                                const char * name,
-                                const char * previewName,
-                                const struct ECRS_MetaData * init) {
-  GtkTreeView * metaList;
-  GtkListStore * metamodel;
-  GtkCellRenderer * renderer;
-  GtkWidget * preview;
-  GdkPixbuf * pixbuf;
-  GdkPixbufLoader * loader;
-  unsigned char * thumb;
+void
+createMetaDataListTreeView (GladeXML * xml,
+                            const char *name,
+                            const char *previewName,
+                            const struct ECRS_MetaData *init)
+{
+  GtkTreeView *metaList;
+  GtkListStore *metamodel;
+  GtkCellRenderer *renderer;
+  GtkWidget *preview;
+  GdkPixbuf *pixbuf;
+  GdkPixbufLoader *loader;
+  unsigned char *thumb;
   size_t ts;
-  GtkTreeViewColumn * column;
+  GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   metamodel
-    = gtk_list_store_new(META_NUM,
-                         G_TYPE_INT,
-                         G_TYPE_STRING,
-                         G_TYPE_STRING);
-  metaList = GTK_TREE_VIEW(glade_xml_get_widget(xml,
-                                                name));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(metaList),
-                              GTK_SELECTION_MULTIPLE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(metaList,
-                                                    -1,
-                                                    _("Category"),
-                                                    renderer,
-                                                    "text", META_STYPE,
-                                                    NULL);
-  column = gtk_tree_view_get_column(metaList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, META_STYPE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(metaList,
-                                                    -1,
-                                                    _("Value"),
-                                                    renderer,
-                                                    "text", META_VALUE,
-                                                    NULL);
-  column = gtk_tree_view_get_column(metaList,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, META_VALUE);
-  gtk_tree_view_set_model(metaList,
-                          GTK_TREE_MODEL(metamodel));
+    = gtk_list_store_new (META_NUM, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING);
+  metaList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (metaList),
+                               GTK_SELECTION_MULTIPLE);
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (metaList,
+                                                     -1,
+                                                     _("Category"),
+                                                     renderer,
+                                                     "text", META_STYPE,
+                                                     NULL);
+  column = gtk_tree_view_get_column (metaList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, META_STYPE);
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (metaList,
+                                                     -1,
+                                                     _("Value"),
+                                                     renderer,
+                                                     "text", META_VALUE,
+                                                     NULL);
+  column = gtk_tree_view_get_column (metaList, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, META_VALUE);
+  gtk_tree_view_set_model (metaList, GTK_TREE_MODEL (metamodel));
 
   if (init != NULL)
-    ECRS_getMetaData(init,
-                     &publishMetaData,
-                     metamodel);
-  if ( (previewName == NULL) ||
-       (init == NULL) )
+    ECRS_getMetaData (init, &publishMetaData, metamodel);
+  if ((previewName == NULL) || (init == NULL))
     return;
-  preview = glade_xml_get_widget(xml,
-                                 previewName);
+  preview = glade_xml_get_widget (xml, previewName);
 
   thumb = NULL;
-  ts = ECRS_getThumbnailFromMetaData(init,
-                                     &thumb);
-  preview = glade_xml_get_widget(xml,
-                                 previewName);  
-  if (ts != 0) {
-    loader = gdk_pixbuf_loader_new();
-    gdk_pixbuf_loader_write(loader,
-                            (const guchar*) thumb,
-                            ts,
-                            NULL);
-    pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-    g_object_ref(pixbuf);
-    gdk_pixbuf_loader_close(loader,
-                            NULL);
-    if (pixbuf != NULL) {
-      gtk_image_set_from_pixbuf(GTK_IMAGE(preview),
-                                pixbuf);
-      g_object_unref(pixbuf);
+  ts = ECRS_getThumbnailFromMetaData (init, &thumb);
+  preview = glade_xml_get_widget (xml, previewName);
+  if (ts != 0)
+    {
+      loader = gdk_pixbuf_loader_new ();
+      gdk_pixbuf_loader_write (loader, (const guchar *) thumb, ts, NULL);
+      pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+      g_object_ref (pixbuf);
+      gdk_pixbuf_loader_close (loader, NULL);
+      if (pixbuf != NULL)
+        {
+          gtk_image_set_from_pixbuf (GTK_IMAGE (preview), pixbuf);
+          g_object_unref (pixbuf);
+        }
+      UNREF (loader);
     }
-    UNREF(loader);
-  }
-  DEBUG_END();
+  DEBUG_END ();
 }
 
-static int publishKeyword(const char * data,
-                          void * cls) {
-  GtkListStore * store = cls;
+static int
+publishKeyword (const char *data, void *cls)
+{
+  GtkListStore *store = cls;
   GtkTreeIter iter;
 
-  DEBUG_BEGIN();
-  gtk_list_store_append(store,
-                        &iter);
-  gtk_list_store_set(store,
-                     &iter,
-                     0, data,
-                     -1);
-  DEBUG_END();
+  DEBUG_BEGIN ();
+  gtk_list_store_append (store, &iter);
+  gtk_list_store_set (store, &iter, 0, data, -1);
+  DEBUG_END ();
   return OK;
 }
 
-void createKeywordListTreeView(GladeXML * xml,
-                               const char * name,
-                               const struct ECRS_URI * init) {
-  GtkTreeView * keywordList;
-  GtkListStore * keymodel;
-  GtkCellRenderer * renderer;
-  GtkTreeViewColumn * column;
-
-  DEBUG_BEGIN();
-  keymodel
-    = gtk_list_store_new(1,
-                        G_TYPE_STRING);
-  keywordList = GTK_TREE_VIEW(glade_xml_get_widget(xml,
-                                                   name));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(keywordList),
-                              GTK_SELECTION_MULTIPLE);
-  renderer = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(keywordList,
-                                              -1,
-                                              _("Keyword"),
-                                              renderer,
-                                              "text", 0,
-                                              NULL);
-  column = gtk_tree_view_get_column(keywordList,
-                                    0);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 0);
-  gtk_tree_view_set_model(keywordList,
-                          GTK_TREE_MODEL(keymodel));
+void
+createKeywordListTreeView (GladeXML * xml,
+                           const char *name, const struct ECRS_URI *init)
+{
+  GtkTreeView *keywordList;
+  GtkListStore *keymodel;
+  GtkCellRenderer *renderer;
+  GtkTreeViewColumn *column;
+
+  DEBUG_BEGIN ();
+  keymodel = gtk_list_store_new (1, G_TYPE_STRING);
+  keywordList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (keywordList),
+                               GTK_SELECTION_MULTIPLE);
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_tree_view_insert_column_with_attributes (keywordList,
+                                               -1,
+                                               _("Keyword"),
+                                               renderer, "text", 0, NULL);
+  column = gtk_tree_view_get_column (keywordList, 0);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 0);
+  gtk_tree_view_set_model (keywordList, GTK_TREE_MODEL (keymodel));
   if (init != NULL)
-    ECRS_getKeywordsFromUri(init,
-                            &publishKeyword,
-                            keymodel);
-  DEBUG_END();
+    ECRS_getKeywordsFromUri (init, &publishKeyword, keymodel);
+  DEBUG_END ();
 }
 
-void createMetaTypeComboBox(GladeXML * xml,
-                            const char * name) {
-  const char * stype;
-  GtkWidget * metaType;
-  GtkCellRenderer * renderer;
-  GtkListStore * keywordTypeModel;
+void
+createMetaTypeComboBox (GladeXML * xml, const char *name)
+{
+  const char *stype;
+  GtkWidget *metaType;
+  GtkCellRenderer *renderer;
+  GtkListStore *keywordTypeModel;
   GtkTreeIter iter;
   EXTRACTOR_KeywordType type;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   keywordTypeModel
-    = gtk_list_store_new(KTYPE_NUM,
-                         G_TYPE_STRING,
-                         G_TYPE_INT);
-  metaType = glade_xml_get_widget(xml,
-                                  name);
-  gtk_combo_box_set_model(GTK_COMBO_BOX(metaType),
-                          GTK_TREE_MODEL(keywordTypeModel));
-  for (type=0;type<EXTRACTOR_getHighestKeywordTypeNumber();type++) {
-    stype = EXTRACTOR_getKeywordTypeAsString(type);
-    gtk_list_store_append(keywordTypeModel,
-                          &iter);
-    gtk_list_store_set(keywordTypeModel,
-                       &iter,
-                       KTYPE_STRING, stype,
-                       KTYPE_TYPE, type,
-                       -1);
-  }
-  renderer = gtk_cell_renderer_text_new();
-  gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(metaType),
-                             renderer,
-                             FALSE);
-  gtk_cell_layout_add_attribute(GTK_CELL_LAYOUT(metaType),
-                                renderer,
-                                "text", KTYPE_STRING);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(metaType),
-                           0);
-  DEBUG_END();
+    = gtk_list_store_new (KTYPE_NUM, G_TYPE_STRING, G_TYPE_INT);
+  metaType = glade_xml_get_widget (xml, name);
+  gtk_combo_box_set_model (GTK_COMBO_BOX (metaType),
+                           GTK_TREE_MODEL (keywordTypeModel));
+  for (type = 0; type < EXTRACTOR_getHighestKeywordTypeNumber (); type++)
+    {
+      stype = EXTRACTOR_getKeywordTypeAsString (type);
+      gtk_list_store_append (keywordTypeModel, &iter);
+      gtk_list_store_set (keywordTypeModel,
+                          &iter, KTYPE_STRING, stype, KTYPE_TYPE, type, -1);
+    }
+  renderer = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (metaType), renderer, FALSE);
+  gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (metaType),
+                                 renderer, "text", KTYPE_STRING);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (metaType), 0);
+  DEBUG_END ();
 }
 
-void handleKeywordListUpdate(GladeXML * xml,
-                             const char * inputLineName,
-                             const char * keywordListName) {
-  const char * keyword;
-  GtkWidget * keywordList;
-  GtkWidget * entryLine;
-  GtkListStore * keymodel;
+void
+handleKeywordListUpdate (GladeXML * xml,
+                         const char *inputLineName,
+                         const char *keywordListName)
+{
+  const char *keyword;
+  GtkWidget *keywordList;
+  GtkWidget *entryLine;
+  GtkListStore *keymodel;
   GtkTreeIter iter;
 
-  DEBUG_BEGIN();
-  keywordList = glade_xml_get_widget(xml,
-                                     keywordListName);
+  DEBUG_BEGIN ();
+  keywordList = glade_xml_get_widget (xml, keywordListName);
   keymodel
-    = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(keywordList)));
-
-  entryLine = glade_xml_get_widget(xml,
-                                   inputLineName);
-  keyword = gtk_entry_get_text(GTK_ENTRY(entryLine));
-  gtk_list_store_append(keymodel,
-                        &iter);
-  gtk_list_store_set(keymodel,
-                     &iter,
-                     0, keyword,
-                     -1);
-  gtk_entry_set_text(GTK_ENTRY(entryLine), "");
-  DEBUG_END();
+    = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (keywordList)));
+
+  entryLine = glade_xml_get_widget (xml, inputLineName);
+  keyword = gtk_entry_get_text (GTK_ENTRY (entryLine));
+  gtk_list_store_append (keymodel, &iter);
+  gtk_list_store_set (keymodel, &iter, 0, keyword, -1);
+  gtk_entry_set_text (GTK_ENTRY (entryLine), "");
+  DEBUG_END ();
 }
 
-void handleMetaDataListUpdate(GladeXML * xml,                   
-                              const char * typeInputLineName,
-                              const char * valueInputLineName,
-                              const char * metaDataListName) {
-  const char * value;
-  GtkWidget * metaList;
-  GtkWidget * entryLine;
-  GtkWidget * typeCB;
+void
+handleMetaDataListUpdate (GladeXML * xml,
+                          const char *typeInputLineName,
+                          const char *valueInputLineName,
+                          const char *metaDataListName)
+{
+  const char *value;
+  GtkWidget *metaList;
+  GtkWidget *entryLine;
+  GtkWidget *typeCB;
   EXTRACTOR_KeywordType type;
-  GtkListStore * metamodel;
-  GtkListStore * typemodel;
+  GtkListStore *metamodel;
+  GtkListStore *typemodel;
   GtkTreeIter iter;
-  char * stype;
+  char *stype;
 
-  DEBUG_BEGIN();
-  metaList = glade_xml_get_widget(xml,
-                                  metaDataListName);
+  DEBUG_BEGIN ();
+  metaList = glade_xml_get_widget (xml, metaDataListName);
   metamodel
-    = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(metaList)));
+    = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (metaList)));
 
-  entryLine = glade_xml_get_widget(xml,
-                                   valueInputLineName);
-  value = gtk_entry_get_text(GTK_ENTRY(entryLine));
-  if ( (value == NULL) || (strlen(value) == 0) )
+  entryLine = glade_xml_get_widget (xml, valueInputLineName);
+  value = gtk_entry_get_text (GTK_ENTRY (entryLine));
+  if ((value == NULL) || (strlen (value) == 0))
     return;
-  typeCB = glade_xml_get_widget(xml,
-                                typeInputLineName);
+  typeCB = glade_xml_get_widget (xml, typeInputLineName);
   typemodel
-    = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(typeCB)));
-  if (! gtk_combo_box_get_active_iter(GTK_COMBO_BOX(typeCB),
-                                      &iter))
-    return; /* oops */
-  gtk_tree_model_get(GTK_TREE_MODEL(typemodel),
-                     &iter,
-                     KTYPE_STRING, &stype,
-                     KTYPE_TYPE, &type,
-                     -1);
-  gtk_list_store_append(metamodel,
-                        &iter);
-  gtk_list_store_set(metamodel,
-                     &iter,
-                     META_TYPE, type,
-                     META_STYPE, stype,
-                     META_VALUE, value,
-                     -1);
-  gtk_entry_set_text(GTK_ENTRY(entryLine), "");
-  FREENONNULL(stype);
-  DEBUG_END();
+    = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (typeCB)));
+  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (typeCB), &iter))
+    return;                     /* oops */
+  gtk_tree_model_get (GTK_TREE_MODEL (typemodel),
+                      &iter, KTYPE_STRING, &stype, KTYPE_TYPE, &type, -1);
+  gtk_list_store_append (metamodel, &iter);
+  gtk_list_store_set (metamodel,
+                      &iter,
+                      META_TYPE, type,
+                      META_STYPE, stype, META_VALUE, value, -1);
+  gtk_entry_set_text (GTK_ENTRY (entryLine), "");
+  FREENONNULL (stype);
+  DEBUG_END ();
 }
 
-static void removeRow(GtkTreeModel * model,
-                      GtkTreePath * path,
-                      GtkTreeIter * iter,
-                      gpointer unused) {
-  gtk_list_store_remove(GTK_LIST_STORE(model),
-                        iter);
+static void
+removeRow (GtkTreeModel * model,
+           GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
+{
+  gtk_list_store_remove (GTK_LIST_STORE (model), iter);
 }
 
-void handleListRemove(GladeXML * xml,                   
-                      const char * listName) {
-  GtkWidget * list;
+void
+handleListRemove (GladeXML * xml, const char *listName)
+{
+  GtkWidget *list;
 
-  list = glade_xml_get_widget(xml,
-                              listName);
+  list = glade_xml_get_widget (xml, listName);
   ggc_tree_selection_selected_foreach
-    (gtk_tree_view_get_selection(GTK_TREE_VIEW(list)),
-     &removeRow,
-     NULL);
+    (gtk_tree_view_get_selection (GTK_TREE_VIEW (list)), &removeRow, NULL);
 }
 
 #define THUMBSIZE 128
 
 
-struct ECRS_MetaData * getMetaDataFromList(GladeXML * xml,
-                                           const char * name,
-                                           const char * previewName) {
-  GtkWidget * metaList;
-  GtkWidget * preview;
-  GtkTreeModel * metamodel;
+struct ECRS_MetaData *
+getMetaDataFromList (GladeXML * xml,
+                     const char *name, const char *previewName)
+{
+  GtkWidget *metaList;
+  GtkWidget *preview;
+  GtkTreeModel *metamodel;
   GtkTreeIter iter;
-  struct ECRS_MetaData * meta;
+  struct ECRS_MetaData *meta;
   EXTRACTOR_KeywordType type;
-  GdkPixbuf * pixbuf;
-  GdkPixbuf * out;
-  char * mvalue;
+  GdkPixbuf *pixbuf;
+  GdkPixbuf *out;
+  char *mvalue;
   size_t length;
   unsigned long width;
   unsigned long height;
-  char * thumb;
-
-  metaList = glade_xml_get_widget(xml,
-                                  name);
-  metamodel = gtk_tree_view_get_model(GTK_TREE_VIEW(metaList));
-  meta = ECRS_createMetaData();
-  if (gtk_tree_model_get_iter_first(metamodel,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(metamodel,
-                         &iter,
-                         META_TYPE, &type,
-                         META_VALUE, &mvalue,
-                         -1);
-      ECRS_addToMetaData(meta,
-                         type,
-                         mvalue);
-      FREENONNULL(mvalue);
-    } while (gtk_tree_model_iter_next(metamodel,
-                                      &iter));
-  }
+  char *thumb;
+
+  metaList = glade_xml_get_widget (xml, name);
+  metamodel = gtk_tree_view_get_model (GTK_TREE_VIEW (metaList));
+  meta = ECRS_createMetaData ();
+  if (gtk_tree_model_get_iter_first (metamodel, &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (metamodel,
+                              &iter,
+                              META_TYPE, &type, META_VALUE, &mvalue, -1);
+          ECRS_addToMetaData (meta, type, mvalue);
+          FREENONNULL (mvalue);
+        }
+      while (gtk_tree_model_iter_next (metamodel, &iter));
+    }
   if (previewName == NULL)
     return meta;
 
-  preview = glade_xml_get_widget(xml,
-                                 previewName);
-
-  if (GTK_IMAGE_PIXBUF ==
-      gtk_image_get_storage_type(GTK_IMAGE(preview))) {
-    pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(preview));
-    if (pixbuf == NULL)
-      return meta;
-    height = gdk_pixbuf_get_height(pixbuf);
-    width = gdk_pixbuf_get_width(pixbuf);
-    if ( (height > THUMBSIZE) ||
-         (width > THUMBSIZE) ) {
-      if (height > THUMBSIZE) {
-        width = width * THUMBSIZE / height;
-        height = THUMBSIZE;
-      }
-      if (width > THUMBSIZE) {
-        height = height * THUMBSIZE / width;
-        width = THUMBSIZE;
-      }
-      out = gdk_pixbuf_scale_simple(pixbuf,
-                                    width,
-                                    height,
-                                    GDK_INTERP_BILINEAR);
-      g_object_unref(pixbuf);
-      pixbuf = out;
+  preview = glade_xml_get_widget (xml, previewName);
+
+  if (GTK_IMAGE_PIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
+    {
+      pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
+      if (pixbuf == NULL)
+        return meta;
+      height = gdk_pixbuf_get_height (pixbuf);
+      width = gdk_pixbuf_get_width (pixbuf);
+      if ((height > THUMBSIZE) || (width > THUMBSIZE))
+        {
+          if (height > THUMBSIZE)
+            {
+              width = width * THUMBSIZE / height;
+              height = THUMBSIZE;
+            }
+          if (width > THUMBSIZE)
+            {
+              height = height * THUMBSIZE / width;
+              width = THUMBSIZE;
+            }
+          out = gdk_pixbuf_scale_simple (pixbuf,
+                                         width, height, GDK_INTERP_BILINEAR);
+          g_object_unref (pixbuf);
+          pixbuf = out;
+        }
+      if (pixbuf != NULL)
+        {
+          thumb = NULL;
+          if (gdk_pixbuf_save_to_buffer (pixbuf,
+                                         &thumb, &length, "png", NULL, NULL))
+            {
+              char *binary;
+
+              binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
+                                               length);
+              free (thumb);
+              ECRS_addToMetaData (meta, EXTRACTOR_THUMBNAIL_DATA, binary);
+              FREE (binary);
+            }
+        }
     }
-    if (pixbuf != NULL) {
-      thumb = NULL;
-      if (gdk_pixbuf_save_to_buffer(pixbuf,
-                                    &thumb,
-                                    &length,
-                                    "png",
-                                    NULL,
-                                    NULL)) {
-        char * binary;
-
-        binary = EXTRACTOR_binaryEncode((const unsigned char*)thumb,
-                                        length);
-        free(thumb);
-        ECRS_addToMetaData(meta,
-                           EXTRACTOR_THUMBNAIL_DATA,
-                           binary);
-        FREE(binary);   
-      }
-    }
-  }
   return meta;
 }
 
-struct ECRS_URI * getKeywordURIFromList(GladeXML * xml,
-                                        const char * name) {
-  GtkTreeModel * keymodel;
-  GtkTreeView * keyList;
+struct ECRS_URI *
+getKeywordURIFromList (GladeXML * xml, const char *name)
+{
+  GtkTreeModel *keymodel;
+  GtkTreeView *keyList;
   GtkTreeIter iter;
-  struct ECRS_URI * keywordURI;
-  char * mvalue;
-  char ** keywords;
+  struct ECRS_URI *keywordURI;
+  char *mvalue;
+  char **keywords;
   unsigned int kpos;
   unsigned int ksize;
 
-  DEBUG_BEGIN();
-  keyList = GTK_TREE_VIEW(glade_xml_get_widget(xml,
-                                               name));
-  keymodel = gtk_tree_view_get_model(keyList);
+  DEBUG_BEGIN ();
+  keyList = GTK_TREE_VIEW (glade_xml_get_widget (xml, name));
+  keymodel = gtk_tree_view_get_model (keyList);
 
   keywords = NULL;
   ksize = 0;
-  GROW(keywords,
-       ksize,
-       64);
+  GROW (keywords, ksize, 64);
   kpos = 0;
-  if (gtk_tree_model_get_iter_first(keymodel,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(keymodel,
-                         &iter,
-                         0, &mvalue,
-                         -1);
-      keywords[kpos++] = mvalue;
-      if (kpos == ksize)
-        GROW(keywords,
-             ksize,
-             kpos*2);
-    } while (gtk_tree_model_iter_next(keymodel,
-                                      &iter));
-  }
+  if (gtk_tree_model_get_iter_first (keymodel, &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (keymodel, &iter, 0, &mvalue, -1);
+          keywords[kpos++] = mvalue;
+          if (kpos == ksize)
+            GROW (keywords, ksize, kpos * 2);
+        }
+      while (gtk_tree_model_iter_next (keymodel, &iter));
+    }
   keywords[kpos] = NULL;
 
-  keywordURI = ECRS_keywordsToUri((const char**)keywords);
+  keywordURI = ECRS_keywordsToUri ((const char **) keywords);
   while (kpos > 0)
-    FREE(keywords[--kpos]);
-  GROW(keywords,
-       ksize,
-       0);
-  DEBUG_END();
+    FREE (keywords[--kpos]);
+  GROW (keywords, ksize, 0);
+  DEBUG_END ();
   return keywordURI;
 }
 
-char * updateIntervalToString(TIME_T interval) {
+char *
+updateIntervalToString (TIME_T interval)
+{
   if (interval == ECRS_SBLOCK_UPDATE_SPORADIC)
-    return strdup(_("--sporadic update--"));
+    return strdup (_("--sporadic update--"));
   if (interval == ECRS_SBLOCK_UPDATE_NONE)
-    return strdup(_("--no update--"));
-  return string_get_fancy_time_interval(interval * cronSECONDS);
+    return strdup (_("--no update--"));
+  return string_get_fancy_time_interval (interval * cronSECONDS);
 }
 
-int parseTimeInterval(const char * timeSpec,
-                      TIME_T * interval) {
+int
+parseTimeInterval (const char *timeSpec, TIME_T * interval)
+{
   if (timeSpec == NULL)
     return SYSERR;
-  if (0 == strcmp(_("--sporadic update--"),
-                  timeSpec))
+  if (0 == strcmp (_("--sporadic update--"), timeSpec))
     *interval = ECRS_SBLOCK_UPDATE_SPORADIC;
-  else if (0 == strcmp(_("--no update--"),
-                       timeSpec))
+  else if (0 == strcmp (_("--no update--"), timeSpec))
     *interval = ECRS_SBLOCK_UPDATE_NONE;
   else
-    return parseTime(timeSpec,
-                     interval);
+    return parseTime (timeSpec, interval);
   return OK;
 }
 
-int tryParseTimeInterval(GladeXML * xml,
-                         const char * intervalComboBoxEntry,
-                         TIME_T * interval) {
-  return parseTimeInterval(getEntryLineValue(xml,
-                                             intervalComboBoxEntry),
-                           interval);
+int
+tryParseTimeInterval (GladeXML * xml,
+                      const char *intervalComboBoxEntry, TIME_T * interval)
+{
+  return parseTimeInterval (getEntryLineValue (xml,
+                                               intervalComboBoxEntry),
+                            interval);
 }
 
-unsigned int getSpinButtonValue(GladeXML * xml,
-                                const char * spinButtonName) {
-  GtkWidget * spin;
+unsigned int
+getSpinButtonValue (GladeXML * xml, const char *spinButtonName)
+{
+  GtkWidget *spin;
 
-  spin = glade_xml_get_widget(xml,
-                              spinButtonName);
-  return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
+  spin = glade_xml_get_widget (xml, spinButtonName);
+  return gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
 }
 
 
 
-char * getMimeTypeFromMetaData(const struct ECRS_MetaData * meta) {
-  char * mime;
+char *
+getMimeTypeFromMetaData (const struct ECRS_MetaData *meta)
+{
+  char *mime;
 
-  mime = ECRS_getFromMetaData(meta,
-                              EXTRACTOR_MIMETYPE);
+  mime = ECRS_getFromMetaData (meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
-    mime = STRDUP(_("unknown"));
-  return validate_utf8(mime);
+    mime = STRDUP (_("unknown"));
+  return validate_utf8 (mime);
 }
 
-char * getFileNameFromMetaData(const struct ECRS_MetaData * meta) {
-  char * name;
-
-  name = ECRS_getFirstFromMetaData(meta,
-                                   EXTRACTOR_FILENAME,
-                                   EXTRACTOR_TITLE,
-                                   EXTRACTOR_ARTIST,
-                                   EXTRACTOR_AUTHOR,
-                                   EXTRACTOR_PUBLISHER,
-                                   EXTRACTOR_CREATOR,
-                                   EXTRACTOR_PRODUCER,
-                                   EXTRACTOR_UNKNOWN,
-                                   -1);
-  if (name == NULL) {
-    name = STRDUP(_("no name given"));
-  } else {
-    char * dotdot;
-
-    while (NULL != (dotdot = strstr(name, "..")))
-      dotdot[0] = dotdot[1] = '_';
-  }
-  return validate_utf8(name);
+char *
+getFileNameFromMetaData (const struct ECRS_MetaData *meta)
+{
+  char *name;
+
+  name = ECRS_getFirstFromMetaData (meta,
+                                    EXTRACTOR_FILENAME,
+                                    EXTRACTOR_TITLE,
+                                    EXTRACTOR_ARTIST,
+                                    EXTRACTOR_AUTHOR,
+                                    EXTRACTOR_PUBLISHER,
+                                    EXTRACTOR_CREATOR,
+                                    EXTRACTOR_PRODUCER,
+                                    EXTRACTOR_UNKNOWN, -1);
+  if (name == NULL)
+    {
+      name = STRDUP (_("no name given"));
+    }
+  else
+    {
+      char *dotdot;
+
+      while (NULL != (dotdot = strstr (name, "..")))
+        dotdot[0] = dotdot[1] = '_';
+    }
+  return validate_utf8 (name);
 }
 
-char * getDescriptionFromMetaData(const struct ECRS_MetaData * meta) {
-  char * desc;
-
-  desc = ECRS_getFirstFromMetaData(meta,
-                                   EXTRACTOR_DESCRIPTION,
-                                   EXTRACTOR_GENRE,
-                                   EXTRACTOR_ALBUM,
-                                   EXTRACTOR_COMMENT,
-                                   EXTRACTOR_SUBJECT,
-                                   EXTRACTOR_FORMAT,
-                                   EXTRACTOR_SIZE,
-                                   EXTRACTOR_KEYWORDS,
-                                   -1);
+char *
+getDescriptionFromMetaData (const struct ECRS_MetaData *meta)
+{
+  char *desc;
+
+  desc = ECRS_getFirstFromMetaData (meta,
+                                    EXTRACTOR_DESCRIPTION,
+                                    EXTRACTOR_GENRE,
+                                    EXTRACTOR_ALBUM,
+                                    EXTRACTOR_COMMENT,
+                                    EXTRACTOR_SUBJECT,
+                                    EXTRACTOR_FORMAT,
+                                    EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
-    desc = STRDUP("");
-  return validate_utf8(desc);
+    desc = STRDUP ("");
+  return validate_utf8 (desc);
 }
 
-GdkPixbuf * getThumbnailFromMetaData(const struct ECRS_MetaData * meta) {
-  GdkPixbuf * pixbuf;
-  GdkPixbufLoader * loader;
+GdkPixbuf *
+getThumbnailFromMetaData (const struct ECRS_MetaData * meta)
+{
+  GdkPixbuf *pixbuf;
+  GdkPixbufLoader *loader;
   size_t ts;
-  unsigned char * thumb;
+  unsigned char *thumb;
 
   thumb = NULL;
-  ts = ECRS_getThumbnailFromMetaData(meta,
-                                     &thumb);
-  if (ts != 0) {
-    loader = gdk_pixbuf_loader_new();
-    gdk_pixbuf_loader_write(loader,
-                            (const guchar*) thumb,
-                            ts,
-                            NULL);
-    pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
-    gdk_pixbuf_loader_close(loader,
-                            NULL);
-    if (pixbuf != NULL)
-      g_object_ref(pixbuf);
-    UNREF(loader);
-  } else {
-    pixbuf = NULL;
-  }
-  FREENONNULL(thumb);
+  ts = ECRS_getThumbnailFromMetaData (meta, &thumb);
+  if (ts != 0)
+    {
+      loader = gdk_pixbuf_loader_new ();
+      gdk_pixbuf_loader_write (loader, (const guchar *) thumb, ts, NULL);
+      pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+      gdk_pixbuf_loader_close (loader, NULL);
+      if (pixbuf != NULL)
+        g_object_ref (pixbuf);
+      UNREF (loader);
+    }
+  else
+    {
+      pixbuf = NULL;
+    }
+  FREENONNULL (thumb);
   return pixbuf;
 }
 
 GtkWidget *
-extractMainWidgetFromWindow(GladeXML * xml,
-                            const char * windowName) {
-  GtkContainer * window;
-  GtkWidget * ret;
-
-  window = GTK_CONTAINER(glade_xml_get_widget(xml,
-                                              windowName));
-  ret = gtk_bin_get_child(GTK_BIN(window));
-  gtk_widget_ref(ret);
-  gtk_container_remove(window, ret);
-  gtk_widget_destroy(GTK_WIDGET(window));
+extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
+{
+  GtkContainer *window;
+  GtkWidget *ret;
+
+  window = GTK_CONTAINER (glade_xml_get_widget (xml, windowName));
+  ret = gtk_bin_get_child (GTK_BIN (window));
+  gtk_widget_ref (ret);
+  gtk_container_remove (window, ret);
+  gtk_widget_destroy (GTK_WIDGET (window));
   return ret;
 }
 
-int getToggleButtonValue(GladeXML * xml,
-                         const char * widgetName) {
-  return gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml,
-                                                                             widgetName)));
+int
+getToggleButtonValue (GladeXML * xml, const char *widgetName)
+{
+  return
+    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
+                                  (glade_xml_get_widget (xml, widgetName)));
 }
 
-const char * getEntryLineValue(GladeXML * xml,
-                               const char * widgetName) {
-  GtkBin * line;
-  GtkEntry * entry;
+const char *
+getEntryLineValue (GladeXML * xml, const char *widgetName)
+{
+  GtkBin *line;
+  GtkEntry *entry;
 
-  line = GTK_BIN(glade_xml_get_widget(xml,
-                                      widgetName));
-  entry = GTK_ENTRY(gtk_bin_get_child(line));
-  return gtk_entry_get_text(entry);
+  line = GTK_BIN (glade_xml_get_widget (xml, widgetName));
+  entry = GTK_ENTRY (gtk_bin_get_child (line));
+  return gtk_entry_get_text (entry);
 }
 
 /* end of meta.c */
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index d9a0e01d..ead38bc6 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -30,67 +30,58 @@
 #include "gnunetgtk_common.h"
 #include <GNUnet/gnunet_ecrs_lib.h>
 
-void createMetaDataListTreeView(GladeXML * xml,
-                                const char * name,
-                                const char * previewName,
-                                const struct ECRS_MetaData * init);
+void createMetaDataListTreeView (GladeXML * xml,
+                                 const char *name,
+                                 const char *previewName,
+                                 const struct ECRS_MetaData *init);
 
-void createKeywordListTreeView(GladeXML * xml,
-                               const char * name,
-                               const struct ECRS_URI * init);
+void createKeywordListTreeView (GladeXML * xml,
+                                const char *name,
+                                const struct ECRS_URI *init);
 
-void createMetaTypeComboBox(GladeXML * xml,
-                            const char * name);
+void createMetaTypeComboBox (GladeXML * xml, const char *name);
 
-void handleKeywordListUpdate(GladeXML * xml,
-                             const char * inputLineName,
-                             const char * keywordListName);
+void handleKeywordListUpdate (GladeXML * xml,
+                              const char *inputLineName,
+                              const char *keywordListName);
 
-void handleMetaDataListUpdate(GladeXML * xml,                   
-                              const char * typeInputLineName,
-                              const char * valueInputLineName,
-                              const char * metaDataListName);
+void handleMetaDataListUpdate (GladeXML * xml,
+                               const char *typeInputLineName,
+                               const char *valueInputLineName,
+                               const char *metaDataListName);
 
-void handleListRemove(GladeXML * xml,                   
-                      const char * listName);
+void handleListRemove (GladeXML * xml, const char *listName);
 
-struct ECRS_MetaData *
-getMetaDataFromList(GladeXML * xml,
-                    const char * name,
-                    const char * preview);
+struct ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
+                                           const char *name,
+                                           const char *preview);
 
-struct ECRS_URI *
-getKeywordURIFromList(GladeXML * xml,
-                      const char * name);
+struct ECRS_URI *getKeywordURIFromList (GladeXML * xml, const char *name);
 
-char * updateIntervalToString(TIME_T interval);
+char *updateIntervalToString (TIME_T interval);
 
-int tryParseTimeInterval(GladeXML * xml,
-                         const char * intervalComboBoxEntry,
-                         TIME_T * interval);
+int tryParseTimeInterval (GladeXML * xml,
+                          const char *intervalComboBoxEntry,
+                          TIME_T * interval);
 
-int parseTimeInterval(const char * frequency,
-                      TIME_T * interval);
+int parseTimeInterval (const char *frequency, TIME_T * interval);
 
-char * getMimeTypeFromMetaData(const struct ECRS_MetaData * meta);
+char *getMimeTypeFromMetaData (const struct ECRS_MetaData *meta);
 
-char * getFileNameFromMetaData(const struct ECRS_MetaData * meta);
+char *getFileNameFromMetaData (const struct ECRS_MetaData *meta);
 
-char * getDescriptionFromMetaData(const struct ECRS_MetaData * meta);
+char *getDescriptionFromMetaData (const struct ECRS_MetaData *meta);
 
-unsigned int getSpinButtonValue(GladeXML * xml,
-                                const char * spinButtonName);
+unsigned int getSpinButtonValue (GladeXML * xml, const char *spinButtonName);
 
-int getToggleButtonValue(GladeXML * xml,
-                         const char * widgetName);
+int getToggleButtonValue (GladeXML * xml, const char *widgetName);
 
-const char * getEntryLineValue(GladeXML * xml,
-                               const char * widgetName);
+const char *getEntryLineValue (GladeXML * xml, const char *widgetName);
 
-GdkPixbuf * getThumbnailFromMetaData(const struct ECRS_MetaData * meta);
+GdkPixbuf *getThumbnailFromMetaData (const struct ECRS_MetaData *meta);
 
-GtkWidget * extractMainWidgetFromWindow(GladeXML * xml,
-                                        const char * windowName);
+GtkWidget *extractMainWidgetFromWindow (GladeXML * xml,
+                                        const char *windowName);
 
 
 /* end of meta.h */
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index b9145a9b..425efefe 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -40,259 +40,245 @@
 /**
  * @brief linked list of pages in the namespace notebook
  */
-typedef struct NL {
-  struct NL * next;
-  GtkWidget * treeview;
-  GtkWidget * namespacepage;
-  GtkWidget * addButton;
-  GtkWidget * updateButton;
-  GtkTreeModel * model;
-  char * name;
+typedef struct NL
+{
+  struct NL *next;
+  GtkWidget *treeview;
+  GtkWidget *namespacepage;
+  GtkWidget *addButton;
+  GtkWidget *updateButton;
+  GtkTreeModel *model;
+  char *name;
   HashCode512 id;
-  struct ECRS_MetaData * meta;
+  struct ECRS_MetaData *meta;
 } NamespaceList;
 
 /**
  * Content selection in main list of available content.
  */
-static GtkTreeSelection * content_selection;
+static GtkTreeSelection *content_selection;
 
-static NamespaceList * head;
+static NamespaceList *head;
 
-static GladeXML * metaXML;
+static GladeXML *metaXML;
 
 /**
  * The user has changed the selection either in the
  * namespace content list or the global content list.
  * Update search button status values (add/change).
  */
-static void on_namespaceContentSelectionChanged(gpointer signal,
-                                                gpointer cls) {
-  NamespaceList * list = head;
+static void
+on_namespaceContentSelectionChanged (gpointer signal, gpointer cls)
+{
+  NamespaceList *list = head;
   int count;
   int ncount;
-  GtkTreeSelection * ns;
+  GtkTreeSelection *ns;
   GtkTreeIter iter;
-  char * freq;
+  char *freq;
   int ok;
 
-  count = gtk_tree_selection_count_selected_rows(content_selection);
-  while (list != NULL) {
-    ns = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->treeview));
-    ncount = gtk_tree_selection_count_selected_rows(ns);
-    gtk_widget_set_sensitive(list->addButton,
-                             count > 0);
-    /* now check if update is legal */
-    ok = 0;
-    if ( (count == 1) &&
-         (ncount == 1) &&
-         (TRUE == gtk_tree_selection_get_selected(ns,
-                                                  NULL,
-                                                  &iter)) ) {
-      freq = NULL;
-      gtk_tree_model_get(list->model,
-                         &iter,
-                         IN_NAMESPACE_PUB_DATE_STRING, &freq,
-                         -1);
-      if ( (freq != NULL) &&
-           (0 != strcmp(freq, _("never"))) )
-        ok = 1;
-      FREENONNULL(freq);
+  count = gtk_tree_selection_count_selected_rows (content_selection);
+  while (list != NULL)
+    {
+      ns = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
+      ncount = gtk_tree_selection_count_selected_rows (ns);
+      gtk_widget_set_sensitive (list->addButton, count > 0);
+      /* now check if update is legal */
+      ok = 0;
+      if ((count == 1) &&
+          (ncount == 1) &&
+          (TRUE == gtk_tree_selection_get_selected (ns, NULL, &iter)))
+        {
+          freq = NULL;
+          gtk_tree_model_get (list->model,
+                              &iter, IN_NAMESPACE_PUB_DATE_STRING, &freq, -1);
+          if ((freq != NULL) && (0 != strcmp (freq, _("never"))))
+            ok = 1;
+          FREENONNULL (freq);
+        }
+      gtk_widget_set_sensitive (list->updateButton, ok);
+      list = list->next;
     }
-    gtk_widget_set_sensitive(list->updateButton,
-                             ok);
-    list = list->next;
-  }
 }
 
 
-static void makeNamespaceFrame(NamespaceList * entry) {
-  GtkWidget * child;
-  GtkWidget * resultList;
-  GtkCellRenderer * renderer;
-  GtkListStore * model;
-  GladeXML * namespaceXML;
-  GtkTreeViewColumn * column;
+static void
+makeNamespaceFrame (NamespaceList * entry)
+{
+  GtkWidget *child;
+  GtkWidget *resultList;
+  GtkCellRenderer *renderer;
+  GtkListStore *model;
+  GladeXML *namespaceXML;
+  GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   namespaceXML
-    = glade_xml_new(getGladeFileName(),
-                    "namespaceContentFrame",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(namespaceXML);
-  child = extractMainWidgetFromWindow(namespaceXML,
-                                      "namespaceContentFrame");
-  resultList = glade_xml_get_widget(namespaceXML,
-                                    "namespaceContentFrameTreeView");
-  entry->addButton = glade_xml_get_widget(namespaceXML,
-                                          "addButton");
-  entry->updateButton = glade_xml_get_widget(namespaceXML,
-                                             "namespaceUpdateButton");
-  entry->treeview = GTK_WIDGET(GTK_TREE_VIEW(resultList));
-  model =
-    gtk_list_store_new(IN_NAMESPACE_NUM,
-                       G_TYPE_STRING, /* (file)name */
-                       G_TYPE_UINT64,  /* size */
-                       G_TYPE_STRING,  /* human-readable size */
-                       G_TYPE_STRING, /* description */
-                       G_TYPE_STRING, /* mime-type */
-                       G_TYPE_STRING, /* last-ID */
-                       G_TYPE_STRING, /* next-ID */
-                       G_TYPE_STRING, /* pub-freq */
-                       G_TYPE_STRING, /* next pub date */
-                       G_TYPE_POINTER,  /* URI */
-                       G_TYPE_POINTER);  /* META */
-  entry->model = GTK_TREE_MODEL(model);
-  gtk_tree_view_set_model(GTK_TREE_VIEW(resultList),
-                          GTK_TREE_MODEL(model));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(resultList)),
-                              GTK_SELECTION_SINGLE);
-  g_signal_connect_data(gtk_tree_view_get_selection(GTK_TREE_VIEW(resultList)),
-                        "changed",
-                        G_CALLBACK(&on_namespaceContentSelectionChanged),
-                        NULL,
-                        NULL,
-                        0);
-
-
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Filename"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_FILENAME,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_FILENAME);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
+    = glade_xml_new (getGladeFileName (),
+                     "namespaceContentFrame", PACKAGE_NAME);
+  connectGladeWithPlugins (namespaceXML);
+  child = extractMainWidgetFromWindow (namespaceXML, "namespaceContentFrame");
+  resultList = glade_xml_get_widget (namespaceXML,
+                                     "namespaceContentFrameTreeView");
+  entry->addButton = glade_xml_get_widget (namespaceXML, "addButton");
+  entry->updateButton = glade_xml_get_widget (namespaceXML,
+                                              "namespaceUpdateButton");
+  entry->treeview = GTK_WIDGET (GTK_TREE_VIEW (resultList));
+  model = gtk_list_store_new (IN_NAMESPACE_NUM, G_TYPE_STRING,  /* (file)name */
+                              G_TYPE_UINT64,    /* size */
+                              G_TYPE_STRING,    /* human-readable size */
+                              G_TYPE_STRING,    /* description */
+                              G_TYPE_STRING,    /* mime-type */
+                              G_TYPE_STRING,    /* last-ID */
+                              G_TYPE_STRING,    /* next-ID */
+                              G_TYPE_STRING,    /* pub-freq */
+                              G_TYPE_STRING,    /* next pub date */
+                              G_TYPE_POINTER,   /* URI */
+                              G_TYPE_POINTER);  /* META */
+  entry->model = GTK_TREE_MODEL (model);
+  gtk_tree_view_set_model (GTK_TREE_VIEW (resultList),
+                           GTK_TREE_MODEL (model));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW (resultList)),
+                               GTK_SELECTION_SINGLE);
+  g_signal_connect_data (gtk_tree_view_get_selection
+                         (GTK_TREE_VIEW (resultList)), "changed",
+                         G_CALLBACK (&on_namespaceContentSelectionChanged),
+                         NULL, NULL, 0);
+
+
+
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Filename"), renderer,
+                                                 "text",
+                                                 IN_NAMESPACE_FILENAME, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, IN_NAMESPACE_FILENAME);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "xalign", 1.00, NULL);
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Filesize"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_HSIZE,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_SIZE);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Description"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_DESCRIPTION,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_DESCRIPTION);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Mime-type"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_MIMETYPE,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_MIMETYPE);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Publication Frequency"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_PUB_FREQ_STRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_PUB_FREQ_STRING);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Next Publication Date"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_PUB_DATE_STRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, IN_NAMESPACE_PUB_DATE_STRING);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Last ID"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_LAST_STRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
-                                              -1,
-                                              _("Next ID"),
-                                              renderer,
-                                              "text", IN_NAMESPACE_NEXT_STRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                    col - 1);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(resultList),
-                                              col - 1),
-                                              TRUE);
-
-                                
-  UNREF(namespaceXML);
-  DEBUG_END();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Filesize"), renderer,
+                                                 "text", IN_NAMESPACE_HSIZE,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, IN_NAMESPACE_SIZE);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Description"),
+                                                 renderer, "text",
+                                                 IN_NAMESPACE_DESCRIPTION,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, IN_NAMESPACE_DESCRIPTION);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Mime-type"), renderer,
+                                                 "text",
+                                                 IN_NAMESPACE_MIMETYPE, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, IN_NAMESPACE_MIMETYPE);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1,
+                                                 _("Publication Frequency"),
+                                                 renderer, "text",
+                                                 IN_NAMESPACE_PUB_FREQ_STRING,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column,
+                                           IN_NAMESPACE_PUB_FREQ_STRING);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1,
+                                                 _("Next Publication Date"),
+                                                 renderer, "text",
+                                                 IN_NAMESPACE_PUB_DATE_STRING,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column,
+                                           IN_NAMESPACE_PUB_DATE_STRING);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Last ID"), renderer,
+                                                 "text",
+                                                 IN_NAMESPACE_LAST_STRING,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (resultList),
+                                                 -1, _("Next ID"), renderer,
+                                                 "text",
+                                                 IN_NAMESPACE_NEXT_STRING,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (resultList), col - 1);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (resultList), col - 1),
+                                      TRUE);
+
+
+  UNREF (namespaceXML);
+  DEBUG_END ();
 
   entry->namespacepage = child;
 }
@@ -311,263 +297,245 @@ static void makeNamespaceFrame(NamespaceList * entry) {
  *  next update (0 for sporadic updates)
  * @return OK to continue iteration, SYSERR to abort
  */
-static int addNamespaceContentToModel(void * cls,
-                                      const ECRS_FileInfo * fi,
-                                      const HashCode512 * lastId,
-                                      const HashCode512 * nextId,
-                                      TIME_T publicationFrequency,
-                                      TIME_T nextPublicationTime) {
-  GtkListStore * model = GTK_LIST_STORE(cls);
+static int
+addNamespaceContentToModel (void *cls,
+                            const ECRS_FileInfo * fi,
+                            const HashCode512 * lastId,
+                            const HashCode512 * nextId,
+                            TIME_T publicationFrequency,
+                            TIME_T nextPublicationTime)
+{
+  GtkListStore *model = GTK_LIST_STORE (cls);
   GtkTreeIter iter;
-  char * filename;
-  char * desc;
-  char * mime;
-  char * uriString;
+  char *filename;
+  char *desc;
+  char *mime;
+  char *uriString;
   EncName last;
   EncName next;
-  char * freq;
-  char * date;
+  char *freq;
+  char *date;
   unsigned long long size;
-  char * size_h;
-
-  DEBUG_BEGIN();
-  filename = ECRS_getFirstFromMetaData(fi->meta,
-                                       EXTRACTOR_FILENAME,
-                                       EXTRACTOR_TITLE,
-                                       EXTRACTOR_ARTIST,
-                                       EXTRACTOR_AUTHOR,
-                                       EXTRACTOR_PUBLISHER,
-                                       EXTRACTOR_CREATOR,
-                                       EXTRACTOR_PRODUCER,
-                                       EXTRACTOR_UNKNOWN,
-                                       -1);
+  char *size_h;
+
+  DEBUG_BEGIN ();
+  filename = ECRS_getFirstFromMetaData (fi->meta,
+                                        EXTRACTOR_FILENAME,
+                                        EXTRACTOR_TITLE,
+                                        EXTRACTOR_ARTIST,
+                                        EXTRACTOR_AUTHOR,
+                                        EXTRACTOR_PUBLISHER,
+                                        EXTRACTOR_CREATOR,
+                                        EXTRACTOR_PRODUCER,
+                                        EXTRACTOR_UNKNOWN, -1);
   if (filename == NULL)
-    filename = STRDUP(_("no name given"));
-  else {
-    char *dotdot;
-
-    while (NULL != (dotdot = strstr(filename, "..")))
-      dotdot[0] = dotdot[1] = '_';
-  }
-  desc = ECRS_getFirstFromMetaData(fi->meta,
-                                   EXTRACTOR_DESCRIPTION,
-                                   EXTRACTOR_GENRE,
-                                   EXTRACTOR_ALBUM,
-                                   EXTRACTOR_COMMENT,
-                                   EXTRACTOR_SUBJECT,
-                                   EXTRACTOR_FORMAT,
-                                   EXTRACTOR_SIZE,
-                                   EXTRACTOR_KEYWORDS,
-                                   -1);
+    filename = STRDUP (_("no name given"));
+  else
+    {
+      char *dotdot;
+
+      while (NULL != (dotdot = strstr (filename, "..")))
+        dotdot[0] = dotdot[1] = '_';
+    }
+  desc = ECRS_getFirstFromMetaData (fi->meta,
+                                    EXTRACTOR_DESCRIPTION,
+                                    EXTRACTOR_GENRE,
+                                    EXTRACTOR_ALBUM,
+                                    EXTRACTOR_COMMENT,
+                                    EXTRACTOR_SUBJECT,
+                                    EXTRACTOR_FORMAT,
+                                    EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
-    desc = STRDUP("");
-  mime = ECRS_getFromMetaData(fi->meta,
-                              EXTRACTOR_MIMETYPE);
+    desc = STRDUP ("");
+  mime = ECRS_getFromMetaData (fi->meta, EXTRACTOR_MIMETYPE);
   if (mime == NULL)
-    mime = STRDUP(_("unknown"));
-  if (ECRS_isFileUri(fi->uri))
-    size = ECRS_fileSize(fi->uri);
+    mime = STRDUP (_("unknown"));
+  if (ECRS_isFileUri (fi->uri))
+    size = ECRS_fileSize (fi->uri);
   else
     size = 0;
-  uriString = ECRS_uriToString(fi->uri);
-  hash2enc(lastId, &last);
+  uriString = ECRS_uriToString (fi->uri);
+  hash2enc (lastId, &last);
   if (nextId != NULL)
-    hash2enc(nextId, &next);
+    hash2enc (nextId, &next);
   else
-    memset(&next, 0, sizeof(EncName));
+    memset (&next, 0, sizeof (EncName));
   if (publicationFrequency == ECRS_SBLOCK_UPDATE_SPORADIC)
-    date = STRDUP(_("unspecified"));
+    date = STRDUP (_("unspecified"));
   else if (publicationFrequency == ECRS_SBLOCK_UPDATE_NONE)
-    date = STRDUP(_("never"));
+    date = STRDUP (_("never"));
   else
-    date = GN_CTIME(&nextPublicationTime);
-  if (date[strlen(date)-1] == '\n')
-    date[strlen(date)-1] = '\0';
-
-  freq = updateIntervalToString(publicationFrequency);
-  size_h = string_get_fancy_byte_size(size);
-  gtk_list_store_append(model,
-                        &iter);
-  gtk_list_store_set(model,
-                     &iter,
-                     IN_NAMESPACE_FILENAME, filename,
-                     IN_NAMESPACE_SIZE, size,
-                     IN_NAMESPACE_HSIZE, size_h,
-                     IN_NAMESPACE_DESCRIPTION, desc,
-                     IN_NAMESPACE_MIMETYPE, mime,
-                     IN_NAMESPACE_LAST_STRING, &last,
-                     IN_NAMESPACE_NEXT_STRING, &next,
-                     IN_NAMESPACE_PUB_FREQ_STRING, freq,
-                     IN_NAMESPACE_PUB_DATE_STRING, date,
-                     IN_NAMESPACE_URI, ECRS_dupUri(fi->uri),
-                     IN_NAMESPACE_META, ECRS_dupMetaData(fi->meta),
-                     -1);
-  FREE(size_h);
-  FREE(filename);
-  FREE(uriString);
-  FREE(freq);
-  FREE(date);
-  FREE(mime);
-  DEBUG_END();
+    date = GN_CTIME (&nextPublicationTime);
+  if (date[strlen (date) - 1] == '\n')
+    date[strlen (date) - 1] = '\0';
+
+  freq = updateIntervalToString (publicationFrequency);
+  size_h = string_get_fancy_byte_size (size);
+  gtk_list_store_append (model, &iter);
+  gtk_list_store_set (model,
+                      &iter,
+                      IN_NAMESPACE_FILENAME, filename,
+                      IN_NAMESPACE_SIZE, size,
+                      IN_NAMESPACE_HSIZE, size_h,
+                      IN_NAMESPACE_DESCRIPTION, desc,
+                      IN_NAMESPACE_MIMETYPE, mime,
+                      IN_NAMESPACE_LAST_STRING, &last,
+                      IN_NAMESPACE_NEXT_STRING, &next,
+                      IN_NAMESPACE_PUB_FREQ_STRING, freq,
+                      IN_NAMESPACE_PUB_DATE_STRING, date,
+                      IN_NAMESPACE_URI, ECRS_dupUri (fi->uri),
+                      IN_NAMESPACE_META, ECRS_dupMetaData (fi->meta), -1);
+  FREE (size_h);
+  FREE (filename);
+  FREE (uriString);
+  FREE (freq);
+  FREE (date);
+  FREE (mime);
+  DEBUG_END ();
   return OK;
 }
 
 /**
  * Add a tab for the given namespace.
  */
-int addTabForNamespace(void * unused,
-                       const char * namespaceName,
-                       const HashCode512 * namespaceId,
-                       const struct ECRS_MetaData * md,
-                       int rating) {
-  NamespaceList * list;
-  GtkWidget * label;
-  GtkWidget * notebook;
-  GtkWidget * del_menu;
-
-  if (OK != ECRS_testNamespaceExists(NULL,
-                                     cfg,
-                                     namespaceName,
-                                     namespaceId))
+int
+addTabForNamespace (void *unused,
+                    const char *namespaceName,
+                    const HashCode512 * namespaceId,
+                    const struct ECRS_MetaData *md, int rating)
+{
+  NamespaceList *list;
+  GtkWidget *label;
+  GtkWidget *notebook;
+  GtkWidget *del_menu;
+
+  if (OK != ECRS_testNamespaceExists (NULL, cfg, namespaceName, namespaceId))
     return OK;
-  DEBUG_BEGIN();
-  label = gtk_label_new(namespaceName);
-  list = MALLOC(sizeof(NamespaceList));
-  list->name = STRDUP(namespaceName);
+  DEBUG_BEGIN ();
+  label = gtk_label_new (namespaceName);
+  list = MALLOC (sizeof (NamespaceList));
+  list->name = STRDUP (namespaceName);
   list->id = *namespaceId;
-  list->meta = ECRS_dupMetaData(md);
-  makeNamespaceFrame(list);
-  list->next
-    = head;
+  list->meta = ECRS_dupMetaData (md);
+  makeNamespaceFrame (list);
+  list->next = head;
   head = list;
   /* update sensitivity of add button */
-  on_namespaceContentSelectionChanged(NULL, NULL);
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "localNamespacesNotebook");
-  gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-                           list->namespacepage,
-                           label);
-  gtk_widget_show(notebook);
+  on_namespaceContentSelectionChanged (NULL, NULL);
+  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
+                            list->namespacepage, label);
+  gtk_widget_show (notebook);
   NS_listNamespaceContent
-    (ectx,
-     cfg,
-     namespaceName,
-     &addNamespaceContentToModel,
-     list->model);
-  DEBUG_END();
+    (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
+  DEBUG_END ();
   /* enable "delete" menu entry */
 
-  del_menu = glade_xml_get_widget(getMainXML(),
-                                  "namespaceDelete");
-  gtk_widget_set_sensitive(del_menu,
-                           TRUE);
+  del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+  gtk_widget_set_sensitive (del_menu, TRUE);
   return OK;
 }
 
 
-static void frame_destroy(GtkWidget * tree) {
+static void
+frame_destroy (GtkWidget * tree)
+{
   GtkTreeIter iter;
-  struct ECRS_URI * u;
-  struct ECRS_MetaData * m;
-  NamespaceList * prev;
-  NamespaceList * pos;
-  NamespaceList * next;
-  GtkWidget * del_menu;
+  struct ECRS_URI *u;
+  struct ECRS_MetaData *m;
+  NamespaceList *prev;
+  NamespaceList *pos;
+  NamespaceList *next;
+  GtkWidget *del_menu;
 
   pos = head;
   prev = NULL;
-  while (pos != NULL) {
-    next = pos->next;
-    if (pos->treeview == tree)
-      break;
-    prev = pos;
-    pos = next;
-  }
-  if (pos == NULL) {
-    GE_BREAK(NULL, 0);
-    return;
-  }
+  while (pos != NULL)
+    {
+      next = pos->next;
+      if (pos->treeview == tree)
+        break;
+      prev = pos;
+      pos = next;
+    }
+  if (pos == NULL)
+    {
+      GE_BREAK (NULL, 0);
+      return;
+    }
   if (prev == NULL)
     head = pos->next;
   else
     prev->next = pos->next;
-  FREE(pos->name);
-  ECRS_freeMetaData(pos->meta);
-  if (gtk_tree_model_get_iter_first(pos->model,
-                                    &iter)) {
-    do {
-      gtk_tree_model_get(pos->model,
-                         &iter,
-                         IN_NAMESPACE_URI, &u,
-                         IN_NAMESPACE_META, &m,
-                         -1);
-      gtk_list_store_set(GTK_LIST_STORE(pos->model),
-                         &iter,
-                         IN_NAMESPACE_URI, NULL,
-                         IN_NAMESPACE_META, NULL,
-                         -1);
-      if (u != NULL)
-        ECRS_freeUri(u);
-      if (m != NULL)
-        ECRS_freeMetaData(m);
-    } while (gtk_tree_model_iter_next(pos->model,
-                                      &iter));
-  }
-  FREE(pos);
-  del_menu = glade_xml_get_widget(getMainXML(),
-                                  "namespaceDelete");
-  gtk_widget_set_sensitive(del_menu,
-                           head != NULL);
+  FREE (pos->name);
+  ECRS_freeMetaData (pos->meta);
+  if (gtk_tree_model_get_iter_first (pos->model, &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (pos->model,
+                              &iter,
+                              IN_NAMESPACE_URI, &u,
+                              IN_NAMESPACE_META, &m, -1);
+          gtk_list_store_set (GTK_LIST_STORE (pos->model),
+                              &iter,
+                              IN_NAMESPACE_URI, NULL,
+                              IN_NAMESPACE_META, NULL, -1);
+          if (u != NULL)
+            ECRS_freeUri (u);
+          if (m != NULL)
+            ECRS_freeMetaData (m);
+        }
+      while (gtk_tree_model_iter_next (pos->model, &iter));
+    }
+  FREE (pos);
+  del_menu = glade_xml_get_widget (getMainXML (), "namespaceDelete");
+  gtk_widget_set_sensitive (del_menu, head != NULL);
 }
 
 
 
-void namespaceDelete_clicked_fs(GtkWidget * dummy1,
-                                GtkWidget * dummy2) {
-  GtkWidget * notebook;
-  NamespaceList * list;
-  NamespaceList * prev;
+void
+namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  GtkWidget *notebook;
+  NamespaceList *list;
+  NamespaceList *prev;
   gint num;
-  GtkWidget * page;
-  GtkWidget * dialog;
+  GtkWidget *page;
+  GtkWidget *dialog;
   gint ret;
 
-  DEBUG_BEGIN();
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "localNamespacesNotebook");
-  num
-    = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  if (num == -1) {
-    /* IMPROVE-ME: disable the menu item
-       as long as this may happen! */
-    dialog = gtk_message_dialog_new
-      (NULL,
-       GTK_DIALOG_MODAL,
-       GTK_MESSAGE_ERROR,
-       GTK_BUTTONS_CLOSE,
-       _("No local namespaces available that could be deleted!"));
-    gtk_dialog_run(GTK_DIALOG(dialog));
-    gtk_widget_destroy(dialog);
-    return;
-  }
-  page
-    = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
-                                num);
-  list
-    = head;
-  prev
-    = NULL;
-  while ( (list != NULL) &&
-          (list->namespacepage != page) ) {
-    prev = list;
-    list = list->next;
-  }
-  if (list == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
+  DEBUG_BEGIN ();
+  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+  if (num == -1)
+    {
+      /* IMPROVE-ME: disable the menu item
+         as long as this may happen! */
+      dialog = gtk_message_dialog_new
+        (NULL,
+         GTK_DIALOG_MODAL,
+         GTK_MESSAGE_ERROR,
+         GTK_BUTTONS_CLOSE,
+         _("No local namespaces available that could be deleted!"));
+      gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
+      return;
+    }
+  page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
+  list = head;
+  prev = NULL;
+  while ((list != NULL) && (list->namespacepage != page))
+    {
+      prev = list;
+      list = list->next;
+    }
+  if (list == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
   /* open window to ask for confirmation,
      only then delete */
 
@@ -576,102 +544,98 @@ void namespaceDelete_clicked_fs(GtkWidget * dummy1,
      GTK_DIALOG_MODAL,
      GTK_MESSAGE_ERROR,
      GTK_BUTTONS_YES_NO,
-     _("Should the namespace `%s' really be deleted?"),
-     list->name);
-  ret = gtk_dialog_run(GTK_DIALOG(dialog));
-  gtk_widget_destroy(dialog);
+     _("Should the namespace `%s' really be deleted?"), list->name);
+  ret = gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
   if (GTK_RESPONSE_YES != ret)
     return;
-  gtk_notebook_remove_page(GTK_NOTEBOOK(notebook),
-                           num);
-  NS_deleteNamespace(ectx,
-                     cfg,
-                     list->name);
-  frame_destroy(list->treeview);
-  DEBUG_END();
+  gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), num);
+  NS_deleteNamespace (ectx, cfg, list->name);
+  frame_destroy (list->treeview);
+  DEBUG_END ();
 }
 
-typedef struct {
+typedef struct
+{
   unsigned int anonymityLevel;
-  char * namespaceName;
+  char *namespaceName;
   TIME_T updateInterval;
-  HashCode512 * lastId;
+  HashCode512 *lastId;
   HashCode512 thisId;
-  HashCode512 * nextId;
+  HashCode512 *nextId;
 } IUC;
 
 /**
  * Publish the selected file in the
  * selected namespace.
  */
-static void addToNamespaceCB(GtkTreeModel * model,
-                             GtkTreePath * path,
-                             GtkTreeIter * iter,
-                             gpointer data) {
-  IUC * cls = data;
-  struct ECRS_URI * resultURI;
-  struct ECRS_URI * dst;
-  struct ECRS_MetaData * meta;
-  NamespaceList * list;
+static void
+addToNamespaceCB (GtkTreeModel * model,
+                  GtkTreePath * path, GtkTreeIter * iter, gpointer data)
+{
+  IUC *cls = data;
+  struct ECRS_URI *resultURI;
+  struct ECRS_URI *dst;
+  struct ECRS_MetaData *meta;
+  NamespaceList *list;
   ECRS_FileInfo fi;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   dst = NULL;
-  gtk_tree_model_get(model,
-                     iter,
-                     NAMESPACE_URI, &dst,
-                     NAMESPACE_META, &meta,
-                     -1);
-  if (dst == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  resultURI = NS_addToNamespace(ectx,
-                                cfg,
-                                cls->anonymityLevel,
-                                1000, /* FIXME: priority */
-                                get_time() + 2 * cronYEARS, /* FIXME: expiration */
-                                cls->namespaceName,
-                                cls->updateInterval,
-                                cls->lastId,
-                                &cls->thisId,
-                                cls->nextId,
-                                dst,
-                                meta);
-  if (resultURI != NULL) {
-    list = head;
-    while ( (list != NULL) &&
-            (0 != strcmp(cls->namespaceName,
-                         list->name)) )
-      list = list->next;
-    if (list == NULL) {
-      GE_BREAK(ectx, 0);
-    } else {
-      /* update namespace content list! */
-      fi.uri = dst;
-      fi.meta = meta;
-      addNamespaceContentToModel(list->model,
-                                 &fi,
-                                 &cls->thisId,
-                                 cls->nextId,
-                                 cls->updateInterval,
-                                 cls->updateInterval + TIME(NULL));
+  gtk_tree_model_get (model,
+                      iter, NAMESPACE_URI, &dst, NAMESPACE_META, &meta, -1);
+  if (dst == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
+  resultURI = NS_addToNamespace (ectx, cfg, cls->anonymityLevel, 1000,  /* FIXME: priority */
+                                 get_time () + 2 * cronYEARS,   /* FIXME: expiration */
+                                 cls->namespaceName,
+                                 cls->updateInterval,
+                                 cls->lastId,
+                                 &cls->thisId, cls->nextId, dst, meta);
+  if (resultURI != NULL)
+    {
+      list = head;
+      while ((list != NULL) && (0 != strcmp (cls->namespaceName, list->name)))
+        list = list->next;
+      if (list == NULL)
+        {
+          GE_BREAK (ectx, 0);
+        }
+      else
+        {
+          /* update namespace content list! */
+          fi.uri = dst;
+          fi.meta = meta;
+          addNamespaceContentToModel (list->model,
+                                      &fi,
+                                      &cls->thisId,
+                                      cls->nextId,
+                                      cls->updateInterval,
+                                      cls->updateInterval + TIME (NULL));
+        }
+      ECRS_freeUri (resultURI);
+    }
+  else
+    {
+      infoMessage (YES,
+                   _("Failed to insert content into namespace "
+                     "(consult logs).\n"));
     }
-    ECRS_freeUri(resultURI);
-  } else {
-    infoMessage(YES,
-                _("Failed to insert content into namespace "
-                  "(consult logs).\n"));
-  }
-  DEBUG_END();
+  DEBUG_END ();
 }
 
-void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs(GtkWidget * dummy1,
-                                                                  GtkWidget * dummy2) {
-  handleMetaDataListUpdate(metaXML,
-                           "namespaceInsertMetaTypeComboBox",
-                           "metaDataValueEntry",
-                           "metaDataTreeView");
+void
+on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs (GtkWidget *
+                                                              dummy1,
+                                                              GtkWidget *
+                                                              dummy2)
+{
+  handleMetaDataListUpdate (metaXML,
+                            "namespaceInsertMetaTypeComboBox",
+                            "metaDataValueEntry", "metaDataTreeView");
 }
 
 /**
@@ -679,104 +643,93 @@ void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs(GtkWidget * du
  * available content list to the currently selected
  * namespace.
  */
-void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
-                                         GtkWidget * dummy2) {
-
-  const char * identifierName;
-  NamespaceList * list;
-  GtkWidget * nameLine;
-  GtkWidget * page;
-  GtkWidget * notebook;
-  GtkWidget * dialog;
-  GtkWidget * updateIntervalComboBox;
+void
+on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+
+  const char *identifierName;
+  NamespaceList *list;
+  GtkWidget *nameLine;
+  GtkWidget *page;
+  GtkWidget *notebook;
+  GtkWidget *dialog;
+  GtkWidget *updateIntervalComboBox;
   HashCode512 nextId;
   IUC cls;
   gint num;
 
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "localNamespacesNotebook");
-  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  GE_ASSERT(ectx, num != -1);
-  page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
-                                  num);
+  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+  GE_ASSERT (ectx, num != -1);
+  page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
   list = head;
-  while ( (list != NULL) &&
-          (list->namespacepage != page) )
+  while ((list != NULL) && (list->namespacepage != page))
     list = list->next;
-  if (list == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
+  if (list == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
   cls.namespaceName = list->name;
 
   metaXML
-    = glade_xml_new(getGladeFileName(),
-                    "namespaceInsertDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(metaXML);
-  dialog = glade_xml_get_widget(metaXML,
-                                "namespaceInsertDialog");
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-                                  GTK_RESPONSE_OK);
-
-  updateIntervalComboBox = glade_xml_get_widget(metaXML,
-                                                "updateIntervalComboBoxEntry");
-  gtk_combo_box_set_active(GTK_COMBO_BOX(updateIntervalComboBox),
-                           0);
-
-
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    if (OK != tryParseTimeInterval(metaXML,
-                                   "updateIntervalComboBoxEntry",
-                                   &cls.updateInterval)) {
-      /* this should be impossible - OK button is
-         deactivated while parse errors are there */
-      gtk_widget_destroy(dialog);
-      UNREF(metaXML);
-      metaXML = NULL;
-      dialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE,
-         _("Failed to parse given time interval!"));
-      gtk_dialog_run(GTK_DIALOG(dialog));
-      gtk_widget_destroy(dialog);
-      return;
+    = glade_xml_new (getGladeFileName (),
+                     "namespaceInsertDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (metaXML);
+  dialog = glade_xml_get_widget (metaXML, "namespaceInsertDialog");
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+  updateIntervalComboBox = glade_xml_get_widget (metaXML,
+                                                 "updateIntervalComboBoxEntry");
+  gtk_combo_box_set_active (GTK_COMBO_BOX (updateIntervalComboBox), 0);
+
+
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      if (OK != tryParseTimeInterval (metaXML,
+                                      "updateIntervalComboBoxEntry",
+                                      &cls.updateInterval))
+        {
+          /* this should be impossible - OK button is
+             deactivated while parse errors are there */
+          gtk_widget_destroy (dialog);
+          UNREF (metaXML);
+          metaXML = NULL;
+          dialog = gtk_message_dialog_new
+            (NULL,
+             GTK_DIALOG_MODAL,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+          return;
+        }
+      cls.anonymityLevel
+        = getSpinButtonValue (metaXML, "anonymitySpinButton");
+      nameLine = glade_xml_get_widget (metaXML,
+                                       "namespaceContentIdentifierEntry");
+      identifierName = gtk_entry_get_text (GTK_ENTRY (nameLine));
+      if (identifierName == NULL)
+        identifierName = "";
+      hash (identifierName, strlen (identifierName), &cls.thisId);
+      cls.lastId = NULL;
+
+      nameLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
+      identifierName = gtk_entry_get_text (GTK_ENTRY (nameLine));
+      if ((identifierName == NULL) || (strlen (identifierName) == 0))
+        {
+          cls.nextId = NULL;
+        }
+      else
+        {
+          hash (identifierName, strlen (identifierName), &nextId);
+          cls.nextId = &nextId;
+        }
+      ggc_tree_selection_selected_foreach
+        (content_selection, &addToNamespaceCB, &cls);
     }
-    cls.anonymityLevel
-      = getSpinButtonValue(metaXML,
-                           "anonymitySpinButton");
-    nameLine = glade_xml_get_widget(metaXML,
-                                    "namespaceContentIdentifierEntry");
-    identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    if (identifierName == NULL)
-      identifierName = "";
-    hash(identifierName,
-         strlen(identifierName),
-         &cls.thisId);
-    cls.lastId = NULL;
-
-    nameLine = glade_xml_get_widget(metaXML,
-                                    "nextIdentifierEntry");
-    identifierName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    if ( (identifierName == NULL) ||
-         (strlen(identifierName) == 0)) {
-      cls.nextId = NULL;
-    } else {
-      hash(identifierName,
-           strlen(identifierName),
-           &nextId);
-      cls.nextId = &nextId;
-    }
-    ggc_tree_selection_selected_foreach
-      (content_selection,
-       &addToNamespaceCB,
-       &cls);
-  }
-  gtk_widget_destroy(dialog);
-  UNREF(metaXML);
+  gtk_widget_destroy (dialog);
+  UNREF (metaXML);
   metaXML = NULL;
 }
 
@@ -785,288 +738,243 @@ void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
  * User clicked on update; launch update dialog
  * and perform namespace content update.
  */
-void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
-                                         GtkWidget * dummy2) {
-  NamespaceList * list;
+void
+on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  NamespaceList *list;
   GtkTreeIter iter;
   HashCode512 nextId;
   HashCode512 lastId;
-  GtkTreeSelection * selection;
+  GtkTreeSelection *selection;
   IUC cls;
-  char * last;
-  char * next;
-  char * freq;
+  char *last;
+  char *next;
+  char *freq;
   EncName nextnext;
-  GtkWidget * nextEntryLine;
-  GtkWidget * identifierLabel;
-  GtkWidget * updateIntervalComboBox;
-  GtkWidget * dialog;
-  GtkWidget * mdialog;
-  GtkWidget * notebook;
-  GtkWidget * page;
-  GtkTreeModel * model;
+  GtkWidget *nextEntryLine;
+  GtkWidget *identifierLabel;
+  GtkWidget *updateIntervalComboBox;
+  GtkWidget *dialog;
+  GtkWidget *mdialog;
+  GtkWidget *notebook;
+  GtkWidget *page;
+  GtkTreeModel *model;
   gint num;
-  const char * nn_str;
+  const char *nn_str;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   /* find out which namespace this is about */
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "localNamespacesNotebook");
-  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  GE_ASSERT(ectx, num != -1);
-  page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
-                                   num);
+  notebook = glade_xml_get_widget (getMainXML (), "localNamespacesNotebook");
+  num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
+  GE_ASSERT (ectx, num != -1);
+  page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
   list = head;
-  while ( (list != NULL) &&
-          (list->namespacepage != page) )
+  while ((list != NULL) && (list->namespacepage != page))
     list = list->next;
-  if (list == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
+  if (list == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
   cls.namespaceName = list->name;
 
   /* find out what we are updating */
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->treeview));
-  if (TRUE != gtk_tree_selection_get_selected(selection,
-                                              NULL,
-                                              &iter)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  gtk_tree_model_get(list->model,
-                     &iter,
-                     IN_NAMESPACE_LAST_STRING, &last,
-                     IN_NAMESPACE_NEXT_STRING, &next,
-                     IN_NAMESPACE_PUB_FREQ_STRING, &freq,
-                     -1);
-  if ( (last == NULL) ||
-       (next == NULL) ||
-       (freq == NULL) ) {
-    GE_BREAK(NULL, 0);
-    return;
-  }
-  if (OK != parseTimeInterval(freq,
-                              &cls.updateInterval)) {
-    GE_BREAK(ectx, 0);
-    cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
-  }
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (list->treeview));
+  if (TRUE != gtk_tree_selection_get_selected (selection, NULL, &iter))
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
+  gtk_tree_model_get (list->model,
+                      &iter,
+                      IN_NAMESPACE_LAST_STRING, &last,
+                      IN_NAMESPACE_NEXT_STRING, &next,
+                      IN_NAMESPACE_PUB_FREQ_STRING, &freq, -1);
+  if ((last == NULL) || (next == NULL) || (freq == NULL))
+    {
+      GE_BREAK (NULL, 0);
+      return;
+    }
+  if (OK != parseTimeInterval (freq, &cls.updateInterval))
+    {
+      GE_BREAK (ectx, 0);
+      cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
+    }
 
   /* create update dialog */
   metaXML
-    = glade_xml_new(getGladeFileName(),
-                    "namespaceUpdateDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(metaXML);
-  dialog = glade_xml_get_widget(metaXML,
-                                "namespaceUpdateDialog");
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-                                  GTK_RESPONSE_OK);
-  identifierLabel = glade_xml_get_widget(metaXML,
-                                         "identifierLabel");
-  gtk_label_set_text(GTK_LABEL(identifierLabel),
-                     next);
-  enc2hash(last, &lastId);
+    = glade_xml_new (getGladeFileName (),
+                     "namespaceUpdateDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (metaXML);
+  dialog = glade_xml_get_widget (metaXML, "namespaceUpdateDialog");
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  identifierLabel = glade_xml_get_widget (metaXML, "identifierLabel");
+  gtk_label_set_text (GTK_LABEL (identifierLabel), next);
+  enc2hash (last, &lastId);
   cls.lastId = &lastId;
-  enc2hash(next, &cls.thisId);
-
-  nextEntryLine = glade_xml_get_widget(metaXML,
-                                       "nextIdentifierEntry");
-  if ( (cls.updateInterval != ECRS_SBLOCK_UPDATE_SPORADIC) &&
-       (OK == NS_computeNextId(NULL,
-                               cfg,
-                               cls.namespaceName,
-                               &lastId,
-                               &cls.thisId,
-                               cls.updateInterval,
-                               &nextId)) ) {
-    hash2enc(&nextId,
-             &nextnext);
-    gtk_entry_set_text(GTK_ENTRY(nextEntryLine),
-                       (char*) &nextnext);
-    gtk_widget_set_sensitive(nextEntryLine,
-                             FALSE);
-  }
+  enc2hash (next, &cls.thisId);
+
+  nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
+  if ((cls.updateInterval != ECRS_SBLOCK_UPDATE_SPORADIC) &&
+      (OK == NS_computeNextId (NULL,
+                               cfg,
+                               cls.namespaceName,
+                               &lastId,
+                               &cls.thisId, cls.updateInterval, &nextId)))
+    {
+      hash2enc (&nextId, &nextnext);
+      gtk_entry_set_text (GTK_ENTRY (nextEntryLine), (char *) &nextnext);
+      gtk_widget_set_sensitive (nextEntryLine, FALSE);
+    }
   /* set update interval in dialog to
      the existing update interval */
-  updateIntervalComboBox = glade_xml_get_widget(metaXML,
-                                                "namespaceUpdateIntervalComboBoxEntry");
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(updateIntervalComboBox));
-  gtk_list_store_insert(GTK_LIST_STORE(model),
-                        &iter,
-                        0);
-  gtk_list_store_set(GTK_LIST_STORE(model),
-                     &iter,
-                     0, freq,
-                     -1);
-  gtk_combo_box_set_active(GTK_COMBO_BOX(updateIntervalComboBox),
-                           0);
+  updateIntervalComboBox = glade_xml_get_widget (metaXML,
+                                                 "namespaceUpdateIntervalComboBoxEntry");
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (updateIntervalComboBox));
+  gtk_list_store_insert (GTK_LIST_STORE (model), &iter, 0);
+  gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, freq, -1);
+  gtk_combo_box_set_active (GTK_COMBO_BOX (updateIntervalComboBox), 0);
 
   /* run update dialog */
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
     goto CLEANUP;
-  gtk_widget_hide(dialog);
+  gtk_widget_hide (dialog);
 
   /* get data from update dialog */
-  nn_str = gtk_entry_get_text(GTK_ENTRY(nextEntryLine));
+  nn_str = gtk_entry_get_text (GTK_ENTRY (nextEntryLine));
   if (nn_str == NULL)
     nn_str = "";
-  hash(nn_str,
-       strlen(nn_str),
-       &nextId);
+  hash (nn_str, strlen (nn_str), &nextId);
   cls.nextId = &nextId;
 
-  if (OK != tryParseTimeInterval(metaXML,
-                                 "namespaceUpdateIntervalComboBoxEntry",
-                                 &cls.updateInterval)) {
-    /* This should be impossible since the
-       the OK button is deactivated while parse errors are present */
-    mdialog = gtk_message_dialog_new
-      (NULL,
-       GTK_DIALOG_MODAL,
-       GTK_MESSAGE_ERROR,
-       GTK_BUTTONS_CLOSE,
-       _("Failed to parse given time interval!"));
-    gtk_dialog_run(GTK_DIALOG(mdialog));
-    gtk_widget_destroy(mdialog);
-    goto CLEANUP;
-  }
+  if (OK != tryParseTimeInterval (metaXML,
+                                  "namespaceUpdateIntervalComboBoxEntry",
+                                  &cls.updateInterval))
+    {
+      /* This should be impossible since the
+         the OK button is deactivated while parse errors are present */
+      mdialog = gtk_message_dialog_new
+        (NULL,
+         GTK_DIALOG_MODAL,
+         GTK_MESSAGE_ERROR,
+         GTK_BUTTONS_CLOSE, _("Failed to parse given time interval!"));
+      gtk_dialog_run (GTK_DIALOG (mdialog));
+      gtk_widget_destroy (mdialog);
+      goto CLEANUP;
+    }
   cls.anonymityLevel
-    = getSpinButtonValue(metaXML,
-                         "namespaceUpdateAnonymitySpinButton");
+    = getSpinButtonValue (metaXML, "namespaceUpdateAnonymitySpinButton");
 
   /* run actual update */
   ggc_tree_selection_selected_foreach
-    (content_selection,
-     &addToNamespaceCB,
-     &cls);
- CLEANUP:
-  gtk_widget_destroy(dialog);
-  UNREF(metaXML);
+    (content_selection, &addToNamespaceCB, &cls);
+CLEANUP:
+  gtk_widget_destroy (dialog);
+  UNREF (metaXML);
   metaXML = NULL;
-  free(last);
-  free(next);
-  free(freq);
-  DEBUG_END();
+  free (last);
+  free (next);
+  free (freq);
+  DEBUG_END ();
 }
 
 
 
-void fs_namespace_start() {
-  GtkWidget * contentList;
-  GtkListStore * model;
-  GtkCellRenderer * renderer;
-  GtkWidget * trackCheckButton;
-  GtkTreeViewColumn * column;
+void
+fs_namespace_start ()
+{
+  GtkWidget *contentList;
+  GtkListStore *model;
+  GtkCellRenderer *renderer;
+  GtkWidget *trackCheckButton;
+  GtkTreeViewColumn *column;
   int col;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   trackCheckButton
-    = glade_xml_get_widget(getMainXML(),
-                           "trackingCheckButton");
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheckButton),
-                               URITRACK_trackStatus(ectx,
-                                                    cfg) == YES ? TRUE : FALSE);
-
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-
-  model = gtk_list_store_new(NAMESPACE_NUM,
-                             G_TYPE_STRING, /* name */
-                             G_TYPE_UINT64, /* size */
-                             G_TYPE_STRING, /* human-readable size */
-                             G_TYPE_STRING, /* uri-string */
-                             G_TYPE_POINTER,
-                             G_TYPE_POINTER); /* uri */
-  gtk_tree_view_set_model(GTK_TREE_VIEW(contentList),
-                          GTK_TREE_MODEL(model));
-  content_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList));
-  gtk_tree_selection_set_mode(content_selection,
-                              GTK_SELECTION_MULTIPLE);
-
-  g_signal_connect_data(content_selection,
-                        "changed",
-                        G_CALLBACK(&on_namespaceContentSelectionChanged),
-                        NULL,
-                        NULL,
-                        0);
-
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(contentList),
-                                              -1,
-                                              _("Filename"),
-                                              renderer,
-                                              "text", NAMESPACE_FILENAME,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, NAMESPACE_FILENAME);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
+    = glade_xml_get_widget (getMainXML (), "trackingCheckButton");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (trackCheckButton),
+                                URITRACK_trackStatus (ectx,
+                                                      cfg) ==
+                                YES ? TRUE : FALSE);
+
+  contentList = glade_xml_get_widget (getMainXML (), "availableContentList");
+
+  model = gtk_list_store_new (NAMESPACE_NUM, G_TYPE_STRING,     /* name */
+                              G_TYPE_UINT64,    /* size */
+                              G_TYPE_STRING,    /* human-readable size */
+                              G_TYPE_STRING,    /* uri-string */
+                              G_TYPE_POINTER, G_TYPE_POINTER);  /* uri */
+  gtk_tree_view_set_model (GTK_TREE_VIEW (contentList),
+                           GTK_TREE_MODEL (model));
+  content_selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW (contentList));
+  gtk_tree_selection_set_mode (content_selection, GTK_SELECTION_MULTIPLE);
+
+  g_signal_connect_data (content_selection,
+                         "changed",
+                         G_CALLBACK (&on_namespaceContentSelectionChanged),
+                         NULL, NULL, 0);
+
+
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (contentList),
+                                                 -1, _("Filename"), renderer,
+                                                 "text", NAMESPACE_FILENAME,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (contentList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, NAMESPACE_FILENAME);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (contentList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "xalign", 1.00, NULL);
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(contentList),
-                                                    -1,
-                                                    _("Filesize"),
-                                                    renderer,
-                                                    "text", NAMESPACE_HSIZE,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, NAMESPACE_SIZE);
-  /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                              col - 1),
-                                              TRUE);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(contentList),
-                                              -1,
-                                              _("URI"),
-                                              renderer,
-                                              "text", NAMESPACE_URISTRING,
-                                              NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                    col - 1);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
-                                                              col - 1),
-                                     TRUE);
-  URITRACK_registerTrackCallback(ectx,
-                                 cfg,
-                                 &updateViewSave,
-                                 NULL);
-  NS_listNamespaces(ectx,
-                    cfg,
-                    &addTabForNamespace,
-                    NULL);
-  NS_registerDiscoveryCallback(ectx,
-                               cfg,
-                               &namespace_discovered_cb,
-                               NULL);
-  DEBUG_END();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (contentList),
+                                                 -1, _("Filesize"), renderer,
+                                                 "text", NAMESPACE_HSIZE,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (contentList), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, NAMESPACE_SIZE);
+  /*gtk_tree_view_column_set_sort_indicator(column, TRUE); */
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (contentList), col - 1),
+                                      TRUE);
+  renderer = gtk_cell_renderer_text_new ();
+  col =
+    gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (contentList),
+                                                 -1, _("URI"), renderer,
+                                                 "text", NAMESPACE_URISTRING,
+                                                 NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (contentList), col - 1);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
+                                      (GTK_TREE_VIEW (contentList), col - 1),
+                                      TRUE);
+  URITRACK_registerTrackCallback (ectx, cfg, &updateViewSave, NULL);
+  NS_listNamespaces (ectx, cfg, &addTabForNamespace, NULL);
+  NS_registerDiscoveryCallback (ectx, cfg, &namespace_discovered_cb, NULL);
+  DEBUG_END ();
 }
 
 
-void fs_namespace_stop() {
-  NS_unregisterDiscoveryCallback(&namespace_discovered_cb,
-                                 NULL);
+void
+fs_namespace_stop ()
+{
+  NS_unregisterDiscoveryCallback (&namespace_discovered_cb, NULL);
   while (head != NULL)
-    frame_destroy(head->treeview);
-  URITRACK_unregisterTrackCallback(&updateViewSave,
-                                   NULL);
+    frame_destroy (head->treeview);
+  URITRACK_unregisterTrackCallback (&updateViewSave, NULL);
 }
 
 /* end of namespace.c */
diff --git a/src/plugins/fs/namespace.h b/src/plugins/fs/namespace.h
index f0a251f5..3343e561 100644
--- a/src/plugins/fs/namespace.h
+++ b/src/plugins/fs/namespace.h
@@ -30,15 +30,14 @@
 /**
  * Add a tab for the given namespace.
  */
-int addTabForNamespace(void * unused,
-                       const char * namespaceName,
-                       const HashCode512 * namespaceId,
-                       const struct ECRS_MetaData * md,
-                       int rating);
+int addTabForNamespace (void *unused,
+                        const char *namespaceName,
+                        const HashCode512 * namespaceId,
+                        const struct ECRS_MetaData *md, int rating);
 
 
-void fs_namespace_start(void);
+void fs_namespace_start (void);
 
-void fs_namespace_stop(void);
+void fs_namespace_stop (void);
 
 #endif
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index cdd24912..1182c0a6 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -37,224 +37,220 @@
 #include <extractor.h>
 
 
-static GladeXML * metaXML;
+static GladeXML *metaXML;
 
 
-void on_namespacemetaDataDialogKeywordRemoveButton_clicked_fs(gpointer dummy,
-                                                              GtkWidget * uploadButton) {
-  handleListRemove(metaXML,
-                   "namespaceMetaDataDialogKeywordList");
+void
+on_namespacemetaDataDialogKeywordRemoveButton_clicked_fs (gpointer dummy,
+                                                          GtkWidget *
+                                                          uploadButton)
+{
+  handleListRemove (metaXML, "namespaceMetaDataDialogKeywordList");
 }
 
-void on_namespacemetaDataDialogMetaDataRemoveButton_clicked_fs(gpointer dummy,
-                                                               GtkWidget * uploadButton) {
-  handleListRemove(metaXML,
-                   "namespaceMetaDataDialogMetaDataList");
+void
+on_namespacemetaDataDialogMetaDataRemoveButton_clicked_fs (gpointer dummy,
+                                                           GtkWidget *
+                                                           uploadButton)
+{
+  handleListRemove (metaXML, "namespaceMetaDataDialogMetaDataList");
 }
 
-void on_namespacemetaDataDialogKeywordAddButton_clicked_fs(gpointer dummy,
-                                                           GtkWidget * uploadButton) {
-  handleKeywordListUpdate(metaXML,
-                          "namespaceKeywordEntry",
-                          "namespaceMetaDataDialogKeywordList");
+void
+on_namespacemetaDataDialogKeywordAddButton_clicked_fs (gpointer dummy,
+                                                       GtkWidget *
+                                                       uploadButton)
+{
+  handleKeywordListUpdate (metaXML,
+                           "namespaceKeywordEntry",
+                           "namespaceMetaDataDialogKeywordList");
 }
 
-void on_namespacemetaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy,
-                                                            GtkWidget * uploadButton) {
-  handleMetaDataListUpdate(metaXML,
-                           "namespaceMetaDataDialogMetaTypeComboBox",
-                           "namespaceMetaDataValueEntry",
-                           "namespaceMetaDataDialogMetaDataList");
+void
+on_namespacemetaDataDialogMetaDataAddButton_clicked_fs (gpointer dummy,
+                                                        GtkWidget *
+                                                        uploadButton)
+{
+  handleMetaDataListUpdate (metaXML,
+                            "namespaceMetaDataDialogMetaTypeComboBox",
+                            "namespaceMetaDataValueEntry",
+                            "namespaceMetaDataDialogMetaDataList");
 }
 
 /**
  * The selection of the keyword list changed.
  * Update button status.
  */
-static void on_keyword_list_selection_changed(gpointer signal,
-                                              gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
+static void
+on_keyword_list_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
 
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                             "namespaceMetaDataDialogKeywordList")));
-  button
-    = glade_xml_get_widget(metaXML,
-                           "nsMetaDataDialogKeywordRemoveButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (metaXML,
+                                   "namespaceMetaDataDialogKeywordList")));
+  button =
+    glade_xml_get_widget (metaXML, "nsMetaDataDialogKeywordRemoveButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The selection of the metadata list changed.
  * Update button status.
  */
-static void on_metadata_list_selection_changed(gpointer signal,
-                                               gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
+static void
+on_metadata_list_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
 
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                             "namespaceMetaDataDialogMetaDataList")));
-  button
-    = glade_xml_get_widget(metaXML,
-                           "nsMetaDataDialogMetaDataRemoveButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (metaXML,
+                                   "namespaceMetaDataDialogMetaDataList")));
+  button =
+    glade_xml_get_widget (metaXML, "nsMetaDataDialogMetaDataRemoveButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The user has edited the metadata entry.
  * Update add button status.
  */
-void on_namespaceMetaDataValueEntry_changed_fs(gpointer dummy2,
-                                               GtkWidget * searchEntry) {
-  const char * input;
-  GtkWidget * button;
+void
+on_namespaceMetaDataValueEntry_changed_fs (gpointer dummy2,
+                                           GtkWidget * searchEntry)
+{
+  const char *input;
+  GtkWidget *button;
 
-  input = gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(metaXML,
-                                                            "namespaceMetaDataValueEntry")));
+  input = gtk_entry_get_text (GTK_ENTRY (glade_xml_get_widget (metaXML,
+                                                               "namespaceMetaDataValueEntry")));
   if (input == NULL)
     return;
   button
-    = glade_xml_get_widget(metaXML,
-                           "nsMetaDataDialogMetaDataAddButton");
-  gtk_widget_set_sensitive(button,
-                           strlen(input) > 0);
+    = glade_xml_get_widget (metaXML, "nsMetaDataDialogMetaDataAddButton");
+  gtk_widget_set_sensitive (button, strlen (input) > 0);
 }
 
 /**
  * The user has edited the keyword entry.
  * Update add button status.
  */
-void on_namespaceKeywordEntry_changed_fs(gpointer dummy2,
-                                               GtkWidget * searchEntry) {
-  const char * input;
-  GtkWidget * button;
+void
+on_namespaceKeywordEntry_changed_fs (gpointer dummy2, GtkWidget * searchEntry)
+{
+  const char *input;
+  GtkWidget *button;
 
-  input = gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(metaXML,
-                                                            "namespaceKeywordEntry")));
+  input = gtk_entry_get_text (GTK_ENTRY (glade_xml_get_widget (metaXML,
+                                                               "namespaceKeywordEntry")));
   if (input == NULL)
     return;
-  button
-    = glade_xml_get_widget(metaXML,
-                           "nsMetaDataDialogKeywordAddButton");
-  gtk_widget_set_sensitive(button,
-                           strlen(input) > 0);
+  button = glade_xml_get_widget (metaXML, "nsMetaDataDialogKeywordAddButton");
+  gtk_widget_set_sensitive (button, strlen (input) > 0);
 }
 
 
-void create_namespace_clicked_fs(GtkWidget * dummy1,
-                                 GtkWidget * dummy2) {
-  const char * namespaceName;
-  GtkWidget * nameLine;
-  GtkWidget * dialog;
-  GtkWidget * spin;
-  struct ECRS_MetaData * meta;
-  struct ECRS_URI * keywordURI;
-  struct ECRS_URI * root;
+void
+create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
+{
+  const char *namespaceName;
+  GtkWidget *nameLine;
+  GtkWidget *dialog;
+  GtkWidget *spin;
+  struct ECRS_MetaData *meta;
+  struct ECRS_URI *keywordURI;
+  struct ECRS_URI *root;
   HashCode512 namespaceId;
   HashCode512 rootEntry;
 
-  DEBUG_BEGIN();
+  DEBUG_BEGIN ();
   metaXML
-    = glade_xml_new(getGladeFileName(),
-                    "namespaceMetaDataDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(metaXML);
-  dialog = glade_xml_get_widget(metaXML,
-                                "namespaceMetaDataDialog");
-  createMetaDataListTreeView(metaXML,                   
-                             "namespaceMetaDataDialogMetaDataList",
-                             NULL,
-                             NULL);
-  g_signal_connect_data(gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                                       "namespaceMetaDataDialogMetaDataList"))),
-                        "changed",
-                        G_CALLBACK(&on_metadata_list_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-  createKeywordListTreeView(metaXML,
-                            "namespaceMetaDataDialogKeywordList",
-                            NULL);
-  g_signal_connect_data(gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                                       "namespaceMetaDataDialogKeywordList"))),
-                        "changed",
-                        G_CALLBACK(&on_keyword_list_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
+    = glade_xml_new (getGladeFileName (),
+                     "namespaceMetaDataDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (metaXML);
+  dialog = glade_xml_get_widget (metaXML, "namespaceMetaDataDialog");
+  createMetaDataListTreeView (metaXML,
+                              "namespaceMetaDataDialogMetaDataList",
+                              NULL, NULL);
+  g_signal_connect_data (gtk_tree_view_get_selection
+                         (GTK_TREE_VIEW
+                          (glade_xml_get_widget
+                           (metaXML, "namespaceMetaDataDialogMetaDataList"))),
+                         "changed",
+                         G_CALLBACK (&on_metadata_list_selection_changed),
+                         NULL, NULL, 0);
+  createKeywordListTreeView (metaXML, "namespaceMetaDataDialogKeywordList",
+                             NULL);
+  g_signal_connect_data (gtk_tree_view_get_selection
+                         (GTK_TREE_VIEW
+                          (glade_xml_get_widget
+                           (metaXML, "namespaceMetaDataDialogKeywordList"))),
+                         "changed",
+                         G_CALLBACK (&on_keyword_list_selection_changed),
+                         NULL, NULL, 0);
 
-  createMetaTypeComboBox(metaXML,                       
-                         "namespaceMetaDataDialogMetaTypeComboBox");
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-                                  GTK_RESPONSE_OK);
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
-    meta
-      = getMetaDataFromList(metaXML,
-                            "namespaceMetaDataDialogMetaDataList",
-                            NULL);
-    keywordURI
-      = getKeywordURIFromList(metaXML,
-                              "namespaceMetaDataDialogKeywordList");
-    spin = glade_xml_get_widget(metaXML,
-                                "namespaceAnonymityspinbutton");
-    nameLine = glade_xml_get_widget(metaXML,
-                                    "namespaceRootEntry");
-    namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    if (namespaceName == NULL)
-      namespaceName = "root"; /* do NOT translate "root"! */
-    hash(namespaceName,
-         strlen(namespaceName),
-         &rootEntry);
-    nameLine = glade_xml_get_widget(metaXML,
-                                    "namespaceNameEntry");
-    namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    root = NS_createNamespace(ectx,
-                              cfg,
-                              gtk_spin_button_get_value_as_int
-                              (GTK_SPIN_BUTTON(spin)),
-                              1000, /* FIXME: priority */
-                              get_time() + 2 * cronYEARS, /* FIXME: expiration */
-                              namespaceName,
-                              meta,
-                              keywordURI,
-                              &rootEntry);
-    if (root != NULL) {
-      ECRS_getNamespaceId(root,
-                          &namespaceId);
-      addTabForNamespace(NULL,
-                         namespaceName,
-                         &namespaceId,
-                         meta,
-                         0);
-      ECRS_freeUri(root);
-    } else {
-      GtkWidget * dialog;
+  createMetaTypeComboBox (metaXML, "namespaceMetaDataDialogMetaTypeComboBox");
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      meta
+        = getMetaDataFromList (metaXML,
+                               "namespaceMetaDataDialogMetaDataList", NULL);
+      keywordURI
+        = getKeywordURIFromList (metaXML,
+                                 "namespaceMetaDataDialogKeywordList");
+      spin = glade_xml_get_widget (metaXML, "namespaceAnonymityspinbutton");
+      nameLine = glade_xml_get_widget (metaXML, "namespaceRootEntry");
+      namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
+      if (namespaceName == NULL)
+        namespaceName = "root"; /* do NOT translate "root"! */
+      hash (namespaceName, strlen (namespaceName), &rootEntry);
+      nameLine = glade_xml_get_widget (metaXML, "namespaceNameEntry");
+      namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
+      root = NS_createNamespace (ectx, cfg, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* FIXME: priority */
+                                 get_time () + 2 * cronYEARS,   /* FIXME: expiration */
+                                 namespaceName, meta, keywordURI, &rootEntry);
+      if (root != NULL)
+        {
+          ECRS_getNamespaceId (root, &namespaceId);
+          addTabForNamespace (NULL, namespaceName, &namespaceId, meta, 0);
+          ECRS_freeUri (root);
+        }
+      else
+        {
+          GtkWidget *dialog;
 
-      /* IMPROVE-ME: we could check if the
-         namespace exists as the user
-         enters its name and disable the
-         "Ok" button unless the name is unique */
-      dialog = gtk_message_dialog_new
-        (NULL,
-         GTK_DIALOG_MODAL,
-         GTK_MESSAGE_ERROR,
-         GTK_BUTTONS_CLOSE,
-         _("Failed to create namespace `%s'."
-           "Consult logs, most likely error is"
-           " that a namespace with that name "
-           "already exists."),
-         namespaceName);
-      gtk_dialog_run(GTK_DIALOG(dialog));
-      gtk_widget_destroy(dialog);
+          /* IMPROVE-ME: we could check if the
+             namespace exists as the user
+             enters its name and disable the
+             "Ok" button unless the name is unique */
+          dialog = gtk_message_dialog_new
+            (NULL,
+             GTK_DIALOG_MODAL,
+             GTK_MESSAGE_ERROR,
+             GTK_BUTTONS_CLOSE,
+             _("Failed to create namespace `%s'."
+               "Consult logs, most likely error is"
+               " that a namespace with that name "
+               "already exists."), namespaceName);
+          gtk_dialog_run (GTK_DIALOG (dialog));
+          gtk_widget_destroy (dialog);
+        }
+      ECRS_freeMetaData (meta);
+      ECRS_freeUri (keywordURI);
     }
-    ECRS_freeMetaData(meta);
-    ECRS_freeUri(keywordURI);
-  }
-  gtk_widget_destroy(dialog);
-  UNREF(metaXML);
+  gtk_widget_destroy (dialog);
+  UNREF (metaXML);
   metaXML = NULL;
-  DEBUG_END();
+  DEBUG_END ();
 }
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index 5a15194b..d89297f6 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -39,73 +39,67 @@
  * The spin button giving the rating for a particular namespace
  * has been changed.  Store the new rating for the namespace.
  */
-void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
-                                             GtkWidget * dummy2) {
-  GtkWidget * spin;
-  GtkWidget * ncbe;
-  GtkTreeModel * model;
+void
+on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
+                                         GtkWidget * dummy2)
+{
+  GtkWidget *spin;
+  GtkWidget *ncbe;
+  GtkTreeModel *model;
   GtkTreeIter iter;
-  char * encStr;
-  char * description;
+  char *encStr;
+  char *description;
   int rating;
   int newrating;
 
-  DEBUG_BEGIN();
-  spin
-    = glade_xml_get_widget(getMainXML(),
-                           "namespaceRatingSpinButton");
-  ncbe
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
+  DEBUG_BEGIN ();
+  spin = glade_xml_get_widget (getMainXML (), "namespaceRatingSpinButton");
+  ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   description = NULL;
   encStr = NULL;
-  if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(ncbe),
-                                            &iter)) {
-    gtk_tree_model_get(model,
-                       &iter,
-                       NS_SEARCH_DESCRIPTION, &description,
-                       NS_SEARCH_ENCNAME, &encStr,
-                       NS_SEARCH_RATING, &rating,
-                       -1);
-    if ( (description != NULL) &&
-         (0 == strcmp(description,
-                      _("globally"))) ) {
-      /* just to be sure */
-      gtk_widget_set_sensitive(spin,
-                               FALSE);
-    } else {
-      if (encStr != NULL) {
-        newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
-        rating = NS_rankNamespace(ectx,
-                                  cfg,
-                                  encStr,
-                                  newrating - rating);
-        if (rating != newrating) {
-          /* concurrent modification? */
-          gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                    rating);
-          GE_BREAK(ectx, 0);    
-        }
-        gtk_list_store_set(GTK_LIST_STORE(model),
-                           &iter,
-                           NS_SEARCH_RATING, rating,
-                           -1);
-      }
+  if (TRUE == gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ncbe), &iter))
+    {
+      gtk_tree_model_get (model,
+                          &iter,
+                          NS_SEARCH_DESCRIPTION, &description,
+                          NS_SEARCH_ENCNAME, &encStr,
+                          NS_SEARCH_RATING, &rating, -1);
+      if ((description != NULL) && (0 == strcmp (description, _("globally"))))
+        {
+          /* just to be sure */
+          gtk_widget_set_sensitive (spin, FALSE);
+        }
+      else
+        {
+          if (encStr != NULL)
+            {
+              newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
+              rating = NS_rankNamespace (ectx,
+                                         cfg, encStr, newrating - rating);
+              if (rating != newrating)
+                {
+                  /* concurrent modification? */
+                  gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
+                  GE_BREAK (ectx, 0);
+                }
+              gtk_list_store_set (GTK_LIST_STORE (model),
+                                  &iter, NS_SEARCH_RATING, rating, -1);
+            }
+        }
+    }
+  else
+    {
+      /* FIXME: if enc2hash succeeds, we may want to keep this
+         active */
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
+      gtk_widget_set_sensitive (spin, FALSE);
     }
-  } else {
-    /* FIXME: if enc2hash succeeds, we may want to keep this
-       active */
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                              0);
-    gtk_widget_set_sensitive(spin,
-                             FALSE);
-  }
   if (description != NULL)
-    free(description);
+    free (description);
   if (encStr != NULL)
-    free(encStr);
-  DEBUG_END();
+    free (encStr);
+  DEBUG_END ();
 }
 
 
@@ -114,175 +108,159 @@ void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
  * Update the trust level (possibly changing sensitivity)
  * and set the search string to the root (if available).
  */
-void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
-                                                GtkWidget * dummy2) {
-  GtkWidget * keyword;
-  GtkWidget * spin;
-  GtkWidget * ncbe;
-  GtkTreeModel * model;
+void
+on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
+                                            GtkWidget * dummy2)
+{
+  GtkWidget *keyword;
+  GtkWidget *spin;
+  GtkWidget *ncbe;
+  GtkTreeModel *model;
   GtkTreeIter iter;
   int rating;
-  char * encStr;
-  char * descStr;
+  char *encStr;
+  char *descStr;
   HashCode512 ns;
   HashCode512 root;
   EncName enc;
 
-  DEBUG_BEGIN();
-  spin
-    = glade_xml_get_widget(getMainXML(),
-                           "namespaceRatingSpinButton");
-  ncbe
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
+  DEBUG_BEGIN ();
+  spin = glade_xml_get_widget (getMainXML (), "namespaceRatingSpinButton");
+  ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   descStr = NULL;
   encStr = NULL;
-  if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(ncbe),
-                                            &iter)) {
-    gtk_tree_model_get(model,
-                       &iter,
-                       NS_SEARCH_DESCRIPTION, &descStr,
-                       NS_SEARCH_ENCNAME, &encStr,
-                       NS_SEARCH_RATING, &rating,
-                       -1);
-    if ( (descStr != NULL) &&
-         (0 == strcmp(descStr,
-                      _("globally"))) ) {
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                0);
-      gtk_widget_set_sensitive(spin,
-                               FALSE);
-    } else if (encStr != NULL) {
-      enc2hash(encStr,
-               &ns);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                rating);
-      gtk_widget_set_sensitive(spin,
-                               TRUE);
-      keyword
-        = glade_xml_get_widget(getMainXML(),
-                               "fssearchKeywordComboBoxEntry");
-      if (OK == NS_getNamespaceRoot(ectx,
-                                    cfg,
-                                    encStr,
-                                    &root)) {
-        hash2enc(&root,
-                 &enc);
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(keyword))),
-                           (const gchar*) &enc);
-      } else {
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(keyword))),
-                           "");
-      }
+  if (TRUE == gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ncbe), &iter))
+    {
+      gtk_tree_model_get (model,
+                          &iter,
+                          NS_SEARCH_DESCRIPTION, &descStr,
+                          NS_SEARCH_ENCNAME, &encStr,
+                          NS_SEARCH_RATING, &rating, -1);
+      if ((descStr != NULL) && (0 == strcmp (descStr, _("globally"))))
+        {
+          gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
+          gtk_widget_set_sensitive (spin, FALSE);
+        }
+      else if (encStr != NULL)
+        {
+          enc2hash (encStr, &ns);
+          gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
+          gtk_widget_set_sensitive (spin, TRUE);
+          keyword
+            = glade_xml_get_widget (getMainXML (),
+                                    "fssearchKeywordComboBoxEntry");
+          if (OK == NS_getNamespaceRoot (ectx, cfg, encStr, &root))
+            {
+              hash2enc (&root, &enc);
+              gtk_entry_set_text (GTK_ENTRY
+                                  (gtk_bin_get_child (GTK_BIN (keyword))),
+                                  (const gchar *) &enc);
+            }
+          else
+            {
+              gtk_entry_set_text (GTK_ENTRY
+                                  (gtk_bin_get_child (GTK_BIN (keyword))),
+                                  "");
+            }
+        }
+    }
+  else
+    {
+      gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
+      gtk_widget_set_sensitive (spin, FALSE);
     }
-  } else {
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                              0);
-    gtk_widget_set_sensitive(spin,
-                             FALSE);
-  }
   if (descStr != NULL)
-    free(descStr);
+    free (descStr);
   if (encStr != NULL)
-    free(encStr);
-  DEBUG_END();
+    free (encStr);
+  DEBUG_END ();
 }
 
-struct NewNamespaceInfo {
-  const char * namespaceName;
-  const HashCode512 * namespaceId;
-  const struct ECRS_MetaData * md;
+struct NewNamespaceInfo
+{
+  const char *namespaceName;
+  const HashCode512 *namespaceId;
+  const struct ECRS_MetaData *md;
   int rating;
 };
 
-static void * saveDiscovery(void * cls) {
-  struct NewNamespaceInfo * nni = cls;
+static void *
+saveDiscovery (void *cls)
+{
+  struct NewNamespaceInfo *nni = cls;
 
-  GtkListStore * model;
+  GtkListStore *model;
   GtkTreeIter iter;
   EncName enc;
-  char * name;
-  struct ECRS_MetaData * dmd;
-  GtkWidget * ncbe;
-  char * desc;
+  char *name;
+  struct ECRS_MetaData *dmd;
+  GtkWidget *ncbe;
+  char *desc;
   size_t n;
   int found;
-  char * encName;
+  char *encName;
 
-  DEBUG_BEGIN();
-  ncbe
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe)));
-  hash2enc(nni->namespaceId,
-           &enc);
-  if (nni->md == NULL) {
-    dmd = NULL;
-    desc = STRDUP("");
-  } else {
-    dmd = ECRS_dupMetaData(nni->md);
-    desc = ECRS_getFirstFromMetaData(dmd,
-                                     EXTRACTOR_DESCRIPTION,
-                                     EXTRACTOR_TITLE,
-                                     EXTRACTOR_AUTHOR,
-                                     EXTRACTOR_GENRE,
-                                     EXTRACTOR_SUBJECT,
-                                     EXTRACTOR_CREATOR,
-                                     EXTRACTOR_PRODUCER,
-                                     EXTRACTOR_GROUP,
-                                     EXTRACTOR_CREATED_FOR,
-                                     EXTRACTOR_SUMMARY,
-                                     EXTRACTOR_OWNER,
-                                     -1);
-    if (desc == NULL)
-      desc = STRDUP("");
-  }
+  DEBUG_BEGIN ();
+  ncbe = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+  model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe)));
+  hash2enc (nni->namespaceId, &enc);
+  if (nni->md == NULL)
+    {
+      dmd = NULL;
+      desc = STRDUP ("");
+    }
+  else
+    {
+      dmd = ECRS_dupMetaData (nni->md);
+      desc = ECRS_getFirstFromMetaData (dmd,
+                                        EXTRACTOR_DESCRIPTION,
+                                        EXTRACTOR_TITLE,
+                                        EXTRACTOR_AUTHOR,
+                                        EXTRACTOR_GENRE,
+                                        EXTRACTOR_SUBJECT,
+                                        EXTRACTOR_CREATOR,
+                                        EXTRACTOR_PRODUCER,
+                                        EXTRACTOR_GROUP,
+                                        EXTRACTOR_CREATED_FOR,
+                                        EXTRACTOR_SUMMARY,
+                                        EXTRACTOR_OWNER, -1);
+      if (desc == NULL)
+        desc = STRDUP ("");
+    }
 
-  n = strlen(desc) + 64;
-  name = MALLOC(n);
-  SNPRINTF(name,
-           n,
-           "%s: %.*s",
-           desc,
-           20,
-           &enc);
+  n = strlen (desc) + 64;
+  name = MALLOC (n);
+  SNPRINTF (name, n, "%s: %.*s", desc, 20, &enc);
   /* check if present! */
   found = NO;
-  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(GTK_TREE_MODEL(model),
-                         &iter,
-                         NS_SEARCH_ENCNAME, &encName,
-                         -1);
-      if ( (encName != NULL) &&
-           (0 == strcmp(encName,
-                        (const char*) &enc)) )
-        found =YES;
-      FREENONNULL(encName);
-    } while ( (found == NO) &&
-              (gtk_tree_model_iter_next(GTK_TREE_MODEL(model),
-                                        &iter)) );
-  }
-  if (found == NO) {
-    infoMessage(YES,
-                _("Namespace found: %s - %.*s\n"),
-                desc,
-                20,
-                &enc);
-    gtk_list_store_append(model,
-                          &iter);
-    gtk_list_store_set(model,
-                       &iter,
-                       NS_SEARCH_DESCRIPTION, name,
-                       NS_SEARCH_ENCNAME, &enc,
-                       NS_SEARCH_METADATA, dmd,
-                       NS_SEARCH_RATING, nni->rating,
-                       -1);
-  }
-  FREE(name);
-  DEBUG_END();
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (GTK_TREE_MODEL (model),
+                              &iter, NS_SEARCH_ENCNAME, &encName, -1);
+          if ((encName != NULL) &&
+              (0 == strcmp (encName, (const char *) &enc)))
+            found = YES;
+          FREENONNULL (encName);
+        }
+      while ((found == NO) &&
+             (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter)));
+    }
+  if (found == NO)
+    {
+      infoMessage (YES, _("Namespace found: %s - %.*s\n"), desc, 20, &enc);
+      gtk_list_store_append (model, &iter);
+      gtk_list_store_set (model,
+                          &iter,
+                          NS_SEARCH_DESCRIPTION, name,
+                          NS_SEARCH_ENCNAME, &enc,
+                          NS_SEARCH_METADATA, dmd,
+                          NS_SEARCH_RATING, nni->rating, -1);
+    }
+  FREE (name);
+  DEBUG_END ();
 
   return NULL;
 }
@@ -299,17 +277,17 @@ static void * saveDiscovery(void * cls) {
  * @param rating the local rating of the namespace
  * @return OK (always)
  */
-int namespace_discovered_cb(void * cls,
-                            const char * namespaceName,
-                            const HashCode512 * namespaceId,
-                            const struct ECRS_MetaData * md,
-                            int rating) {
+int
+namespace_discovered_cb (void *cls,
+                         const char *namespaceName,
+                         const HashCode512 * namespaceId,
+                         const struct ECRS_MetaData *md, int rating)
+{
   struct NewNamespaceInfo nni;
   nni.namespaceName = namespaceName;
   nni.namespaceId = namespaceId;
   nni.md = md;
   nni.rating = rating;
-  gtkSaveCall(&saveDiscovery,
-              &nni);
+  gtkSaveCall (&saveDiscovery, &nni);
   return OK;
 }
diff --git a/src/plugins/fs/namespace_search.h b/src/plugins/fs/namespace_search.h
index d2b7e463..fd85bb6c 100644
--- a/src/plugins/fs/namespace_search.h
+++ b/src/plugins/fs/namespace_search.h
@@ -36,11 +36,10 @@
  * @param rating the local rating of the namespace
  * @return OK (always)
  */
-int namespace_discovered_cb(void * cls,
-                            const char * namespaceName,
-                            const HashCode512 * namespaceId,
-                            const struct ECRS_MetaData * md,
-                            int rating);
+int namespace_discovered_cb (void *cls,
+                             const char *namespaceName,
+                             const HashCode512 * namespaceId,
+                             const struct ECRS_MetaData *md, int rating);
 
 
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index bd28425e..dc9600f7 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -39,18 +39,18 @@
  * The user has edited the search entry.
  * Update search button status.
  */
-static void on_fssearchSelectionChanged(gpointer signal,
-                                        gpointer cls) {
-  SearchList * list = cls;
-  GtkTreeSelection * selection;
-  GtkWidget * downloadButton;
-
-  selection = gtk_tree_view_get_selection(list->treeview);
-  downloadButton
-    = glade_xml_get_widget(list->searchXML,
-                           "downloadButton");
-  gtk_widget_set_sensitive(downloadButton,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_fssearchSelectionChanged (gpointer signal, gpointer cls)
+{
+  SearchList *list = cls;
+  GtkTreeSelection *selection;
+  GtkWidget *downloadButton;
+
+  selection = gtk_tree_view_get_selection (list->treeview);
+  downloadButton = glade_xml_get_widget (list->searchXML, "downloadButton");
+  gtk_widget_set_sensitive (downloadButton,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 
@@ -60,84 +60,86 @@ static void on_fssearchSelectionChanged(gpointer signal,
  * Update the number of results received for the given
  * search in the summary and in the label of the tab.
  */
-static void updateSearchSummary(SearchList * searchContext) {
-  GtkTreePath * path;
+static void
+updateSearchSummary (SearchList * searchContext)
+{
+  GtkTreePath *path;
   GtkTreeIter iter;
-  char * new_title;
-  GtkLabel * label;
-
-  path = gtk_tree_row_reference_get_path(searchContext->summaryViewRowReference);
-  if (TRUE != gtk_tree_model_get_iter(GTK_TREE_MODEL(search_summary),
-                                      &iter,
-                                      path)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  gtk_tree_path_free(path);
-  gtk_list_store_set(search_summary,
-                     &iter,
-                     SEARCH_SUMMARY_RESULT_COUNT, searchContext->resultsReceived,
-                     -1);
+  char *new_title;
+  GtkLabel *label;
+
+  path =
+    gtk_tree_row_reference_get_path (searchContext->summaryViewRowReference);
+  if (TRUE !=
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path))
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
+  gtk_tree_path_free (path);
+  gtk_list_store_set (search_summary,
+                      &iter,
+                      SEARCH_SUMMARY_RESULT_COUNT,
+                      searchContext->resultsReceived, -1);
+
 
-                        
 
   /* update tab title with the number of results */
   new_title =
-    g_strdup_printf("%.*s%s (%u)",
-                    20,
-                    searchContext->searchString,
-                    strlen(searchContext->searchString) > 20 ? "..." : "",
-                    searchContext->resultsReceived);
-  label = GTK_LABEL(glade_xml_get_widget(searchContext->labelXML,
-                                         "searchTabLabel"));
-  gtk_label_set(label, new_title);
-  FREE(new_title);
+    g_strdup_printf ("%.*s%s (%u)",
+                     20,
+                     searchContext->searchString,
+                     strlen (searchContext->searchString) > 20 ? "..." : "",
+                     searchContext->resultsReceived);
+  label = GTK_LABEL (glade_xml_get_widget (searchContext->labelXML,
+                                           "searchTabLabel"));
+  gtk_label_set (label, new_title);
+  FREE (new_title);
 }
 
 /**
  * Add the given search result to the search
  * tree at the specified position.
  */
-void addEntryToSearchTree(SearchList * searchContext,
-                          DownloadList * downloadParent,
-                          const ECRS_FileInfo * info,
-                          GtkTreeIter * iter) {
-  char * name;
-  char * mime;
-  char * desc;
+void
+addEntryToSearchTree (SearchList * searchContext,
+                      DownloadList * downloadParent,
+                      const ECRS_FileInfo * info, GtkTreeIter * iter)
+{
+  char *name;
+  char *mime;
+  char *desc;
   unsigned long long size;
-  char * size_h;
-  GdkPixbuf * pixbuf;
+  char *size_h;
+  GdkPixbuf *pixbuf;
   enum URITRACK_STATE state;
 
-  state = URITRACK_getState(ectx,
-                            cfg,
-                            info->uri);
-  mime = getMimeTypeFromMetaData(info->meta);
-  desc = getDescriptionFromMetaData(info->meta);
-  name = getFileNameFromMetaData(info->meta);
-  size = ECRS_isFileUri(info->uri) || ECRS_isLocationUri(info->uri) ? ECRS_fileSize(info->uri) : 0;
-  pixbuf = getThumbnailFromMetaData(info->meta);
-  size_h = string_get_fancy_byte_size(size);
-  gtk_tree_store_set(searchContext->tree,
-                     iter,
-                     SEARCH_NAME, name,
-                     SEARCH_SIZE, size,
-                     SEARCH_HSIZE, size_h,
-                     SEARCH_MIME, mime,
-                     SEARCH_DESC, desc,
-                     SEARCH_PIXBUF, pixbuf,
-                     SEARCH_URI, ECRS_dupUri(info->uri),
-                     SEARCH_META, ECRS_dupMetaData(info->meta),
-                     SEARCH_CELL_BG_COLOR, getColorCode(state),
-                     SEARCH_CELL_FG_COLOR, "black",
-                     SEARCH_INTERNAL, searchContext,
-                     SEARCH_INTERNAL_PARENT, downloadParent,
-                     -1);
-  FREE(size_h);
-  FREE(name);
-  FREE(desc);
-  FREE(mime);
+  state = URITRACK_getState (ectx, cfg, info->uri);
+  mime = getMimeTypeFromMetaData (info->meta);
+  desc = getDescriptionFromMetaData (info->meta);
+  name = getFileNameFromMetaData (info->meta);
+  size = ECRS_isFileUri (info->uri)
+    || ECRS_isLocationUri (info->uri) ? ECRS_fileSize (info->uri) : 0;
+  pixbuf = getThumbnailFromMetaData (info->meta);
+  size_h = string_get_fancy_byte_size (size);
+  gtk_tree_store_set (searchContext->tree,
+                      iter,
+                      SEARCH_NAME, name,
+                      SEARCH_SIZE, size,
+                      SEARCH_HSIZE, size_h,
+                      SEARCH_MIME, mime,
+                      SEARCH_DESC, desc,
+                      SEARCH_PIXBUF, pixbuf,
+                      SEARCH_URI, ECRS_dupUri (info->uri),
+                      SEARCH_META, ECRS_dupMetaData (info->meta),
+                      SEARCH_CELL_BG_COLOR, getColorCode (state),
+                      SEARCH_CELL_FG_COLOR, "black",
+                      SEARCH_INTERNAL, searchContext,
+                      SEARCH_INTERNAL_PARENT, downloadParent, -1);
+  FREE (size_h);
+  FREE (name);
+  FREE (desc);
+  FREE (mime);
 }
 
 /**
@@ -148,202 +150,173 @@ void addEntryToSearchTree(SearchList * searchContext,
  * @param uri the search URI
  * @param searchContext identifies the search page
  */
-void fs_search_result_received(SearchList * searchContext,
-                               const ECRS_FileInfo * info,
-                               const struct ECRS_URI * uri) {
-  GtkTreeStore * model;
+void
+fs_search_result_received (SearchList * searchContext,
+                           const ECRS_FileInfo * info,
+                           const struct ECRS_URI *uri)
+{
+  GtkTreeStore *model;
   GtkTreeIter iter;
   enum URITRACK_STATE state;
 
-  state = URITRACK_getState(ectx,
-                            cfg,
-                            info->uri);
-  if ( (state & (URITRACK_INSERTED |
-                 URITRACK_INDEXED) ) &&
-       (YES == GC_get_configuration_value_yesno(cfg,
-                                                "GNUNET-GTK",
-                                                "DISABLE-OWN",
-                                                YES)) )
+  state = URITRACK_getState (ectx, cfg, info->uri);
+  if ((state & (URITRACK_INSERTED |
+                URITRACK_INDEXED)) &&
+      (YES == GC_get_configuration_value_yesno (cfg,
+                                                "GNUNET-GTK",
+                                                "DISABLE-OWN", YES)))
     return;
-  model = GTK_TREE_STORE(gtk_tree_view_get_model(searchContext->treeview));
-  gtk_tree_store_append(model,
-                        &iter,
-                        NULL);
-  addEntryToSearchTree(searchContext,
-                       NULL,
-                       info,
-                       &iter);
+  model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
+  gtk_tree_store_append (model, &iter, NULL);
+  addEntryToSearchTree (searchContext, NULL, info, &iter);
   searchContext->resultsReceived++;
-  updateSearchSummary(searchContext);
+  updateSearchSummary (searchContext);
 }
 
 static int
-on_search_copy_uri_activate(void * cls,
-                            GtkWidget * searchEntry) {
-  SearchList * list = cls;
+on_search_copy_uri_activate (void *cls, GtkWidget * searchEntry)
+{
+  SearchList *list = cls;
   GtkTreePath *path;
   GtkTreeIter iter;
-  struct ECRS_URI * uri;
-  char * str;
-  GtkClipboard * clip;
+  struct ECRS_URI *uri;
+  char *str;
+  GtkClipboard *clip;
 
   path = NULL;
-  if (FALSE == gtk_tree_view_get_path_at_pos(list->treeview,
-                                             list->last_x,
-                                             list->last_y,
-                                             &path,
-                                             NULL,
-                                             NULL,
-                                             NULL)) {
-    GE_BREAK(NULL, 0);
-    return FALSE;
-  }
-  if (FALSE == gtk_tree_model_get_iter(GTK_TREE_MODEL(list->tree),
-                                       &iter,
-                                       path)) {
-    GE_BREAK(NULL, 0);
-    gtk_tree_path_free(path);
-    return FALSE;
-  }
-  gtk_tree_path_free(path);
+  if (FALSE == gtk_tree_view_get_path_at_pos (list->treeview,
+                                              list->last_x,
+                                              list->last_y,
+                                              &path, NULL, NULL, NULL))
+    {
+      GE_BREAK (NULL, 0);
+      return FALSE;
+    }
+  if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (list->tree),
+                                        &iter, path))
+    {
+      GE_BREAK (NULL, 0);
+      gtk_tree_path_free (path);
+      return FALSE;
+    }
+  gtk_tree_path_free (path);
   uri = NULL;
-  gtk_tree_model_get(GTK_TREE_MODEL(list->tree),
-                     &iter,
-                     SEARCH_URI, &uri,
-                     -1);
-  str = ECRS_uriToString(uri);
-  clip = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-  gtk_clipboard_set_text(clip,
-                         str,
-                         strlen(str));
-  FREE(str);
+  gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
+                      &iter, SEARCH_URI, &uri, -1);
+  str = ECRS_uriToString (uri);
+  clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+  gtk_clipboard_set_text (clip, str, strlen (str));
+  FREE (str);
   return FALSE;
 }
 
 
 #ifndef MINGW
 static char *
-selectFile() {
-  GladeXML * uploadXML;
-  GtkFileChooser * dialog;
-  char * ret;
+selectFile ()
+{
+  GladeXML *uploadXML;
+  GtkFileChooser *dialog;
+  char *ret;
 
   uploadXML
-    = glade_xml_new(getGladeFileName(),
-                    "directorySaveDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(uploadXML);
-  dialog = GTK_FILE_CHOOSER(glade_xml_get_widget(uploadXML,
-                                                 "directorySaveDialog"));
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
-    ret = gtk_file_chooser_get_filename(dialog);
+    = glade_xml_new (getGladeFileName (),
+                     "directorySaveDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (uploadXML);
+  dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
+                                                   "directorySaveDialog"));
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
+    ret = gtk_file_chooser_get_filename (dialog);
   else
     ret = NULL;
-  gtk_widget_destroy(GTK_WIDGET(dialog));
-  UNREF(uploadXML);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  UNREF (uploadXML);
   return ret;
 }
 
 #else /* MINGW */
 
 static char *
-selectFile() {
-  return plibc_ChooseFile(_("Choose the name under which you want to save the search results."),
-                          OFN_SHAREAWARE);
+selectFile ()
+{
+  return
+    plibc_ChooseFile (_
+                      ("Choose the name under which you want to save the search results."),
+                      OFN_SHAREAWARE);
 }
 #endif /* MINGW */
 
 static int
-on_save_search_activate(void * cls,
-                        GtkWidget * searchEntry) {
-  SearchList * list = cls;
-  char * name;
-  char * directory;
+on_save_search_activate (void *cls, GtkWidget * searchEntry)
+{
+  SearchList *list = cls;
+  char *name;
+  char *directory;
   unsigned long long dir_len;
   unsigned int fis_size;
-  ECRS_FileInfo * fis;
-  struct ECRS_MetaData * meta;
-  GtkTreeModel * model;
+  ECRS_FileInfo *fis;
+  struct ECRS_MetaData *meta;
+  GtkTreeModel *model;
   GtkTreeIter iter;
   unsigned int pos;
 
-  model = gtk_tree_view_get_model(list->treeview);
-  if (TRUE != gtk_tree_model_get_iter_first(model, &iter)) {
-    addLogEntry(_("No search results yet, cannot save!"));
-    return FALSE;
-  }
+  model = gtk_tree_view_get_model (list->treeview);
+  if (TRUE != gtk_tree_model_get_iter_first (model, &iter))
+    {
+      addLogEntry (_("No search results yet, cannot save!"));
+      return FALSE;
+    }
 
-  name = selectFile("");
+  name = selectFile ("");
   if (name == NULL)
     return FALSE;
   fis = NULL;
   fis_size = 0;
-  GROW(fis,
-       fis_size,
-       list->resultsReceived);
+  GROW (fis, fis_size, list->resultsReceived);
   pos = 0;
-  do {
-    if (pos == fis_size)
-      GROW(fis,
-           fis_size,
-           pos + 1);
-    gtk_tree_model_get(model,
-                       &iter,
-                       SEARCH_URI, &fis[pos].uri,
-                       SEARCH_META, &fis[pos].meta,
-                       -1);
-    pos++;
-  } while (gtk_tree_model_iter_next(model,
-                                    &iter));
-  meta = ECRS_createMetaData();
-  ECRS_addToMetaData(meta,
-                     EXTRACTOR_KEYWORDS,
-                     list->searchString);
-  ECRS_addToMetaData(meta,
-                     EXTRACTOR_DESCRIPTION,
-                     _("Saved search results"));
-  ECRS_addToMetaData(meta,
-                     EXTRACTOR_SOFTWARE,
-                     "gnunet-gtk");
-  if (OK != ECRS_createDirectory(NULL,
-                                 &directory,
-                                 &dir_len,
-                                 fis_size,
-                                 fis,
-                                 meta)) {
-    addLogEntry(_("Internal error."));
-    GE_BREAK(NULL, 0);
-    ECRS_freeMetaData(meta);
-    GROW(fis,
-         fis_size,
-         0);
-    FREE(name);
-    return FALSE;
-  }
-  ECRS_freeMetaData(meta);
-  GROW(fis,
-       fis_size,
-       0);
-  if (OK != disk_file_write(NULL,
-                            name,
-                            directory,
-                            dir_len,
-                            "644")) {
-    addLogEntry(_("Error writing file `%s'."),
-                name);
-  }
-  FREE(directory);
-  FREE(name);
+  do
+    {
+      if (pos == fis_size)
+        GROW (fis, fis_size, pos + 1);
+      gtk_tree_model_get (model,
+                          &iter,
+                          SEARCH_URI, &fis[pos].uri,
+                          SEARCH_META, &fis[pos].meta, -1);
+      pos++;
+    }
+  while (gtk_tree_model_iter_next (model, &iter));
+  meta = ECRS_createMetaData ();
+  ECRS_addToMetaData (meta, EXTRACTOR_KEYWORDS, list->searchString);
+  ECRS_addToMetaData (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
+  ECRS_addToMetaData (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
+  if (OK != ECRS_createDirectory (NULL,
+                                  &directory, &dir_len, fis_size, fis, meta))
+    {
+      addLogEntry (_("Internal error."));
+      GE_BREAK (NULL, 0);
+      ECRS_freeMetaData (meta);
+      GROW (fis, fis_size, 0);
+      FREE (name);
+      return FALSE;
+    }
+  ECRS_freeMetaData (meta);
+  GROW (fis, fis_size, 0);
+  if (OK != disk_file_write (NULL, name, directory, dir_len, "644"))
+    {
+      addLogEntry (_("Error writing file `%s'."), name);
+    }
+  FREE (directory);
+  FREE (name);
   return FALSE;
 }
 
 static gint
-search_click_handler(void * cls,
-                     GdkEvent *event) {
-  SearchList * list = cls;
-  GtkMenu * menu;
-  GtkWidget * entry;
-  GdkEventButton * event_button;
+search_click_handler (void *cls, GdkEvent * event)
+{
+  SearchList *list = cls;
+  GtkMenu *menu;
+  GtkWidget *entry;
+  GdkEventButton *event_button;
 
   g_return_val_if_fail (event != NULL, FALSE);
 
@@ -354,34 +327,26 @@ search_click_handler(void * cls,
     return FALSE;
   list->last_x = event_button->x;
   list->last_y = event_button->y;
-  menu = GTK_MENU(gtk_menu_new());
-  entry = gtk_menu_item_new_with_label(_("_Copy URI to Clipboard"));
+  menu = GTK_MENU (gtk_menu_new ());
+  entry = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
   g_signal_connect_swapped (entry,
-                            "activate",
-                            G_CALLBACK(on_search_copy_uri_activate),
-                            list);
-  gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(entry))),
-                              TRUE);
-  gtk_widget_show(entry);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-                        entry);
-  entry = gtk_menu_item_new_with_label(_("_Save results as directory"));
+                            "activate",
+                            G_CALLBACK (on_search_copy_uri_activate), list);
+  gtk_label_set_use_underline (GTK_LABEL
+                               (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
+  gtk_widget_show (entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
+  entry = gtk_menu_item_new_with_label (_("_Save results as directory"));
   g_signal_connect_swapped (entry,
-                            "activate",
-                            G_CALLBACK(on_save_search_activate),
-                            list);
-  gtk_label_set_use_underline(GTK_LABEL(gtk_bin_get_child(GTK_BIN(entry))),
-                              TRUE);
-  gtk_widget_show(entry);
-  gtk_menu_shell_append(GTK_MENU_SHELL(menu),
-                        entry);
+                            "activate",
+                            G_CALLBACK (on_save_search_activate), list);
+  gtk_label_set_use_underline (GTK_LABEL
+                               (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
+  gtk_widget_show (entry);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
   gtk_menu_popup (menu,
-                  NULL,
-                  NULL,
-                  NULL,
-                  NULL,
-                  event_button->button,
-                  event_button->time);
+                  NULL,
+                  NULL, NULL, NULL, event_button->button, event_button->time);
   return TRUE;
 }
 
@@ -390,234 +355,195 @@ search_click_handler(void * cls,
  * tab and add an entry to the summary.
  */
 SearchList *
-fs_search_started(struct FSUI_SearchList * fsui_list,
-                  const struct ECRS_URI * uri,
-                  unsigned int anonymityLevel,
-                  unsigned int resultCount,
-                  const ECRS_FileInfo * results,
-                  FSUI_State state) {
-  SearchList * list;
+fs_search_started (struct FSUI_SearchList * fsui_list,
+                   const struct ECRS_URI * uri,
+                   unsigned int anonymityLevel,
+                   unsigned int resultCount,
+                   const ECRS_FileInfo * results, FSUI_State state)
+{
+  SearchList *list;
   gint pages;
-  char * description;
-  const char * dhead;
-  GtkTreeViewColumn * column;
-  GtkCellRenderer * renderer;
-  GtkNotebook * notebook;
-  GtkTreePath * path;
+  char *description;
+  const char *dhead;
+  GtkTreeViewColumn *column;
+  GtkCellRenderer *renderer;
+  GtkNotebook *notebook;
+  GtkTreePath *path;
   GtkTreeIter iter;
   int col;
   int i;
 
-  description = ECRS_uriToString(uri);
-  if (description == NULL) {
-    GE_BREAK(ectx, 0);
-    return NULL;
-  }
-  GE_ASSERT(ectx,
-            strlen(description) >= strlen(ECRS_URI_PREFIX));
-  dhead = &description[strlen(ECRS_URI_PREFIX)];
-  if (0 == strncmp(dhead,
-                   ECRS_SEARCH_INFIX,
-                   strlen(ECRS_SEARCH_INFIX)))
-    dhead = &dhead[strlen(ECRS_SEARCH_INFIX)];
-  else if (0 == strncmp(dhead,
-                        ECRS_SUBSPACE_INFIX,
-                        strlen(ECRS_SUBSPACE_INFIX)))
-    dhead = &dhead[strlen(ECRS_SUBSPACE_INFIX)];
-  list
-    = MALLOC(sizeof(SearchList));
-  memset(list,
-         0,
-         sizeof(SearchList));
-  list->searchString
-    = STRDUP(dhead);
-  list->uri
-    = ECRS_dupUri(uri);
-  list->fsui_list
-    = fsui_list;
-  list->next
-    = search_head;
+  description = ECRS_uriToString (uri);
+  if (description == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return NULL;
+    }
+  GE_ASSERT (ectx, strlen (description) >= strlen (ECRS_URI_PREFIX));
+  dhead = &description[strlen (ECRS_URI_PREFIX)];
+  if (0 == strncmp (dhead, ECRS_SEARCH_INFIX, strlen (ECRS_SEARCH_INFIX)))
+    dhead = &dhead[strlen (ECRS_SEARCH_INFIX)];
+  else if (0 == strncmp (dhead,
+                         ECRS_SUBSPACE_INFIX, strlen (ECRS_SUBSPACE_INFIX)))
+    dhead = &dhead[strlen (ECRS_SUBSPACE_INFIX)];
+  list = MALLOC (sizeof (SearchList));
+  memset (list, 0, sizeof (SearchList));
+  list->searchString = STRDUP (dhead);
+  list->uri = ECRS_dupUri (uri);
+  list->fsui_list = fsui_list;
+  list->next = search_head;
   search_head = list;
   list->searchXML
-    = glade_xml_new(getGladeFileName(),
-                    "searchResultsFrame",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(list->searchXML);
+    = glade_xml_new (getGladeFileName (), "searchResultsFrame", PACKAGE_NAME);
+  connectGladeWithPlugins (list->searchXML);
   list->searchpage
-    = extractMainWidgetFromWindow(list->searchXML,
-                                  "searchResultsFrame");
+    = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
   /* setup tree view and renderers */
-  list->treeview = GTK_TREE_VIEW(glade_xml_get_widget(list->searchXML,
-                                                      "searchResults"));
+  list->treeview = GTK_TREE_VIEW (glade_xml_get_widget (list->searchXML,
+                                                        "searchResults"));
   g_signal_connect_swapped (list->treeview,
-                            "button-press-event",
-                            G_CALLBACK(search_click_handler),
-                            list);
-  list->tree =
-    gtk_tree_store_new(SEARCH_NUM,
-                       G_TYPE_STRING, /* name */
-                       G_TYPE_UINT64,  /* size */
-                       G_TYPE_STRING,  /* human-readable size */
-                       G_TYPE_STRING, /* mime-type */
-                       G_TYPE_STRING, /* meta-data (some) */
-                       GDK_TYPE_PIXBUF, /* preview */   
-                       G_TYPE_POINTER,  /* url */
-                       G_TYPE_POINTER,  /* meta */
-                       G_TYPE_STRING, /* bg-color */
-                       G_TYPE_STRING, /* fg-color */
-                       G_TYPE_POINTER,  /* internal: search list */
-                       G_TYPE_POINTER); /* internal: download parent list */
-
-  gtk_tree_view_set_model(list->treeview,
-                          GTK_TREE_MODEL(list->tree));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(list->treeview),
-                              GTK_SELECTION_MULTIPLE);
-
-  g_signal_connect_data(gtk_tree_view_get_selection(list->treeview),
-                        "changed",
-                        G_CALLBACK(&on_fssearchSelectionChanged),
-                        list,
-                        NULL,
-                        0);
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-                                                    -1,
-                                                    _("Name"),
-                                                    renderer,
-                                                    "text", SEARCH_NAME,
-                                                    NULL);
-  g_object_set(G_OBJECT(renderer),
-               "wrap-width", 45,
-               "width-chars", 45,
-               "ellipsize", PANGO_ELLIPSIZE_END,
-               NULL);
-  column = gtk_tree_view_get_column(list->treeview,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_NAME);
-
-  renderer = gtk_cell_renderer_text_new();
+                            "button-press-event",
+                            G_CALLBACK (search_click_handler), list);
+  list->tree = gtk_tree_store_new (SEARCH_NUM, G_TYPE_STRING,   /* name */
+                                   G_TYPE_UINT64,       /* size */
+                                   G_TYPE_STRING,       /* human-readable size */
+                                   G_TYPE_STRING,       /* mime-type */
+                                   G_TYPE_STRING,       /* meta-data (some) */
+                                   GDK_TYPE_PIXBUF,     /* preview */
+                                   G_TYPE_POINTER,      /* url */
+                                   G_TYPE_POINTER,      /* meta */
+                                   G_TYPE_STRING,       /* bg-color */
+                                   G_TYPE_STRING,       /* fg-color */
+                                   G_TYPE_POINTER,      /* internal: search list */
+                                   G_TYPE_POINTER);     /* internal: download parent list */
+
+  gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection (list->treeview),
+                               GTK_SELECTION_MULTIPLE);
+
+  g_signal_connect_data (gtk_tree_view_get_selection (list->treeview),
+                         "changed",
+                         G_CALLBACK (&on_fssearchSelectionChanged),
+                         list, NULL, 0);
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
+                                                     _("Name"),
+                                                     renderer,
+                                                     "text", SEARCH_NAME,
+                                                     NULL);
+  g_object_set (G_OBJECT (renderer),
+                "wrap-width", 45,
+                "width-chars", 45, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_NAME);
+
+  renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "xalign", 1.00, NULL);
-  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-                                                    -1,
-                                                    _("Size"),
-                                                    renderer,
-                                                    "text", SEARCH_HSIZE,
-                                                    "cell-background", SEARCH_CELL_BG_COLOR,
-                                                    "foreground", SEARCH_CELL_FG_COLOR,
-                                                    NULL);
-  column = gtk_tree_view_get_column(list->treeview,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_SIZE);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-                                                    -1,
-                                                    _("Mime-type"),
-                                                    renderer,
-                                                    "text", SEARCH_MIME,
-                                                    NULL);
-  g_object_set(G_OBJECT(renderer),
-               "wrap-width", 30,
-               "width-chars", 30,
-               "ellipsize", PANGO_ELLIPSIZE_END,
-               NULL);
-  column = gtk_tree_view_get_column(list->treeview,
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_MIME);
-
-  if (YES != GC_get_configuration_value_yesno(cfg,
-                                              "GNUNET-GTK",
-                                              "DISABLE-PREVIEWS",
-                                              NO)) {
-    renderer = gtk_cell_renderer_pixbuf_new();
-    col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-                                                      -1,
-                                                      _("Preview"),
-                                                      renderer,
-                                                      "pixbuf", SEARCH_PIXBUF,
-                                                      NULL);
-    column = gtk_tree_view_get_column(list->treeview,
-                                      col - 1);
-    gtk_tree_view_column_set_resizable(column, TRUE);
-    gtk_tree_view_column_set_reorderable(column, TRUE);
-    gtk_tree_view_column_set_resizable(column, TRUE);
-  }
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(list->treeview,
-                                              -1,
-                                              _("Meta-data"),
-                                              renderer,
-                                              "text", SEARCH_DESC,
-                                              NULL);
-  column = gtk_tree_view_get_column(list->treeview,
-                                    col - 1);
-  g_object_set(G_OBJECT(renderer),
-               "wrap-width", 60,
-               "width-chars", 60,
-               "wrap-mode", PANGO_WRAP_WORD_CHAR,
-               "ellipsize", PANGO_ELLIPSIZE_END,
-               "ellipsize-set", TRUE,
-               NULL);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC);
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
+                                                     _("Size"),
+                                                     renderer,
+                                                     "text", SEARCH_HSIZE,
+                                                     "cell-background",
+                                                     SEARCH_CELL_BG_COLOR,
+                                                     "foreground",
+                                                     SEARCH_CELL_FG_COLOR,
+                                                     NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_SIZE);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
+                                                     _("Mime-type"),
+                                                     renderer,
+                                                     "text", SEARCH_MIME,
+                                                     NULL);
+  g_object_set (G_OBJECT (renderer),
+                "wrap-width", 30,
+                "width-chars", 30, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
+
+  if (YES != GC_get_configuration_value_yesno (cfg,
+                                               "GNUNET-GTK",
+                                               "DISABLE-PREVIEWS", NO))
+    {
+      renderer = gtk_cell_renderer_pixbuf_new ();
+      col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                         -1,
+                                                         _("Preview"),
+                                                         renderer,
+                                                         "pixbuf",
+                                                         SEARCH_PIXBUF, NULL);
+      column = gtk_tree_view_get_column (list->treeview, col - 1);
+      gtk_tree_view_column_set_resizable (column, TRUE);
+      gtk_tree_view_column_set_reorderable (column, TRUE);
+      gtk_tree_view_column_set_resizable (column, TRUE);
+    }
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (list->treeview,
+                                                     -1,
+                                                     _("Meta-data"),
+                                                     renderer,
+                                                     "text", SEARCH_DESC,
+                                                     NULL);
+  column = gtk_tree_view_get_column (list->treeview, col - 1);
+  g_object_set (G_OBJECT (renderer),
+                "wrap-width", 60,
+                "width-chars", 60,
+                "wrap-mode", PANGO_WRAP_WORD_CHAR,
+                "ellipsize", PANGO_ELLIPSIZE_END,
+                "ellipsize-set", TRUE, NULL);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, SEARCH_DESC);
 
   /* add entry in search summary */
-  gtk_list_store_append(search_summary,
-                        &iter);
-  gtk_list_store_set(search_summary,
-                     &iter,
-                     SEARCH_SUMMARY_NAME, dhead,
-                     SEARCH_SUMMARY_RESULT_COUNT, 0,
-                     SEARCH_SUMMARY_INTERNAL, list,
-                     -1);
-  FREE(description);
-  path = gtk_tree_model_get_path(GTK_TREE_MODEL(search_summary),
-                                 &iter);
+  gtk_list_store_append (search_summary, &iter);
+  gtk_list_store_set (search_summary,
+                      &iter,
+                      SEARCH_SUMMARY_NAME, dhead,
+                      SEARCH_SUMMARY_RESULT_COUNT, 0,
+                      SEARCH_SUMMARY_INTERNAL, list, -1);
+  FREE (description);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (search_summary), &iter);
   list->summaryViewRowReference
-    = gtk_tree_row_reference_new(GTK_TREE_MODEL(search_summary),
-                                 path);
-  gtk_tree_path_free(path);
+    = gtk_tree_row_reference_new (GTK_TREE_MODEL (search_summary), path);
+  gtk_tree_path_free (path);
 
   /* load label */
   list->labelXML
-    = glade_xml_new(getGladeFileName(),
-                    "searchTabLabelWindow",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(list->labelXML);
+    = glade_xml_new (getGladeFileName (),
+                     "searchTabLabelWindow", PACKAGE_NAME);
+  connectGladeWithPlugins (list->labelXML);
   list->tab_label
-    = extractMainWidgetFromWindow(list->labelXML,
-                                  "searchTabLabelWindow");
+    = extractMainWidgetFromWindow (list->labelXML, "searchTabLabelWindow");
   /* process existing results */
-  for (i=0;i<resultCount;i++)
-    fs_search_result_received(list,
-                              &results[i],
-                              uri);
-  if (resultCount == 0) /* otherwise already done! */
-    updateSearchSummary(list);
+  for (i = 0; i < resultCount; i++)
+    fs_search_result_received (list, &results[i], uri);
+  if (resultCount == 0)         /* otherwise already done! */
+    updateSearchSummary (list);
 
   /* insert new page into search notebook */
   notebook
-    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
-                                        "downloadNotebook"));
-  pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
-  gtk_notebook_append_page(notebook,
-                           list->searchpage,
-                           list->tab_label);
-  gtk_notebook_set_current_page(notebook,
-                                pages);
-  gtk_widget_show(GTK_WIDGET(notebook)); /* may have been hidden! */
+    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+  pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
+  gtk_notebook_append_page (notebook, list->searchpage, list->tab_label);
+  gtk_notebook_set_current_page (notebook, pages);
+  gtk_widget_show (GTK_WIDGET (notebook));      /* may have been hidden! */
 
   return list;
 }
@@ -626,42 +552,38 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
  * Recursively free the (internal) model data fields
  * (uri and meta) from the search tree model.
  */
-static void freeIterSubtree(GtkTreeModel * tree,
-                            GtkTreeIter * iter) {
+static void
+freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
+{
   GtkTreeIter child;
-  struct ECRS_URI * uri;
-  struct ECRS_MetaData * meta;
-
-  do {
-    uri = NULL;
-    meta = NULL;
-    gtk_tree_model_get(tree,
-                       iter,
-                       SEARCH_URI, &uri,
-                       SEARCH_META, &meta,
-                       -1);
-    if (uri != NULL)
-      ECRS_freeUri(uri);
-    if (meta != NULL)
-      ECRS_freeMetaData(meta);
-    gtk_tree_store_set(GTK_TREE_STORE(tree),
-                       iter,
-                       SEARCH_URI, NULL,
-                       SEARCH_META, NULL,
-                       -1);
-    if (gtk_tree_model_iter_children(tree,
-                                     &child,
-                                     iter))
-      freeIterSubtree(tree, &child);
-  } while (gtk_tree_model_iter_next(tree,
-                                    iter));
+  struct ECRS_URI *uri;
+  struct ECRS_MetaData *meta;
+
+  do
+    {
+      uri = NULL;
+      meta = NULL;
+      gtk_tree_model_get (tree,
+                          iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
+      if (uri != NULL)
+        ECRS_freeUri (uri);
+      if (meta != NULL)
+        ECRS_freeMetaData (meta);
+      gtk_tree_store_set (GTK_TREE_STORE (tree),
+                          iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
+      if (gtk_tree_model_iter_children (tree, &child, iter))
+        freeIterSubtree (tree, &child);
+    }
+  while (gtk_tree_model_iter_next (tree, iter));
 }
 
 /**
  * FSUI event: a search was aborted.
  * Update views accordingly.
  */
-void fs_search_aborted(SearchList * list) {
+void
+fs_search_aborted (SearchList * list)
+{
   /* FIXME: show aborted status somehow! */
 }
 
@@ -669,69 +591,68 @@ void fs_search_aborted(SearchList * list) {
  * FSUI event: a search was stopped.  Remove the
  * respective tab and its entry in the summary.
  */
-void fs_search_stopped(SearchList * list) {
-  GtkNotebook * notebook;
+void
+fs_search_stopped (SearchList * list)
+{
+  GtkNotebook *notebook;
   GtkTreeIter iter;
-  SearchList * prev;
-  DownloadList * downloads;
-  GtkTreePath * path;
+  SearchList *prev;
+  DownloadList *downloads;
+  GtkTreePath *path;
   int index;
   int i;
 
   /* remove from linked list */
-  if (search_head == list) {
-    search_head = search_head->next;
-  } else {
-    prev = search_head;
-    while (prev->next != list)
-      prev = prev->next;
-    prev->next = list->next;
-  }
+  if (search_head == list)
+    {
+      search_head = search_head->next;
+    }
+  else
+    {
+      prev = search_head;
+      while (prev->next != list)
+        prev = prev->next;
+      prev->next = list->next;
+    }
 
   /* remove links from download views */
   downloads = download_head;
-  while (downloads != NULL) {
-    if (downloads->searchList == list) {
-      gtk_tree_row_reference_free(downloads->searchViewRowReference);
-      downloads->searchViewRowReference = NULL;
-      downloads->searchList = NULL;
+  while (downloads != NULL)
+    {
+      if (downloads->searchList == list)
+        {
+          gtk_tree_row_reference_free (downloads->searchViewRowReference);
+          downloads->searchViewRowReference = NULL;
+          downloads->searchList = NULL;
+        }
+      downloads = downloads->next;
     }
-    downloads = downloads->next;
-  }
 
   /* remove page from notebook */
   notebook
-    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
-                                        "downloadNotebook"));
+    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
   index = -1;
-  for (i=gtk_notebook_get_n_pages(notebook)-1;i>=0;i--)
-    if (list->searchpage == gtk_notebook_get_nth_page(notebook,
-                                                      i))
+  for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
+    if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
       index = i;
-  GE_BREAK(ectx, index != -1);
-  gtk_notebook_remove_page(notebook,
-                           index);
+  GE_BREAK (ectx, index != -1);
+  gtk_notebook_remove_page (notebook, index);
   /* recursively free search model */
-  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list->tree),
-                                    &iter))
-    freeIterSubtree(GTK_TREE_MODEL(list->tree),
-                    &iter);
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list->tree), &iter))
+    freeIterSubtree (GTK_TREE_MODEL (list->tree), &iter);
 
   /* destroy entry in summary */
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(search_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
-  gtk_list_store_remove(search_summary,
-                        &iter);
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (search_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_list_store_remove (search_summary, &iter);
   /* free list state itself */
-  UNREF(list->searchXML);
-  UNREF(list->labelXML);
-  gtk_tree_row_reference_free(list->summaryViewRowReference);
-  FREE(list->searchString);
-  ECRS_freeUri(list->uri);
-  FREE(list);
+  UNREF (list->searchXML);
+  UNREF (list->labelXML);
+  gtk_tree_row_reference_free (list->summaryViewRowReference);
+  FREE (list->searchString);
+  ECRS_freeUri (list->uri);
+  FREE (list);
 }
 
 /* ****************** User event handling ************* */
@@ -741,34 +662,32 @@ void fs_search_stopped(SearchList * list) {
  * The user has edited the search entry.
  * Update search button status.
  */
-void on_fssearchKeywordComboBoxEntry_changed_fs(gpointer dummy2,
-                                                GtkWidget * searchEntry) {
-  const char * searchString;
-  GtkWidget * searchButton;
-
-  searchString = getEntryLineValue(getMainXML(),
-                                   "fssearchKeywordComboBoxEntry");
-  searchButton
-    = glade_xml_get_widget(getMainXML(),
-                           "fssearchbutton");
-  gtk_widget_set_sensitive(searchButton,
-                           strlen(searchString) > 0);
+void
+on_fssearchKeywordComboBoxEntry_changed_fs (gpointer dummy2,
+                                            GtkWidget * searchEntry)
+{
+  const char *searchString;
+  GtkWidget *searchButton;
+
+  searchString = getEntryLineValue (getMainXML (),
+                                    "fssearchKeywordComboBoxEntry");
+  searchButton = glade_xml_get_widget (getMainXML (), "fssearchbutton");
+  gtk_widget_set_sensitive (searchButton, strlen (searchString) > 0);
 }
 
-typedef struct {
+typedef struct
+{
   unsigned int anonymity;
   unsigned int max;
   cron_t delay;
-  struct ECRS_URI * uri;
+  struct ECRS_URI *uri;
 } FSSS;
 
-static void * search_start_helper(void * cls) {
-  FSSS * fsss = cls;
-  FSUI_startSearch(ctx,
-                   fsss->anonymity,
-                   fsss->max,
-                   fsss->delay,
-                   fsss->uri);
+static void *
+search_start_helper (void *cls)
+{
+  FSSS *fsss = cls;
+  FSUI_startSearch (ctx, fsss->anonymity, fsss->max, fsss->delay, fsss->uri);
   return NULL;
 }
 
@@ -776,147 +695,146 @@ static void * search_start_helper(void * cls) {
  * The user has clicked the "SEARCH" button.
  * Initiate a search.
  */
-void on_fssearchbutton_clicked_fs(gpointer dummy2,
-                                  GtkWidget * searchButton) {
+void
+on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
+{
   FSSS fsss;
-  const char * searchString;
+  const char *searchString;
   gint pages;
   gint i;
-  SearchList * list;
+  SearchList *list;
   GtkTreeIter iter;
-  GtkComboBox * searchKeywordGtkCB;
-  GtkWidget * searchNamespaceGtkCB;
-  GtkNotebook * notebook;
-
-  searchString = getEntryLineValue(getMainXML(),
-                                   "fssearchKeywordComboBoxEntry");
-  if ( (searchString == NULL) ||
-       (strlen(searchString) == 0) ) {
-    GE_LOG(ectx,
-           GE_ERROR | GE_USER | GE_IMMEDIATE,
-           _("Need a keyword to search!\n"));
-    return;
-  }
+  GtkComboBox *searchKeywordGtkCB;
+  GtkWidget *searchNamespaceGtkCB;
+  GtkNotebook *notebook;
+
+  searchString = getEntryLineValue (getMainXML (),
+                                    "fssearchKeywordComboBoxEntry");
+  if ((searchString == NULL) || (strlen (searchString) == 0))
+    {
+      GE_LOG (ectx,
+              GE_ERROR | GE_USER | GE_IMMEDIATE,
+              _("Need a keyword to search!\n"));
+      return;
+    }
   /* add the keyword to the list of keywords that have
      been used so far */
   searchKeywordGtkCB
-    = GTK_COMBO_BOX(glade_xml_get_widget(getMainXML(),
-                                         "fssearchKeywordComboBoxEntry"));
-  i = gtk_combo_box_get_active(searchKeywordGtkCB);
-  if (i == -1) {
-    GtkListStore * model;
-
-    model = GTK_LIST_STORE(gtk_combo_box_get_model(searchKeywordGtkCB));
-    gtk_list_store_prepend(model,
-                           &iter);
-    gtk_list_store_set(model,
-                       &iter,
-                       0, searchString,
-                       -1);
-  }
+    = GTK_COMBO_BOX (glade_xml_get_widget (getMainXML (),
+                                           "fssearchKeywordComboBoxEntry"));
+  i = gtk_combo_box_get_active (searchKeywordGtkCB);
+  if (i == -1)
+    {
+      GtkListStore *model;
+
+      model = GTK_LIST_STORE (gtk_combo_box_get_model (searchKeywordGtkCB));
+      gtk_list_store_prepend (model, &iter);
+      gtk_list_store_set (model, &iter, 0, searchString, -1);
+    }
   fsss.uri = NULL;
   /* check for namespace search */
   searchNamespaceGtkCB
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  if (TRUE == gtk_combo_box_get_active_iter(GTK_COMBO_BOX(searchNamespaceGtkCB),
-                                            &iter)) {
-    char * descStr;
-    char * ns;
-
-    ns = NULL;
-    descStr = NULL;
-    gtk_tree_model_get(gtk_combo_box_get_model(GTK_COMBO_BOX(searchNamespaceGtkCB)),
-                       &iter,
-                       NS_SEARCH_DESCRIPTION, &descStr,
-                       NS_SEARCH_ENCNAME, &ns,
-                       -1);
-
-    if ( (descStr != NULL) &&
-         (0 == strcmp(descStr,
-                      _("globally"))) ) {
+    = glade_xml_get_widget (getMainXML (), "searchNamespaceComboBoxEntry");
+  if (TRUE ==
+      gtk_combo_box_get_active_iter (GTK_COMBO_BOX (searchNamespaceGtkCB),
+                                     &iter))
+    {
+      char *descStr;
+      char *ns;
+
       ns = NULL;
-    } else {
-      GE_ASSERT(ectx, strlen(ns) == sizeof(EncName) - 1);
-      if ( (descStr == NULL) &&
-           (ns != NULL) )
-        descStr = STRDUP(ns);
+      descStr = NULL;
+      gtk_tree_model_get (gtk_combo_box_get_model
+                          (GTK_COMBO_BOX (searchNamespaceGtkCB)), &iter,
+                          NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_ENCNAME,
+                          &ns, -1);
+
+      if ((descStr != NULL) && (0 == strcmp (descStr, _("globally"))))
+        {
+          ns = NULL;
+        }
+      else
+        {
+          GE_ASSERT (ectx, strlen (ns) == sizeof (EncName) - 1);
+          if ((descStr == NULL) && (ns != NULL))
+            descStr = STRDUP (ns);
+        }
+      if (ns != NULL)
+        {
+          char *ustring;
+
+          ustring = MALLOC (strlen (searchString) + sizeof (EncName) +
+                            strlen (ECRS_URI_PREFIX) +
+                            strlen (ECRS_SUBSPACE_INFIX) + 10);
+          strcpy (ustring, ECRS_URI_PREFIX);
+          strcat (ustring, ECRS_SUBSPACE_INFIX);
+          strcat (ustring, ns);
+          strcat (ustring, "/");
+          strcat (ustring, searchString);
+          fsss.uri = ECRS_stringToUri (ectx, ustring);
+          if (fsss.uri == NULL)
+            {
+              GE_LOG (ectx,
+                      GE_ERROR | GE_BULK | GE_USER,
+                      _("Failed to create namespace URI from `%s'.\n"),
+                      ustring);
+            }
+          FREE (ustring);
+        }
+      if (descStr != NULL)
+        free (descStr);
+      if (ns != NULL)
+        free (ns);
     }
-    if (ns != NULL) {
-      char * ustring;
-
-      ustring = MALLOC(strlen(searchString) + sizeof(EncName) +
-                       strlen(ECRS_URI_PREFIX) +
-                       strlen(ECRS_SUBSPACE_INFIX) + 10);
-      strcpy(ustring, ECRS_URI_PREFIX);
-      strcat(ustring, ECRS_SUBSPACE_INFIX);
-      strcat(ustring, ns);
-      strcat(ustring, "/");
-      strcat(ustring, searchString);
-      fsss.uri = ECRS_stringToUri(ectx, ustring);
-      if (fsss.uri == NULL) {
-        GE_LOG(ectx,
-               GE_ERROR | GE_BULK | GE_USER,
-               _("Failed to create namespace URI from `%s'.\n"),
-               ustring);
-      }
-      FREE(ustring);
-    }
-    if (descStr != NULL)
-      free(descStr);
-    if (ns != NULL)
-      free(ns);
-  }
   if (fsss.uri == NULL)
-    fsss.uri = ECRS_parseCharKeywordURI(ectx, searchString);
-  if (fsss.uri == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
+    fsss.uri = ECRS_parseCharKeywordURI (ectx, searchString);
+  if (fsss.uri == NULL)
+    {
+      GE_BREAK (ectx, 0);
+      return;
+    }
   /* check if search is already running */
   notebook
-    = GTK_NOTEBOOK(glade_xml_get_widget(getMainXML(),
-                                        "downloadNotebook"));
-  pages = gtk_notebook_get_n_pages(notebook);
+    = GTK_NOTEBOOK (glade_xml_get_widget (getMainXML (), "downloadNotebook"));
+  pages = gtk_notebook_get_n_pages (notebook);
   list = search_head;
-  while (list != NULL) {
-    if (ECRS_equalsUri(list->uri,
-                       fsss.uri)) {
-      for (i=0;i<pages;i++) {
-        if (gtk_notebook_get_nth_page(notebook,
-                                      i)
-            == list->searchpage) {
-          gtk_notebook_set_current_page(notebook,
-                                        i);
-          ECRS_freeUri(fsss.uri);
-          return;
-        }
-      }
-      GE_BREAK(ectx, 0);
+  while (list != NULL)
+    {
+      if (ECRS_equalsUri (list->uri, fsss.uri))
+        {
+          for (i = 0; i < pages; i++)
+            {
+              if (gtk_notebook_get_nth_page (notebook, i) == list->searchpage)
+                {
+                  gtk_notebook_set_current_page (notebook, i);
+                  ECRS_freeUri (fsss.uri);
+                  return;
+                }
+            }
+          GE_BREAK (ectx, 0);
+        }
+      list = list->next;
     }
-    list = list->next;
-  }
-  fsss.anonymity = getSpinButtonValue(getMainXML(),
-                                      "searchAnonymitySelectionSpinButton");
-  fsss.max = getSpinButtonValue(getMainXML(),
-                                "maxResultsSpinButton");
-  fsss.delay = getSpinButtonValue(getMainXML(),
-                                  "searchDelaySpinButton") * cronSECONDS;
-  run_with_save_calls(search_start_helper,
-                      &fsss);
-  ECRS_freeUri(fsss.uri);
+  fsss.anonymity = getSpinButtonValue (getMainXML (),
+                                       "searchAnonymitySelectionSpinButton");
+  fsss.max = getSpinButtonValue (getMainXML (), "maxResultsSpinButton");
+  fsss.delay = getSpinButtonValue (getMainXML (),
+                                   "searchDelaySpinButton") * cronSECONDS;
+  run_with_save_calls (search_start_helper, &fsss);
+  ECRS_freeUri (fsss.uri);
 }
 
-struct FCBC {
-  int (*method)(struct FSUI_Context * ctx,
-                struct FSUI_SearchList * list);
-  struct FSUI_SearchList * argument;
+struct FCBC
+{
+  int (*method) (struct FSUI_Context * ctx, struct FSUI_SearchList * list);
+  struct FSUI_SearchList *argument;
 };
 
-static void * fsui_callback(void * cls) {
-  struct FCBC * fcbc = cls;
-  fcbc->method(ctx,
-               fcbc->argument);
+static void *
+fsui_callback (void *cls)
+{
+  struct FCBC *fcbc = cls;
+  fcbc->method (ctx, fcbc->argument);
   return NULL;
 }
 
@@ -928,132 +846,131 @@ static void * fsui_callback(void * cls) {
  * either refer to the main page in the tab or to the
  * main entry of the tab label.
  */
-void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
-                                     GtkWidget * closeButton) {
-  SearchList * list;
+void
+on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
+                                 GtkWidget * closeButton)
+{
+  SearchList *list;
   struct FCBC fcbc;
 
   list = search_head;
-  while (list != NULL) {
-    if ( (list->searchpage == searchPage) ||
-         (list->tab_label  == searchPage) )
-      break;
-    list = list->next;
-  }
-  GE_ASSERT(ectx, list != NULL);
-  if (list->fsui_list == NULL) {
-    /* open directory - close directly */
-    fs_search_stopped(list);
-  } else {
-    /* actual search - close via FSUI */
-    fcbc.method = &FSUI_abortSearch;
-    fcbc.argument = list->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-    fcbc.method = &FSUI_stopSearch;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-  }
+  while (list != NULL)
+    {
+      if ((list->searchpage == searchPage) || (list->tab_label == searchPage))
+        break;
+      list = list->next;
+    }
+  GE_ASSERT (ectx, list != NULL);
+  if (list->fsui_list == NULL)
+    {
+      /* open directory - close directly */
+      fs_search_stopped (list);
+    }
+  else
+    {
+      /* actual search - close via FSUI */
+      fcbc.method = &FSUI_abortSearch;
+      fcbc.argument = list->fsui_list;
+      run_with_save_calls (&fsui_callback, &fcbc);
+      fcbc.method = &FSUI_stopSearch;
+      run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
 /**
  * The abort button was clicked.  Abort the search.
  */
-void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
-                                     GtkWidget * closeButton) {
-  SearchList * list;
+void
+on_abortSearchButton_clicked_fs (GtkWidget * searchPage,
+                                 GtkWidget * closeButton)
+{
+  SearchList *list;
   struct FCBC fcbc;
 
   list = search_head;
-  while (list != NULL) {
-    if (list->searchpage == searchPage)
-      break;
-    list = list->next;
-  }
-  GE_ASSERT(ectx, list != NULL);
-  if (list->fsui_list != NULL) {
-    fcbc.method = &FSUI_abortSearch;
-    fcbc.argument = list->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-  }
+  while (list != NULL)
+    {
+      if (list->searchpage == searchPage)
+        break;
+      list = list->next;
+    }
+  GE_ASSERT (ectx, list != NULL);
+  if (list->fsui_list != NULL)
+    {
+      fcbc.method = &FSUI_abortSearch;
+      fcbc.argument = list->fsui_list;
+      run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
-static void stopSearch(GtkTreeModel * model,
-                       GtkTreePath * path,
-                       GtkTreeIter * iter,
-                       gpointer unused) {
-  SearchList * s;
+static void
+stopSearch (GtkTreeModel * model,
+            GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
+{
+  SearchList *s;
   struct FCBC fcbc;
 
   s = NULL;
-  gtk_tree_model_get(model,
-                     iter,
-                     SEARCH_SUMMARY_INTERNAL, &s,
-                     -1);
-  if (s != NULL) {
-    if (s->fsui_list == NULL) {
-      /* open directory - close directly */
-      fs_search_stopped(s);
-    } else {
-      fcbc.method = &FSUI_abortSearch;
-      fcbc.argument = s->fsui_list;
-      run_with_save_calls(&fsui_callback,
-                          &fcbc);
-      fcbc.method = &FSUI_stopSearch;
-      run_with_save_calls(&fsui_callback,
-                          &fcbc);
+  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
+  if (s != NULL)
+    {
+      if (s->fsui_list == NULL)
+        {
+          /* open directory - close directly */
+          fs_search_stopped (s);
+        }
+      else
+        {
+          fcbc.method = &FSUI_abortSearch;
+          fcbc.argument = s->fsui_list;
+          run_with_save_calls (&fsui_callback, &fcbc);
+          fcbc.method = &FSUI_stopSearch;
+          run_with_save_calls (&fsui_callback, &fcbc);
+        }
     }
-  }
 }
 
 /**
  * The stop button in the search summary was clicked.
  */
-void on_closeSearchSummaryButton_clicked_fs(GtkWidget * treeview,
-                                            GtkWidget * closeButton) {
-  GtkTreeSelection * selection;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  ggc_tree_selection_selected_foreach
-    (selection,
-     &stopSearch,
-     NULL);
+void
+on_closeSearchSummaryButton_clicked_fs (GtkWidget * treeview,
+                                        GtkWidget * closeButton)
+{
+  GtkTreeSelection *selection;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+  ggc_tree_selection_selected_foreach (selection, &stopSearch, NULL);
 }
 
-static void abortSearch(GtkTreeModel * model,
-                        GtkTreePath * path,
-                        GtkTreeIter * iter,
-                        gpointer unused) {
-  SearchList * s;
+static void
+abortSearch (GtkTreeModel * model,
+             GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
+{
+  SearchList *s;
   struct FCBC fcbc;
 
   s = NULL;
-  gtk_tree_model_get(model,
-                     iter,
-                     SEARCH_SUMMARY_INTERNAL, &s,
-                     -1);
-  if ( (s != NULL) &&
-       (s->fsui_list != NULL) ) {
-    fcbc.method = &FSUI_abortSearch;
-    fcbc.argument = s->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-  }
+  gtk_tree_model_get (model, iter, SEARCH_SUMMARY_INTERNAL, &s, -1);
+  if ((s != NULL) && (s->fsui_list != NULL))
+    {
+      fcbc.method = &FSUI_abortSearch;
+      fcbc.argument = s->fsui_list;
+      run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
 /**
  * The abort button in the search summary was clicked.
  */
-void on_abortSearchSummaryButton_clicked_fs(GtkWidget * treeview,
-                                            GtkWidget * closeButton) {
-  GtkTreeSelection * selection;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
-  ggc_tree_selection_selected_foreach
-    (selection,
-     &abortSearch,
-     NULL);
+void
+on_abortSearchSummaryButton_clicked_fs (GtkWidget * treeview,
+                                        GtkWidget * closeButton)
+{
+  GtkTreeSelection *selection;
+
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+  ggc_tree_selection_selected_foreach (selection, &abortSearch, NULL);
 }
 
 /* end of search.c */
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index 4afc1496..82d7a8f3 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -36,10 +36,9 @@
  * Add the given search result to the search
  * tree at the specified position.
  */
-void addEntryToSearchTree(SearchList * searchContext,
-                          DownloadList * downloadParent,
-                          const ECRS_FileInfo * info,
-                          GtkTreeIter * iter);
+void addEntryToSearchTree (SearchList * searchContext,
+                           DownloadList * downloadParent,
+                           const ECRS_FileInfo * info, GtkTreeIter * iter);
 
 /**
  * Add the given result to the model (search result
@@ -49,31 +48,30 @@ void addEntryToSearchTree(SearchList * searchContext,
  * @param path the tree path that selects where to add
  *        the information, NULL for top-level
  */
-void fs_search_result_received(SearchList * searchContext,
-                               const ECRS_FileInfo * info,
-                               const struct ECRS_URI * uri);
+void fs_search_result_received (SearchList * searchContext,
+                                const ECRS_FileInfo * info,
+                                const struct ECRS_URI *uri);
 
 /**
  * A search has been started.  Open tab.
  *
  * @return internal search context
  */
-SearchList *
-fs_search_started(struct FSUI_SearchList * list,
-                  const struct ECRS_URI * uri,
-                  unsigned int anonymityLevel,
-                  unsigned int resultCount,
-                  const ECRS_FileInfo * results,
-                  FSUI_State state);
+SearchList *fs_search_started (struct FSUI_SearchList *list,
+                               const struct ECRS_URI *uri,
+                               unsigned int anonymityLevel,
+                               unsigned int resultCount,
+                               const ECRS_FileInfo * results,
+                               FSUI_State state);
 
 /**
  * A search process has been aborted.  Update display.
  */
-void fs_search_aborted(SearchList * searchContext);
+void fs_search_aborted (SearchList * searchContext);
 
 /**
  * A search process has stopped.  Clean up.
  */
-void fs_search_stopped(SearchList * searchContext);
+void fs_search_stopped (SearchList * searchContext);
 
 #endif
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 8a19adb1..071d64f1 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -44,145 +44,128 @@
  * (there can only be one at a time;
  * maybe NULL at times where there is no dialog)
  */
-static GladeXML * metaXML;
+static GladeXML *metaXML;
 
 /* ************ FSUI event handlers ************ */
 
-void fs_upload_update(UploadList * list,
-                      unsigned long long completed) {
+void
+fs_upload_update (UploadList * list, unsigned long long completed)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
+  GtkTreePath *path;
   int progress;
 
   if (list->total != 0)
     progress = 100 * completed / list->total;
   else
     progress = 100;
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
-  gtk_tree_store_set(upload_summary,
-                     &iter,
-                     UPLOAD_PROGRESS, progress,
-                     -1);
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_store_set (upload_summary, &iter, UPLOAD_PROGRESS, progress, -1);
 }
 
-void fs_upload_complete(UploadList * list,
-                        struct ECRS_URI * uri) {
+void
+fs_upload_complete (UploadList * list, struct ECRS_URI *uri)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
-  char * us;
+  GtkTreePath *path;
+  char *us;
 
   list->has_terminated = YES;
-  list->uri = ECRS_dupUri(uri);
-  us = ECRS_uriToString(uri);
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
-  gtk_tree_store_set(upload_summary,
-                     &iter,
-                     UPLOAD_URISTRING, us,
-                     -1);
-  FREE(us);
+  list->uri = ECRS_dupUri (uri);
+  us = ECRS_uriToString (uri);
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_store_set (upload_summary, &iter, UPLOAD_URISTRING, us, -1);
+  FREE (us);
 }
 
-void fs_upload_error(UploadList * list) {
+void
+fs_upload_error (UploadList * list)
+{
   /* FIXME: indicate error in summary dialog! */
   list->has_terminated = YES;
 }
 
-void fs_upload_stopped(UploadList * list) {
+void
+fs_upload_stopped (UploadList * list)
+{
   GtkTreeIter iter;
-  GtkTreePath * path;
-  UploadList * prev;
-
-  path = gtk_tree_row_reference_get_path(list->summaryViewRowReference);
-  gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
-                          &iter,
-                          path);
-  gtk_tree_path_free(path);
-  gtk_tree_row_reference_free(list->summaryViewRowReference);
+  GtkTreePath *path;
+  UploadList *prev;
+
+  path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
+  gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
+  gtk_tree_path_free (path);
+  gtk_tree_row_reference_free (list->summaryViewRowReference);
   list->summaryViewRowReference = NULL;
-  gtk_tree_store_remove(upload_summary,
-                        &iter);
-  FREE(list->filename);
-  if (list->uri != NULL) {
-    ECRS_freeUri(list->uri);
-    list->uri = NULL;
-  }
+  gtk_tree_store_remove (upload_summary, &iter);
+  FREE (list->filename);
+  if (list->uri != NULL)
+    {
+      ECRS_freeUri (list->uri);
+      list->uri = NULL;
+    }
   if (upload_head == list)
     upload_head = list->next;
-  else {
-    prev = upload_head;
-    while ( (prev != NULL) &&
-            (prev->next != list) )
-      prev = prev->next;
-    if (prev != NULL)
-      prev->next = list->next;
-    else
-      GE_BREAK(ectx, 0);
-  }
-  FREE(list);
+  else
+    {
+      prev = upload_head;
+      while ((prev != NULL) && (prev->next != list))
+        prev = prev->next;
+      if (prev != NULL)
+        prev->next = list->next;
+      else
+        GE_BREAK (ectx, 0);
+    }
+  FREE (list);
 }
 
 UploadList *
-fs_upload_started(struct FSUI_UploadList * fsui,
-                  UploadList * parent,
-                  const char * filename,
-                  struct ECRS_URI * uri,
-                  unsigned long long total,
-                  unsigned long long completed,
-                  FSUI_State state) {
-  UploadList * ret;
+fs_upload_started (struct FSUI_UploadList *fsui,
+                   UploadList * parent,
+                   const char *filename,
+                   struct ECRS_URI *uri,
+                   unsigned long long total,
+                   unsigned long long completed, FSUI_State state)
+{
+  UploadList *ret;
   GtkTreeIter iter;
-  GtkTreePath * path;
+  GtkTreePath *path;
   int progress;
   GtkTreeIter par;
 
-  ret = MALLOC(sizeof(UploadList));
-  memset(ret,
-         0,
-         sizeof(UploadList));
-  ret->filename = STRDUP(filename);
+  ret = MALLOC (sizeof (UploadList));
+  memset (ret, 0, sizeof (UploadList));
+  ret->filename = STRDUP (filename);
   ret->fsui_list = fsui;
   ret->total = total;
   ret->is_top = parent == NULL;
-  if ( (parent != NULL) &&
-       (NULL != (path = gtk_tree_row_reference_get_path(parent->summaryViewRowReference))) ) {
-    gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
-                            &par,
-                            path);
-    gtk_tree_path_free(path);
-    gtk_tree_store_append(upload_summary,
-                          &iter,
-                          &par);
-  } else {
-    gtk_tree_store_append(upload_summary,
-                          &iter,
-                          NULL);
-  }
+  if ((parent != NULL) &&
+      (NULL !=
+       (path =
+        gtk_tree_row_reference_get_path (parent->summaryViewRowReference))))
+    {
+      gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &par, path);
+      gtk_tree_path_free (path);
+      gtk_tree_store_append (upload_summary, &iter, &par);
+    }
+  else
+    {
+      gtk_tree_store_append (upload_summary, &iter, NULL);
+    }
   if (total != 0)
     progress = 100 * completed / total;
   else
     progress = 100;
-  gtk_tree_store_set(upload_summary,
-                     &iter,
-                     UPLOAD_FILENAME, filename,
-                     UPLOAD_PROGRESS, progress,
-                     UPLOAD_URISTRING, "", /* FIXME: set if URI != NULL! */
-                     UPLOAD_INTERNAL, ret,
-                     -1);
-  path = gtk_tree_model_get_path(GTK_TREE_MODEL(upload_summary),
-                                 &iter);
+  gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename, UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, "",        /* FIXME: set if URI != NULL! */
+                      UPLOAD_INTERNAL, ret, -1);
+  path = gtk_tree_model_get_path (GTK_TREE_MODEL (upload_summary), &iter);
   ret->summaryViewRowReference
-    = gtk_tree_row_reference_new(GTK_TREE_MODEL(upload_summary),
-                                 path);
-  ret->has_terminated = ( (state != FSUI_ACTIVE) &&
-                          (state != FSUI_PENDING) );
+    = gtk_tree_row_reference_new (GTK_TREE_MODEL (upload_summary), path);
+  ret->has_terminated = ((state != FSUI_ACTIVE) && (state != FSUI_PENDING));
 
   ret->next = upload_head;
   upload_head = ret;
@@ -192,476 +175,452 @@ fs_upload_started(struct FSUI_UploadList * fsui,
 /* *************** user upload event handling ************** */
 
 
-void on_selectAlternativePreviewButton_selection_changed_fs(GtkWidget * preview,
-                                                            GtkWidget * fileChooser) {
-  char * fn;
-
-  fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fileChooser));
-  if (fn == NULL) {
-    gtk_image_set_from_pixbuf(GTK_IMAGE(preview),
-                              NULL);
-  } else {
-    GdkPixbuf * buf;
-
-    buf = gdk_pixbuf_new_from_file(fn,
-                                   NULL);
-    gtk_image_set_from_pixbuf(GTK_IMAGE(preview),
-                              buf);
-    g_object_unref(buf);
-    free(fn);
-  }
+void
+on_selectAlternativePreviewButton_selection_changed_fs (GtkWidget * preview,
+                                                        GtkWidget *
+                                                        fileChooser)
+{
+  char *fn;
+
+  fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (fileChooser));
+  if (fn == NULL)
+    {
+      gtk_image_set_from_pixbuf (GTK_IMAGE (preview), NULL);
+    }
+  else
+    {
+      GdkPixbuf *buf;
+
+      buf = gdk_pixbuf_new_from_file (fn, NULL);
+      gtk_image_set_from_pixbuf (GTK_IMAGE (preview), buf);
+      g_object_unref (buf);
+      free (fn);
+    }
 }
 
-void on_metaDataDialogKeywordAddButton_clicked_fs(gpointer dummy,
-                                                  GtkWidget * button) {
-  handleKeywordListUpdate(metaXML,
-                          "fileInformationKeywordEntry",
-                          "metaDataDialogKeywordList");
+void
+on_metaDataDialogKeywordAddButton_clicked_fs (gpointer dummy,
+                                              GtkWidget * button)
+{
+  handleKeywordListUpdate (metaXML,
+                           "fileInformationKeywordEntry",
+                           "metaDataDialogKeywordList");
 }
 
-void on_metaDataDialogMetaDataAddButton_clicked_fs(gpointer dummy,
-                                                   GtkWidget * button) {
-  handleMetaDataListUpdate(metaXML,
-                           "metaDataDialogMetaTypeComboBox",
-                           "metaDataDialogValueEntry",
-                           "metaDataDialogMetaDataList");
+void
+on_metaDataDialogMetaDataAddButton_clicked_fs (gpointer dummy,
+                                               GtkWidget * button)
+{
+  handleMetaDataListUpdate (metaXML,
+                            "metaDataDialogMetaTypeComboBox",
+                            "metaDataDialogValueEntry",
+                            "metaDataDialogMetaDataList");
 }
 
-void on_metaDataDialogKeywordRemoveButton_clicked_fs(gpointer dummy,
-                                                     GtkWidget * button) {
-  handleListRemove(metaXML,
-                   "metaDataDialogKeywordList");
+void
+on_metaDataDialogKeywordRemoveButton_clicked_fs (gpointer dummy,
+                                                 GtkWidget * button)
+{
+  handleListRemove (metaXML, "metaDataDialogKeywordList");
 }
 
-void on_metaDataDialogMetaDataRemoveButton_clicked_fs(gpointer dummy,
-                                                      GtkWidget * button) {
-  handleListRemove(metaXML,
-                   "metaDataDialogMetaDataList");
+void
+on_metaDataDialogMetaDataRemoveButton_clicked_fs (gpointer dummy,
+                                                  GtkWidget * button)
+{
+  handleListRemove (metaXML, "metaDataDialogMetaDataList");
 }
 
 /**
  * The selection of the keyword list changed.
  * Update button status.
  */
-static void on_keyword_list_selection_changed(gpointer signal,
-                                              gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                             "metaDataDialogKeywordList")));
-  button
-    = glade_xml_get_widget(metaXML,
-                           "metaDataDialogKeywordRemoveButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_keyword_list_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (metaXML, "metaDataDialogKeywordList")));
+  button =
+    glade_xml_get_widget (metaXML, "metaDataDialogKeywordRemoveButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The selection of the metadata list changed.
  * Update button status.
  */
-static void on_metadata_list_selection_changed(gpointer signal,
-                                               gpointer cls) {
-  GtkTreeSelection * selection;
-  GtkWidget * button;
-
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                             "metaDataDialogMetaDataList")));
-  button
-    = glade_xml_get_widget(metaXML,
-                           "metaDataDialogMetaDataRemoveButton");
-  gtk_widget_set_sensitive(button,
-                           gtk_tree_selection_count_selected_rows(selection) > 0);
+static void
+on_metadata_list_selection_changed (gpointer signal, gpointer cls)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *button;
+
+  selection =
+    gtk_tree_view_get_selection (GTK_TREE_VIEW
+                                 (glade_xml_get_widget
+                                  (metaXML, "metaDataDialogMetaDataList")));
+  button =
+    glade_xml_get_widget (metaXML, "metaDataDialogMetaDataRemoveButton");
+  gtk_widget_set_sensitive (button,
+                            gtk_tree_selection_count_selected_rows (selection)
+                            > 0);
 }
 
 /**
  * The user has edited the metadata entry.
  * Update add button status.
  */
-void on_metaDataDialogValueEntry_changed_fs(gpointer dummy2,
-                                            GtkWidget * searchEntry) {
-  const char * input;
-  GtkWidget * button;
-
-  input = gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(metaXML,
-                                                            "metaDataDialogValueEntry")));
+void
+on_metaDataDialogValueEntry_changed_fs (gpointer dummy2,
+                                        GtkWidget * searchEntry)
+{
+  const char *input;
+  GtkWidget *button;
+
+  input = gtk_entry_get_text (GTK_ENTRY (glade_xml_get_widget (metaXML,
+                                                               "metaDataDialogValueEntry")));
   if (input == NULL)
     return;
-  button
-    = glade_xml_get_widget(metaXML,
-                           "metaDataDialogMetaDataAddButton");
-  gtk_widget_set_sensitive(button,
-                           strlen(input) > 0);
+  button = glade_xml_get_widget (metaXML, "metaDataDialogMetaDataAddButton");
+  gtk_widget_set_sensitive (button, strlen (input) > 0);
 }
 
 /**
  * The user has edited the keyword entry.
  * Update add button status.
  */
-void on_fileInformationKeywordEntry_changed_fs(gpointer dummy2,
-                                               GtkWidget * searchEntry) {
-  const char * input;
-  GtkWidget * button;
-
-  input = gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(metaXML,
-                                                            "fileInformationKeywordEntry")));
+void
+on_fileInformationKeywordEntry_changed_fs (gpointer dummy2,
+                                           GtkWidget * searchEntry)
+{
+  const char *input;
+  GtkWidget *button;
+
+  input = gtk_entry_get_text (GTK_ENTRY (glade_xml_get_widget (metaXML,
+                                                               "fileInformationKeywordEntry")));
   if (input == NULL)
     return;
-  button
-    = glade_xml_get_widget(metaXML,
-                           "metaDataDialogKeywordAddButton");
-  gtk_widget_set_sensitive(button,
-                           strlen(input) > 0);
+  button = glade_xml_get_widget (metaXML, "metaDataDialogKeywordAddButton");
+  gtk_widget_set_sensitive (button, strlen (input) > 0);
 }
 
-typedef struct {
-  char * filename;
+typedef struct
+{
+  char *filename;
   unsigned int anonymity;
   unsigned int priority;
   int index;
   int extract;
   int deep_index;
   cron_t expire;
-  struct ECRS_MetaData * meta;
-  struct ECRS_URI * gkeywordURI;
-  struct ECRS_URI * keywordURI;
+  struct ECRS_MetaData *meta;
+  struct ECRS_URI *gkeywordURI;
+  struct ECRS_URI *keywordURI;
 } FSUC;
 
-static void * start_upload_helper(void * cls) {
-  FSUC * fsuc = cls;
-
-  FSUI_startUpload(ctx,
-                   fsuc->filename,
-                   (DirectoryScanCallback) &disk_directory_scan,
-                   ectx,
-                   fsuc->anonymity,
-                   fsuc->priority,
-                   fsuc->index,
-                   fsuc->extract,
-                   fsuc->deep_index,
-                   fsuc->expire,
-                   fsuc->meta,
-                   fsuc->gkeywordURI,
-                   fsuc->keywordURI);
+static void *
+start_upload_helper (void *cls)
+{
+  FSUC *fsuc = cls;
+
+  FSUI_startUpload (ctx,
+                    fsuc->filename,
+                    (DirectoryScanCallback) & disk_directory_scan,
+                    ectx,
+                    fsuc->anonymity,
+                    fsuc->priority,
+                    fsuc->index,
+                    fsuc->extract,
+                    fsuc->deep_index,
+                    fsuc->expire,
+                    fsuc->meta, fsuc->gkeywordURI, fsuc->keywordURI);
   return NULL;
 }
 
-void on_fsinsertuploadbutton_clicked_fs(gpointer dummy,
-                                        GtkWidget * uploadButton) {
+void
+on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
+{
   FSUC fsuc;
-  const char * filename;
-  const char * filenamerest;
-  GtkWidget * dialog;
-  EXTRACTOR_ExtractorList * extractors;
-  char * config;
-  struct ECRS_MetaData * meta;
-  struct ECRS_URI * keywordURI;
-
-  extractors = EXTRACTOR_loadDefaultLibraries();
+  const char *filename;
+  const char *filenamerest;
+  GtkWidget *dialog;
+  EXTRACTOR_ExtractorList *extractors;
+  char *config;
+  struct ECRS_MetaData *meta;
+  struct ECRS_URI *keywordURI;
+
+  extractors = EXTRACTOR_loadDefaultLibraries ();
   config = NULL;
-  GC_get_configuration_value_string(cfg,
-                                    "FS",
-                                    "EXTRACTORS",
-                                    "",
-                                    &config);
-  if (strlen(config) > 0)
-    extractors = EXTRACTOR_loadConfigLibraries(extractors,
-                                               config);
-  FREE(config);
-  filename = getEntryLineValue(getMainXML(),
-                               "uploadFilenameComboBoxEntry");
+  GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "", &config);
+  if (strlen (config) > 0)
+    extractors = EXTRACTOR_loadConfigLibraries (extractors, config);
+  FREE (config);
+  filename = getEntryLineValue (getMainXML (), "uploadFilenameComboBoxEntry");
   metaXML
-    = glade_xml_new(getGladeFileName(),
-                    "metaDataDialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(metaXML);
-  dialog = glade_xml_get_widget(metaXML,
-                                "metaDataDialog");
-  meta = ECRS_createMetaData();
-  ECRS_extractMetaData(ectx,
-                       meta,
-                       filename,
-                       extractors);
-  EXTRACTOR_removeAll(extractors);
-  filenamerest = &filename[strlen(filename)-1];
-  while ( (filenamerest > filename) &&
-          (filenamerest[-1] != DIR_SEPARATOR) )
+    = glade_xml_new (getGladeFileName (), "metaDataDialog", PACKAGE_NAME);
+  connectGladeWithPlugins (metaXML);
+  dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
+  meta = ECRS_createMetaData ();
+  ECRS_extractMetaData (ectx, meta, filename, extractors);
+  EXTRACTOR_removeAll (extractors);
+  filenamerest = &filename[strlen (filename) - 1];
+  while ((filenamerest > filename) && (filenamerest[-1] != DIR_SEPARATOR))
     filenamerest--;
-  ECRS_addToMetaData(meta,
-                     EXTRACTOR_FILENAME,
-                     filenamerest);
-  createMetaDataListTreeView(metaXML,
-                             "metaDataDialogMetaDataList",
-                             "previewImage",
-                             meta);
-  keywordURI = ECRS_metaDataToUri(meta);
-  ECRS_freeMetaData(meta);
-  createKeywordListTreeView(metaXML,
-                            "metaDataDialogKeywordList",
-                            keywordURI);
-  ECRS_freeUri(keywordURI);
-  createMetaTypeComboBox(metaXML,
-                         "metaDataDialogMetaTypeComboBox");
-  g_signal_connect_data(gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                                       "metaDataDialogKeywordList"))),
-                        "changed",
-                        G_CALLBACK(&on_keyword_list_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-  g_signal_connect_data(gtk_tree_view_get_selection(GTK_TREE_VIEW(glade_xml_get_widget(metaXML,
-                                                                                       "metaDataDialogMetaDataList"))),
-                        "changed",
-                        G_CALLBACK(&on_metadata_list_selection_changed),
-                        NULL,
-                        NULL,
-                        0);
-  gtk_dialog_set_default_response(GTK_DIALOG(dialog),
-                                  GTK_RESPONSE_OK);
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL) {
-    fsuc.anonymity = getSpinButtonValue(getMainXML(),
-                                        "uploadAnonymityLevelSpinButton");
-    fsuc.priority = getSpinButtonValue(getMainXML(),
-                                       "contentPrioritySpinButton");
-    fsuc.index = getToggleButtonValue(getMainXML(),
-                                      "indexbutton");
-    fsuc.extract = getToggleButtonValue(getMainXML(),
-                                        "doExtractCheckButton");
-    fsuc.deep_index = getToggleButtonValue(getMainXML(),
-                                           "deepIndexCheckButton");
-    fsuc.expire = get_time() + 2 * cronYEARS;
-    fsuc.meta = getMetaDataFromList(metaXML,
-                                    "metaDataDialogMetaDataList",
-                                    "previewImage");
-    fsuc.keywordURI = getKeywordURIFromList(metaXML,
-                                       "metaDataDialogKeywordList");
-    fsuc.gkeywordURI = ECRS_stringToUri(ectx,
-                                   ECRS_URI_PREFIX
-                                   ECRS_SEARCH_INFIX);
-    fsuc.filename = STRDUP(filename);
-    run_with_save_calls(&start_upload_helper,
-                        &fsuc);
-    FREE(fsuc.filename);
-    ECRS_freeMetaData(fsuc.meta);
-    ECRS_freeUri(fsuc.gkeywordURI);
-    ECRS_freeUri(fsuc.keywordURI);
-  }
+  ECRS_addToMetaData (meta, EXTRACTOR_FILENAME, filenamerest);
+  createMetaDataListTreeView (metaXML,
+                              "metaDataDialogMetaDataList",
+                              "previewImage", meta);
+  keywordURI = ECRS_metaDataToUri (meta);
+  ECRS_freeMetaData (meta);
+  createKeywordListTreeView (metaXML,
+                             "metaDataDialogKeywordList", keywordURI);
+  ECRS_freeUri (keywordURI);
+  createMetaTypeComboBox (metaXML, "metaDataDialogMetaTypeComboBox");
+  g_signal_connect_data (gtk_tree_view_get_selection
+                         (GTK_TREE_VIEW
+                          (glade_xml_get_widget
+                           (metaXML, "metaDataDialogKeywordList"))),
+                         "changed",
+                         G_CALLBACK (&on_keyword_list_selection_changed),
+                         NULL, NULL, 0);
+  g_signal_connect_data (gtk_tree_view_get_selection
+                         (GTK_TREE_VIEW
+                          (glade_xml_get_widget
+                           (metaXML, "metaDataDialogMetaDataList"))),
+                         "changed",
+                         G_CALLBACK (&on_metadata_list_selection_changed),
+                         NULL, NULL, 0);
+  gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
+    {
+      fsuc.anonymity = getSpinButtonValue (getMainXML (),
+                                           "uploadAnonymityLevelSpinButton");
+      fsuc.priority = getSpinButtonValue (getMainXML (),
+                                          "contentPrioritySpinButton");
+      fsuc.index = getToggleButtonValue (getMainXML (), "indexbutton");
+      fsuc.extract = getToggleButtonValue (getMainXML (),
+                                           "doExtractCheckButton");
+      fsuc.deep_index = getToggleButtonValue (getMainXML (),
+                                              "deepIndexCheckButton");
+      fsuc.expire = get_time () + 2 * cronYEARS;
+      fsuc.meta = getMetaDataFromList (metaXML,
+                                       "metaDataDialogMetaDataList",
+                                       "previewImage");
+      fsuc.keywordURI = getKeywordURIFromList (metaXML,
+                                               "metaDataDialogKeywordList");
+      fsuc.gkeywordURI = ECRS_stringToUri (ectx,
+                                           ECRS_URI_PREFIX ECRS_SEARCH_INFIX);
+      fsuc.filename = STRDUP (filename);
+      run_with_save_calls (&start_upload_helper, &fsuc);
+      FREE (fsuc.filename);
+      ECRS_freeMetaData (fsuc.meta);
+      ECRS_freeUri (fsuc.gkeywordURI);
+      ECRS_freeUri (fsuc.keywordURI);
+    }
   gtk_widget_destroy (dialog);
-  UNREF(metaXML);
+  UNREF (metaXML);
   metaXML = NULL;
 }
 
 #ifndef MINGW
 static char *
-selectFile(const char * oldfilename) {
-  GladeXML * uploadXML;
-  GtkFileChooser * dialog;
-  char * ret;
+selectFile (const char *oldfilename)
+{
+  GladeXML *uploadXML;
+  GtkFileChooser *dialog;
+  char *ret;
 
   uploadXML
-    = glade_xml_new(getGladeFileName(),
-                    "uploadfilechooserdialog",
-                    PACKAGE_NAME);
-  connectGladeWithPlugins(uploadXML);
-  dialog = GTK_FILE_CHOOSER(glade_xml_get_widget(uploadXML,
-                                                 "uploadfilechooserdialog"));
-  gtk_file_chooser_set_filename(dialog,
-                                oldfilename);
-  if (getToggleButtonValue(getMainXML(),
-                           "scopeRecursiveButton"))
-    gtk_file_chooser_set_action(dialog,
-                                GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-  if (gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_CANCEL)
-    ret = gtk_file_chooser_get_filename(dialog);
+    = glade_xml_new (getGladeFileName (),
+                     "uploadfilechooserdialog", PACKAGE_NAME);
+  connectGladeWithPlugins (uploadXML);
+  dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
+                                                   "uploadfilechooserdialog"));
+  gtk_file_chooser_set_filename (dialog, oldfilename);
+  if (getToggleButtonValue (getMainXML (), "scopeRecursiveButton"))
+    gtk_file_chooser_set_action (dialog,
+                                 GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
+    ret = gtk_file_chooser_get_filename (dialog);
   else
     ret = NULL;
-  gtk_widget_destroy(GTK_WIDGET(dialog));
-  UNREF(uploadXML);
+  gtk_widget_destroy (GTK_WIDGET (dialog));
+  UNREF (uploadXML);
   return ret;
 }
 
 #else /* MINGW */
 
 static char *
-selectFile(const char * oldfilename) {
-  if (getToggleButtonValue(getMainXML(),
-                           "scopeFileOnlyButton"))
-    return plibc_ChooseFile(_("Choose the file you want to publish."),
-                            OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
-  return plibc_ChooseDir(_("Choose the directory you want to publish."),
-                         BIF_USENEWUI | BIF_SHAREABLE | BIF_NONEWFOLDERBUTTON);
+selectFile (const char *oldfilename)
+{
+  if (getToggleButtonValue (getMainXML (), "scopeFileOnlyButton"))
+    return plibc_ChooseFile (_("Choose the file you want to publish."),
+                             OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
+  return plibc_ChooseDir (_("Choose the directory you want to publish."),
+                          BIF_USENEWUI | BIF_SHAREABLE |
+                          BIF_NONEWFOLDERBUTTON);
 }
 #endif /* MINGW */
 
-void on_mainFileSharingInsertBrowseButton_clicked_fs(GtkWidget * browseButton,
-                                                     gpointer dummy) {
-  char * filename;
-  char * ofn;
+void
+on_mainFileSharingInsertBrowseButton_clicked_fs (GtkWidget * browseButton,
+                                                 gpointer dummy)
+{
+  char *filename;
+  char *ofn;
   const char *oldfilename;
-  GtkWidget * uploadLine;
-  GtkEntry * entry;
-  GtkListStore * model;
+  GtkWidget *uploadLine;
+  GtkEntry *entry;
+  GtkListStore *model;
   GtkTreeIter iter;
 
-  uploadLine = glade_xml_get_widget(getMainXML(),
-                                    "uploadFilenameComboBoxEntry");
-  entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(uploadLine)));
-  oldfilename = gtk_entry_get_text(entry);
+  uploadLine = glade_xml_get_widget (getMainXML (),
+                                     "uploadFilenameComboBoxEntry");
+  entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (uploadLine)));
+  oldfilename = gtk_entry_get_text (entry);
   if (oldfilename == NULL)
-    oldfilename = getenv("PWD");
+    oldfilename = getenv ("PWD");
   if (oldfilename == NULL)
-    oldfilename = getenv("HOME");
+    oldfilename = getenv ("HOME");
   if (oldfilename == NULL)
     oldfilename = "/";
-  ofn = string_expandFileName(ectx, oldfilename);
-  filename = selectFile(ofn);
-  FREE(ofn);
+  ofn = string_expandFileName (ectx, oldfilename);
+  filename = selectFile (ofn);
+  FREE (ofn);
   if (NULL == filename)
     return;
-  gtk_entry_set_text(entry,
-                     filename);
-  model = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(uploadLine)));
-  gtk_list_store_prepend(model,
-                         &iter);
-  gtk_list_store_set(model,
-                     &iter,
-                     0,
-                     filename,
-                     -1);
-  free(filename);
+  gtk_entry_set_text (entry, filename);
+  model =
+    GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (uploadLine)));
+  gtk_list_store_prepend (model, &iter);
+  gtk_list_store_set (model, &iter, 0, filename, -1);
+  free (filename);
 }
 
-struct FCBC {
-  int (*method)(struct FSUI_Context * ctx,
-                struct FSUI_UploadList * list);
-  struct FSUI_UploadList * argument;
+struct FCBC
+{
+  int (*method) (struct FSUI_Context * ctx, struct FSUI_UploadList * list);
+  struct FSUI_UploadList *argument;
 };
 
-static void * fsui_callback(void * cls) {
-  struct FCBC * fcbc = cls;
-  fcbc->method(ctx,
-               fcbc->argument);
+static void *
+fsui_callback (void *cls)
+{
+  struct FCBC *fcbc = cls;
+  fcbc->method (ctx, fcbc->argument);
   return NULL;
 }
 
 static void
-clearCompletedUploadCallback(GtkTreeModel * model,
-                             GtkTreePath * path,
-                             GtkTreeIter * iter,
-                             gpointer unused) {
-  UploadList * ul;
+clearCompletedUploadCallback (GtkTreeModel * model,
+                              GtkTreePath * path,
+                              GtkTreeIter * iter, gpointer unused)
+{
+  UploadList *ul;
   struct FCBC fcbc;
 
-  GE_ASSERT(ectx,
-            model == GTK_TREE_MODEL(upload_summary));
-  gtk_tree_model_get(model,
-                     iter,
-                     UPLOAD_INTERNAL, &ul,
-                     -1);
-  if ( (ul->has_terminated) &&
-       (ul->is_top) ) {
-    fcbc.method = &FSUI_stopUpload;
-    fcbc.argument = ul->fsui_list;
-    run_with_save_calls(&fsui_callback,
-                        &fcbc);
-  }
+  GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+  gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
+  if ((ul->has_terminated) && (ul->is_top))
+    {
+      fcbc.method = &FSUI_stopUpload;
+      fcbc.argument = ul->fsui_list;
+      run_with_save_calls (&fsui_callback, &fcbc);
+    }
 }
 
 /**
  * The user has edited the search entry.
  * Update search button status.
  */
-void on_uploadFilenameComboBoxEntry_changed_fs(gpointer dummy2,
-                                               GtkWidget * searchEntry) {
-  const char * filename;
-  GtkWidget * uploadButton;
+void
+on_uploadFilenameComboBoxEntry_changed_fs (gpointer dummy2,
+                                           GtkWidget * searchEntry)
+{
+  const char *filename;
+  GtkWidget *uploadButton;
   struct stat buf;
   int ok;
-  GtkWidget * toggle;
+  GtkWidget *toggle;
 
-  filename = getEntryLineValue(getMainXML(),
-                               "uploadFilenameComboBoxEntry");
-  ok = (0 == stat(filename, &buf));
+  filename = getEntryLineValue (getMainXML (), "uploadFilenameComboBoxEntry");
+  ok = (0 == stat (filename, &buf));
+  if (ok)
+    ok = (0 == ACCESS (filename, R_OK));
   if (ok)
-    ok = (0 == ACCESS(filename, R_OK));
-  if (ok) {
-    if (S_ISDIR(buf.st_mode)) {
-      toggle = glade_xml_get_widget(getMainXML(),
-                                    "scopeRecursiveButton");
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
-                                   1);
-    } else {
-      toggle = glade_xml_get_widget(getMainXML(),
-                                    "scopeFileOnlyButton");
-      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
-                                   1);
+    {
+      if (S_ISDIR (buf.st_mode))
+        {
+          toggle = glade_xml_get_widget (getMainXML (),
+                                         "scopeRecursiveButton");
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), 1);
+        }
+      else
+        {
+          toggle = glade_xml_get_widget (getMainXML (),
+                                         "scopeFileOnlyButton");
+          gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), 1);
+        }
     }
-  }
-  uploadButton
-    = glade_xml_get_widget(getMainXML(),
-                           "fsinsertuploadbutton");
-  gtk_widget_set_sensitive(uploadButton,
-                           ok);
+  uploadButton = glade_xml_get_widget (getMainXML (), "fsinsertuploadbutton");
+  gtk_widget_set_sensitive (uploadButton, ok);
 }
 
-void on_clearCompletedUploadsButton_clicked_fs(void * unused,
-                                               GtkWidget * clearButton) {
-  ggc_tree_model_foreach(GTK_TREE_MODEL(upload_summary),
-                         &clearCompletedUploadCallback,
-                         NULL);
+void
+on_clearCompletedUploadsButton_clicked_fs (void *unused,
+                                           GtkWidget * clearButton)
+{
+  ggc_tree_model_foreach (GTK_TREE_MODEL (upload_summary),
+                          &clearCompletedUploadCallback, NULL);
 }
 
 static void
-fsuiCallUploadCallback(GtkTreeModel * model,
-                       GtkTreePath * path,
-                       GtkTreeIter * iter,
-                       gpointer fsui_call) {
-  UploadList * ul;
+fsuiCallUploadCallback (GtkTreeModel * model,
+                        GtkTreePath * path,
+                        GtkTreeIter * iter, gpointer fsui_call)
+{
+  UploadList *ul;
   struct FCBC fcbc;
 
-  GE_ASSERT(ectx,
-            model == GTK_TREE_MODEL(upload_summary));
-  gtk_tree_model_get(model,
-                     iter,
-                     UPLOAD_INTERNAL, &ul,
-                     -1);
+  GE_ASSERT (ectx, model == GTK_TREE_MODEL (upload_summary));
+  gtk_tree_model_get (model, iter, UPLOAD_INTERNAL, &ul, -1);
   fcbc.method = fsui_call;
   fcbc.argument = ul->fsui_list;
-  run_with_save_calls(&fsui_callback,
-                      &fcbc);
+  run_with_save_calls (&fsui_callback, &fcbc);
 }
 
-void on_abortUploadButton_clicked_fs(void * unused,
-                                     GtkWidget * clearButton) {
-  GtkTreeSelection * selection;
-  GtkWidget * uploadList;
+void
+on_abortUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *uploadList;
 
-  uploadList = glade_xml_get_widget(getMainXML(),
-                                    "activeUploadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
+  uploadList = glade_xml_get_widget (getMainXML (), "activeUploadsList");
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallUploadCallback,
-     &FSUI_abortUpload);
+    (selection, &fsuiCallUploadCallback, &FSUI_abortUpload);
 }
 
-void on_stopUploadButton_clicked_fs(void * unused,
-                                    GtkWidget * clearButton) {
-  GtkTreeSelection * selection;
-  GtkWidget * uploadList;
+void
+on_stopUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *uploadList;
 
-  uploadList = glade_xml_get_widget(getMainXML(),
-                                    "activeUploadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
+  uploadList = glade_xml_get_widget (getMainXML (), "activeUploadsList");
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallUploadCallback,
-     &FSUI_abortUpload);
+    (selection, &fsuiCallUploadCallback, &FSUI_abortUpload);
   ggc_tree_selection_selected_foreach
-    (selection,
-     &fsuiCallUploadCallback,
-     &FSUI_stopUpload);
+    (selection, &fsuiCallUploadCallback, &FSUI_stopUpload);
 }
 
 
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index 69e2e49d..b88f05d1 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -29,26 +29,23 @@
 
 #include "fs.h"
 
-void fs_upload_update(UploadList * list,
-                      unsigned long long completed);
+void fs_upload_update (UploadList * list, unsigned long long completed);
 
-void fs_upload_complete(UploadList * list,
-                        struct ECRS_URI * uri);
+void fs_upload_complete (UploadList * list, struct ECRS_URI *uri);
 
-void fs_upload_error(UploadList * list);
+void fs_upload_error (UploadList * list);
 
-void fs_upload_stopped(UploadList * list);
+void fs_upload_stopped (UploadList * list);
 
 /**
  * @param uri NULL if upload is not yet finished
  */
-UploadList *
-fs_upload_started(struct FSUI_UploadList * fsui,
-                  UploadList * parent,
-                  const char * filename,
-                  struct ECRS_URI * uri,
-                  unsigned long long total,
-                  unsigned long long completed,
-                  FSUI_State state);
+UploadList *fs_upload_started (struct FSUI_UploadList *fsui,
+                               UploadList * parent,
+                               const char *filename,
+                               struct ECRS_URI *uri,
+                               unsigned long long total,
+                               unsigned long long completed,
+                               FSUI_State state);
 
 #endif
diff --git a/src/plugins/peers/peers.c b/src/plugins/peers/peers.c
index ae8dee56..9e5cbac0 100644
--- a/src/plugins/peers/peers.c
+++ b/src/plugins/peers/peers.c
@@ -36,121 +36,118 @@
 
 #define REFRESH_RATE (15 * cronSECONDS)
 
-static struct CronManager * cron;
+static struct CronManager *cron;
 
-static struct GE_Context * ectx;
+static struct GE_Context *ectx;
 
-static struct GC_Configuration * cfg;
+static struct GC_Configuration *cfg;
 
-static GdkPixbuf * green;
+static GdkPixbuf *green;
 
-static GdkPixbuf * yellow;
+static GdkPixbuf *yellow;
 
-static GdkPixbuf * red;
+static GdkPixbuf *red;
 
-static GdkPixbuf * black;
+static GdkPixbuf *black;
 
-static int collector(void * data,
-                     const PeerIdentity * identity,
-                     const void * address,
-                     unsigned int addr_len,
-                     cron_t last_message,
-                     unsigned int trust,
-                     unsigned int bpmFromPeer) {
-  GtkListStore * model = data;
+static int
+collector (void *data,
+           const PeerIdentity * identity,
+           const void *address,
+           unsigned int addr_len,
+           cron_t last_message, unsigned int trust, unsigned int bpmFromPeer)
+{
+  GtkListStore *model = data;
   GtkTreeIter iter;
   EncName enc;
-  GdkPixbuf * ledBuf;
-  GdkPixbuf * flagBuf;
-  char * cc;
-  char * dir;
-  char * fn;
-  char * prefix;
-  char * have;
-  char * haddress;
-  char * hostname;
+  GdkPixbuf *ledBuf;
+  GdkPixbuf *flagBuf;
+  char *cc;
+  char *dir;
+  char *fn;
+  char *prefix;
+  char *have;
+  char *haddress;
+  char *hostname;
   cron_t now;
   int i;
   int found;
 
-  hash2enc(&identity->hashPubKey,
-           &enc);
+  hash2enc (&identity->hashPubKey, &enc);
   /* check if same peer is already in model! */
   found = NO;
-  if (TRUE == gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model),
-                                            &iter)) {
-    do {
-      gtk_tree_model_get(GTK_TREE_MODEL(model),
-                         &iter,
-                         0, &haddress,
-                         3, &have,
-                         -1);
-      if (have != NULL) {
-        if (0 == strcmp(have, (char*) &enc)) {
-          if (strlen(haddress) > 0) {
-            FREE(have);
-            FREE(haddress);
-            return OK;
-          }
-          found = YES;
-        }
-        FREENONNULL(haddress);
-        FREE(have);
-      }
-    } while ( (found == NO) &&
-              (TRUE == gtk_tree_model_iter_next(GTK_TREE_MODEL(model),
-                                                &iter)) );
-  }
-
-  hostname = network_get_ip_as_string(address,
-                                      addr_len,
-                                      YES);
+  if (TRUE == gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
+    {
+      do
+        {
+          gtk_tree_model_get (GTK_TREE_MODEL (model),
+                              &iter, 0, &haddress, 3, &have, -1);
+          if (have != NULL)
+            {
+              if (0 == strcmp (have, (char *) &enc))
+                {
+                  if (strlen (haddress) > 0)
+                    {
+                      FREE (have);
+                      FREE (haddress);
+                      return OK;
+                    }
+                  found = YES;
+                }
+              FREENONNULL (haddress);
+              FREE (have);
+            }
+        }
+      while ((found == NO) &&
+             (TRUE == gtk_tree_model_iter_next (GTK_TREE_MODEL (model),
+                                                &iter)));
+    }
+
+  hostname = network_get_ip_as_string (address, addr_len, YES);
   if (hostname == NULL)
-    hostname = STRDUP("NAT");
+    hostname = STRDUP ("NAT");
   /* get flag */
   flagBuf = NULL;
   ledBuf = NULL;
   cc = NULL;
-  prefix = STRDUP(hostname);
-  if (strstr(prefix, " ") != NULL)
-    *strstr(prefix, " ") = '\0';
+  prefix = STRDUP (hostname);
+  if (strstr (prefix, " ") != NULL)
+    *strstr (prefix, " ") = '\0';
   cc = prefix;
-  while (strstr(cc, ".") != NULL)
-    cc = strstr(cc, ".") + 1;
-  if (strstr(hostname, ".") == NULL)
+  while (strstr (cc, ".") != NULL)
+    cc = strstr (cc, ".") + 1;
+  if (strstr (hostname, ".") == NULL)
     cc = NULL;
-  else if ( (0 == strcasecmp(cc, "edu")) ||
-            (0 == strcasecmp(cc, "com")) ||
-            (0 == strcasecmp(cc, "net")) ||
-            (0 == strcasecmp(cc, "org")) ||
-            (0 == strcasecmp(cc, "gov")) ||
-            (0 == strcasecmp(cc, "mil")) )      
+  else if ((0 == strcasecmp (cc, "edu")) ||
+           (0 == strcasecmp (cc, "com")) ||
+           (0 == strcasecmp (cc, "net")) ||
+           (0 == strcasecmp (cc, "org")) ||
+           (0 == strcasecmp (cc, "gov")) || (0 == strcasecmp (cc, "mil")))
     cc = "us";
-  if ( (cc != NULL) &&
-       (strlen(cc) > 2) )
+  if ((cc != NULL) && (strlen (cc) > 2))
     cc = NULL;
-  if (cc != NULL) {
-    cc = STRDUP(cc);
-    for (i=0;i<strlen(cc);i++)
-      cc[i] = tolower(cc[i]);
-    dir = os_get_installation_path(IPK_DATADIR);
-    fn = MALLOC(strlen(dir) + 32);
-    strcpy(fn, dir);
-    strcat(fn,
-           DIR_SEPARATOR_STR ".."
-           DIR_SEPARATOR_STR "gnunet-gtk"
-           DIR_SEPARATOR_STR "flags"
-           DIR_SEPARATOR_STR);
-    strcat(fn, cc);
-    strcat(fn, ".png");
-    FREE(dir);
-    flagBuf = gdk_pixbuf_new_from_file(fn, NULL);
-    FREE(fn);
-  }
-  FREE(prefix);
+  if (cc != NULL)
+    {
+      cc = STRDUP (cc);
+      for (i = 0; i < strlen (cc); i++)
+        cc[i] = tolower (cc[i]);
+      dir = os_get_installation_path (IPK_DATADIR);
+      fn = MALLOC (strlen (dir) + 32);
+      strcpy (fn, dir);
+      strcat (fn,
+              DIR_SEPARATOR_STR ".."
+              DIR_SEPARATOR_STR "gnunet-gtk"
+              DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
+      strcat (fn, cc);
+      strcat (fn, ".png");
+      FREE (dir);
+      flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
+      FREE (fn);
+    }
+  FREE (prefix);
 
   /* get LED */
-  now = get_time();
+  now = get_time ();
   if (last_message + 150 * cronSECONDS > now)
     ledBuf = green;
   else if (last_message + 5 * cronMINUTES > now)
@@ -160,25 +157,20 @@ static int collector(void * data,
   else
     ledBuf = black;
   if (ledBuf != NULL)
-    g_object_ref(ledBuf);
+    g_object_ref (ledBuf);
 
   /* add to model */
   if (found == NO)
-    gtk_list_store_append(model,
-                          &iter);
-  gtk_list_store_set(model,
-                     &iter,
-                     0, hostname,
-                     1, trust,
-                     2, bpmFromPeer,
-                     3, (const char*) &enc,
-                     4, ledBuf,
-                     5, flagBuf,
-                     6, cc,
-                     7, last_message,
-                     -1);
-  FREENONNULL(cc);
-  FREE(hostname);
+    gtk_list_store_append (model, &iter);
+  gtk_list_store_set (model,
+                      &iter,
+                      0, hostname,
+                      1, trust,
+                      2, bpmFromPeer,
+                      3, (const char *) &enc,
+                      4, ledBuf, 5, flagBuf, 6, cc, 7, last_message, -1);
+  FREENONNULL (cc);
+  FREE (hostname);
   return OK;
 }
 
@@ -187,26 +179,26 @@ static int collector(void * data,
 /**
  * Compute an updated peer model.
  */
-static void * getPeerModel() {
-  struct ClientServerConnection * sock;
-  GtkListStore * model;
-
-  model = gtk_list_store_new(8,
-                             G_TYPE_STRING,  /* address */
-                             G_TYPE_UINT,    /* trust */
-                             G_TYPE_UINT,    /* bpm */
-                             G_TYPE_STRING,  /* identity */
-                             GDK_TYPE_PIXBUF, /* LED */
-                             GDK_TYPE_PIXBUF, /* flag */
-                             G_TYPE_STRING,  /* country name */
-                             G_TYPE_UINT64); /* last time seen */
-  sock = client_connection_create(ectx, cfg);
-  if (sock != NULL) {
-    gnunet_identity_request_peer_infos(sock,
-                                       &collector,
-                                       model);
-    connection_destroy(sock);
-  }
+static void *
+getPeerModel ()
+{
+  struct ClientServerConnection *sock;
+  GtkListStore *model;
+
+  model = gtk_list_store_new (8, G_TYPE_STRING, /* address */
+                              G_TYPE_UINT,      /* trust */
+                              G_TYPE_UINT,      /* bpm */
+                              G_TYPE_STRING,    /* identity */
+                              GDK_TYPE_PIXBUF,  /* LED */
+                              GDK_TYPE_PIXBUF,  /* flag */
+                              G_TYPE_STRING,    /* country name */
+                              G_TYPE_UINT64);   /* last time seen */
+  sock = client_connection_create (ectx, cfg);
+  if (sock != NULL)
+    {
+      gnunet_identity_request_peer_infos (sock, &collector, model);
+      connection_destroy (sock);
+    }
   return model;
 }
 
@@ -214,197 +206,175 @@ static void * getPeerModel() {
 /**
  * Update the model for the peers list.
  */
-static void * updatePeerInfoSafe(void * m) {
-  GtkListStore * model = m;
-  GtkTreeModel * old_model;
-  GtkWidget * w;
+static void *
+updatePeerInfoSafe (void *m)
+{
+  GtkListStore *model = m;
+  GtkTreeModel *old_model;
+  GtkWidget *w;
   GtkSortType order;
   gint sort_column;
 
-  w = glade_xml_get_widget(getMainXML(),
-                           "peersTreeView");
-  old_model = gtk_tree_view_get_model(GTK_TREE_VIEW(w));
-  if (old_model != NULL) {
-    if (TRUE == gtk_tree_sortable_get_sort_column_id(GTK_TREE_SORTABLE(old_model),
-                                                     &sort_column,
-                                                     &order))
-      gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(model),
-                                           sort_column,
-                                           order);
-  }
-  gtk_tree_view_set_model(GTK_TREE_VIEW(w),
-                          GTK_TREE_MODEL(model));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(w)),
-                              GTK_SELECTION_NONE);
+  w = glade_xml_get_widget (getMainXML (), "peersTreeView");
+  old_model = gtk_tree_view_get_model (GTK_TREE_VIEW (w));
+  if (old_model != NULL)
+    {
+      if (TRUE ==
+          gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (old_model),
+                                                &sort_column, &order))
+        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model),
+                                              sort_column, order);
+    }
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
   return NULL;
 }
 
-static void updatePeerInfo(void * dummy) {
-  GtkListStore * model;
+static void
+updatePeerInfo (void *dummy)
+{
+  GtkListStore *model;
 
-  model = getPeerModel();
-  gtkSaveCall(&updatePeerInfoSafe, model);
+  model = getPeerModel ();
+  gtkSaveCall (&updatePeerInfoSafe, model);
 }
 
 
-void init_peers(struct GE_Context * e,
-                struct GC_Configuration * c) {
-  GtkWidget * tab;
-  GtkWidget * peers;
-  GtkCellRenderer * renderer;
+void
+init_peers (struct GE_Context *e, struct GC_Configuration *c)
+{
+  GtkWidget *tab;
+  GtkWidget *peers;
+  GtkCellRenderer *renderer;
   int col;
-  GtkTreeViewColumn * column;
-  char * dir;
-  char * fn;
+  GtkTreeViewColumn *column;
+  char *dir;
+  char *fn;
 
   ectx = e;
   cfg = c;
-  peers
-    = glade_xml_get_widget(getMainXML(),
-                           "peersTreeView");
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Address"),
-                                                    renderer,
-                                                    "text", 0,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 0);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Trust"),
-                                                    renderer,
-                                                    "text", 1,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 1);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Bandwidth"),
-                                                    renderer,
-                                                    "text", 2,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 2);
-
-
-  renderer = gtk_cell_renderer_pixbuf_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Country"),
-                                                    renderer,
-                                                    "pixbuf", 5,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, FALSE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 6);
-
-  renderer = gtk_cell_renderer_pixbuf_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Status"),
-                                                    renderer,
-                                                    "pixbuf", 4,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 7);
-  gtk_tree_view_column_set_resizable(column, FALSE);
-
-  renderer = gtk_cell_renderer_text_new();
-  col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(peers),
-                                                    -1,
-                                                    _("Identity"),
-                                                    renderer,
-                                                    "text", 3,
-                                                    NULL);
-  column = gtk_tree_view_get_column(GTK_TREE_VIEW(peers),
-                                    col - 1);
-  gtk_tree_view_column_set_resizable(column, TRUE);
-  gtk_tree_view_column_set_clickable(column, TRUE);
-  gtk_tree_view_column_set_reorderable(column, TRUE);
-  gtk_tree_view_column_set_sort_column_id(column, 3);
-
-
-  dir = os_get_installation_path(IPK_DATADIR);
-  fn = MALLOC(strlen(dir) + 32);
-  strcpy(fn, dir);
-  strcat(fn,
-         DIR_SEPARATOR_STR ".."
-         DIR_SEPARATOR_STR "gnunet-gtk"
-         DIR_SEPARATOR_STR "red.png");
-  red = gdk_pixbuf_new_from_file(fn, NULL);
-
-  strcpy(fn, dir);
-  strcat(fn,
-         DIR_SEPARATOR_STR ".."
-         DIR_SEPARATOR_STR "gnunet-gtk"
-         DIR_SEPARATOR_STR "yellow.png");
-  yellow = gdk_pixbuf_new_from_file(fn, NULL);
-
-  strcpy(fn, dir);
-  strcat(fn,
-         DIR_SEPARATOR_STR ".."
-         DIR_SEPARATOR_STR "gnunet-gtk"
-         DIR_SEPARATOR_STR "green.png");
-  green = gdk_pixbuf_new_from_file(fn, NULL);
-
-  strcpy(fn, dir);
-  strcat(fn,
-         DIR_SEPARATOR_STR ".."
-         DIR_SEPARATOR_STR "gnunet-gtk"
-         DIR_SEPARATOR_STR "black.png");
-  black = gdk_pixbuf_new_from_file(fn, NULL);
-  FREE(fn);
-  FREE(dir);
-
-  tab
-    = glade_xml_get_widget(getMainXML(),
-                           "peersScrolledWindow");
-  gtk_widget_show(tab);
-  cron = gnunet_gtk_get_cron();
-  cron_add_job(cron,
-               &updatePeerInfo,
-               REFRESH_RATE,
-               REFRESH_RATE,
-               NULL);
+  peers = glade_xml_get_widget (getMainXML (), "peersTreeView");
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Address"),
+                                                     renderer,
+                                                     "text", 0, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 0);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Trust"),
+                                                     renderer,
+                                                     "text", 1, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 1);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Bandwidth"),
+                                                     renderer,
+                                                     "text", 2, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 2);
+
+
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Country"),
+                                                     renderer,
+                                                     "pixbuf", 5, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_resizable (column, FALSE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 6);
+
+  renderer = gtk_cell_renderer_pixbuf_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Status"),
+                                                     renderer,
+                                                     "pixbuf", 4, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 7);
+  gtk_tree_view_column_set_resizable (column, FALSE);
+
+  renderer = gtk_cell_renderer_text_new ();
+  col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
+                                                     -1,
+                                                     _("Identity"),
+                                                     renderer,
+                                                     "text", 3, NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (peers), col - 1);
+  gtk_tree_view_column_set_resizable (column, TRUE);
+  gtk_tree_view_column_set_clickable (column, TRUE);
+  gtk_tree_view_column_set_reorderable (column, TRUE);
+  gtk_tree_view_column_set_sort_column_id (column, 3);
+
+
+  dir = os_get_installation_path (IPK_DATADIR);
+  fn = MALLOC (strlen (dir) + 32);
+  strcpy (fn, dir);
+  strcat (fn,
+          DIR_SEPARATOR_STR ".."
+          DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "red.png");
+  red = gdk_pixbuf_new_from_file (fn, NULL);
+
+  strcpy (fn, dir);
+  strcat (fn,
+          DIR_SEPARATOR_STR ".."
+          DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "yellow.png");
+  yellow = gdk_pixbuf_new_from_file (fn, NULL);
+
+  strcpy (fn, dir);
+  strcat (fn,
+          DIR_SEPARATOR_STR ".."
+          DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "green.png");
+  green = gdk_pixbuf_new_from_file (fn, NULL);
+
+  strcpy (fn, dir);
+  strcat (fn,
+          DIR_SEPARATOR_STR ".."
+          DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR "black.png");
+  black = gdk_pixbuf_new_from_file (fn, NULL);
+  FREE (fn);
+  FREE (dir);
+
+  tab = glade_xml_get_widget (getMainXML (), "peersScrolledWindow");
+  gtk_widget_show (tab);
+  cron = gnunet_gtk_get_cron ();
+  cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE, NULL);
 }
 
-void done_peers() {
-  cron_del_job(cron,
-               &updatePeerInfo,
-               REFRESH_RATE,
-               NULL);
+void
+done_peers ()
+{
+  cron_del_job (cron, &updatePeerInfo, REFRESH_RATE, NULL);
   if (red != NULL)
-    g_object_unref(red);
+    g_object_unref (red);
   if (green != NULL)
-    g_object_unref(green);
+    g_object_unref (green);
   if (black != NULL)
-    g_object_unref(black);
+    g_object_unref (black);
   if (yellow != NULL)
-    g_object_unref(yellow);
+    g_object_unref (yellow);
 }
 
 
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 5b6e2542..9c5e90db 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -29,13 +29,13 @@
 
 #define FUNCTIONS_DEBUG NO
 
-static StatPair * lastStatValues;
+static StatPair *lastStatValues;
 
 static unsigned int lsv_size;
 
-static struct ClientServerConnection * sock;
+static struct ClientServerConnection *sock;
 
-static struct MUTEX * lock;
+static struct MUTEX *lock;
 
 static long connectionGoal;
 
@@ -43,126 +43,106 @@ static long long banddown;
 
 static long long bandup;
 
-static struct GE_Context * ectx;
+static struct GE_Context *ectx;
 
-static struct GC_Configuration * cfg;
+static struct GC_Configuration *cfg;
 
-static struct CronManager * cron;
+static struct CronManager *cron;
 
-static int getStatValue(long long * value,
-                        long long * lvalue,
-                        cron_t * dtime,
-                        const char * optName,
-                        int monotone) {
+static int
+getStatValue (long long *value,
+              long long *lvalue,
+              cron_t * dtime, const char *optName, int monotone)
+{
   unsigned int i;
 
   *value = 0;
   if (lvalue != NULL)
     *lvalue = 0;
-  for (i=0;i<lsv_size;i++) {
-    if (0 == strcmp(optName,
-                    lastStatValues[i].statName)) {
-      *value = lastStatValues[i].value;
-      if (lvalue != NULL)
-        *lvalue = lastStatValues[i].lvalue;
-      if (dtime != NULL)
-        *dtime = lastStatValues[i].delta;
-      if ( (monotone == YES) &&
-           (lvalue != NULL) &&
-           (*lvalue > *value) )
-        return SYSERR; /* gnunetd restart? */
-      return OK;
+  for (i = 0; i < lsv_size; i++)
+    {
+      if (0 == strcmp (optName, lastStatValues[i].statName))
+        {
+          *value = lastStatValues[i].value;
+          if (lvalue != NULL)
+            *lvalue = lastStatValues[i].lvalue;
+          if (dtime != NULL)
+            *dtime = lastStatValues[i].delta;
+          if ((monotone == YES) && (lvalue != NULL) && (*lvalue > *value))
+            return SYSERR;      /* gnunetd restart? */
+          return OK;
+        }
     }
-  }
 #if FUNCTIONS_DEBUG
-  GE_LOG(ectx,
-         GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
-         "Statistic not found: `%s'\n",
-         optName);
+  GE_LOG (ectx,
+          GE_DEBUG | GE_DEVELOPER | GE_REQUEST,
+          "Statistic not found: `%s'\n", optName);
 #endif
   return SYSERR;
 }
 
-static void updateConnectionGoal(void * unused) {
-  char * cmh;
-  char * availableDown;
-  char * availableUp;
-
-  MUTEX_LOCK(lock);
-  cmh = getConfigurationOptionValue(sock,
-                                    "gnunetd",
-                                    "connection-max-hosts");
-  availableDown = getConfigurationOptionValue(sock,
-                                              "LOAD",
-                                              "MAXNETDOWNBPSTOTAL");
-  availableUp = getConfigurationOptionValue(sock,
-                                            "LOAD",
-                                            "MAXNETUPBPSTOTAL");
-  MUTEX_UNLOCK(lock);
+static void
+updateConnectionGoal (void *unused)
+{
+  char *cmh;
+  char *availableDown;
+  char *availableUp;
+
+  MUTEX_LOCK (lock);
+  cmh = getConfigurationOptionValue (sock, "gnunetd", "connection-max-hosts");
+  availableDown = getConfigurationOptionValue (sock,
+                                               "LOAD", "MAXNETDOWNBPSTOTAL");
+  availableUp = getConfigurationOptionValue (sock,
+                                             "LOAD", "MAXNETUPBPSTOTAL");
+  MUTEX_UNLOCK (lock);
   if (cmh == NULL)
     connectionGoal = 0;
   else
-    connectionGoal = atol(cmh);
+    connectionGoal = atol (cmh);
   if (availableDown == NULL)
     banddown = 0;
   else
-    banddown = atol(availableDown);
+    banddown = atol (availableDown);
   if (availableUp == NULL)
     bandup = 0;
   else
-    bandup = atol(availableUp);
+    bandup = atol (availableUp);
 
-  FREENONNULL(cmh);
-  FREENONNULL(availableDown);
-  FREENONNULL(availableUp);
+  FREENONNULL (cmh);
+  FREENONNULL (availableDown);
+  FREENONNULL (availableUp);
 }
 
-static int getConnectedNodesStat(const void * closure,
-                                 gfloat ** data) {
+static int
+getConnectedNodesStat (const void *closure, gfloat ** data)
+{
   long long val;
 
   if (connectionGoal == 0)
     return SYSERR;
-  if (OK != getStatValue(&val,
-                         NULL,
-                         NULL,
-                         "# of connected peers",
-                         NO))
+  if (OK != getStatValue (&val, NULL, NULL, "# of connected peers", NO))
     return SYSERR;
   data[0][0] = ((gfloat) val) / connectionGoal;
   return OK;
 }
 
-static int getLoadStat(const void * closure,
-                       gfloat ** data) {
+static int
+getLoadStat (const void *closure, gfloat ** data)
+{
   long long valc;
   long long vali;
   long long valu;
   long long vald;
 
-  if (OK != getStatValue(&valc,
-                         NULL,
-                         NULL,
-                         "% of allowed cpu load",
-                         NO))
+  if (OK != getStatValue (&valc, NULL, NULL, "% of allowed cpu load", NO))
     return SYSERR;
-  if (OK != getStatValue(&vali,
-                         NULL,
-                         NULL,
-                         "% of allowed io load",
-                         NO))
+  if (OK != getStatValue (&vali, NULL, NULL, "% of allowed io load", NO))
     return SYSERR;
-  if (OK != getStatValue(&valu,
-                         NULL,
-                         NULL,
-                         "% of allowed network load (up)",
-                         NO))
+  if (OK != getStatValue (&valu,
+                          NULL, NULL, "% of allowed network load (up)", NO))
     return SYSERR;
-  if (OK != getStatValue(&vald,
-                         NULL,
-                         NULL,
-                         "% of allowed network load (down)",
-                         NO))
+  if (OK != getStatValue (&vald,
+                          NULL, NULL, "% of allowed network load (down)", NO))
     return SYSERR;
   data[0][0] = (gfloat) valc / 100.0;
   data[0][1] = (gfloat) vali / 100.0;
@@ -171,31 +151,26 @@ static int getLoadStat(const void * closure,
   return OK;
 }
 
-static int getQuotaStat(const void * closure,
-                        gfloat ** data) {
+static int
+getQuotaStat (const void *closure, gfloat ** data)
+{
   long long allowed;
   long long have;
 
-  if (OK != getStatValue(&allowed,
-                         NULL,
-                         NULL,
-                         "# bytes allowed in datastore",
-                         NO))
+  if (OK != getStatValue (&allowed,
+                          NULL, NULL, "# bytes allowed in datastore", NO))
     return SYSERR;
   if (allowed == 0)
     return SYSERR;
-  if (OK != getStatValue(&have,
-                         NULL,
-                         NULL,
-                         "# bytes in datastore",
-                         NO))
+  if (OK != getStatValue (&have, NULL, NULL, "# bytes in datastore", NO))
     return SYSERR;
   data[0][0] = ((gfloat) have) / allowed;
   return OK;
 }
 
-static int getTrafficRecvStats(const void * closure,
-                               gfloat ** data) {
+static int
+getTrafficRecvStats (const void *closure, gfloat ** data)
+{
   long long total;
   long long noise;
   long long content;
@@ -209,66 +184,40 @@ static int getTrafficRecvStats(const void * closure,
   long long lhellos;
   long long lrlimit;
   cron_t dtime;
-  char * buffer;
+  char *buffer;
 
-  if (OK != getStatValue(&total,        
-                         &ltotal,
-                         &dtime,
-                         "# bytes received",
-                         YES))
+  if (OK != getStatValue (&total, &ltotal, &dtime, "# bytes received", YES))
     return SYSERR;
-  if (OK != getStatValue(&noise,
-                         &lnoise,
-                         NULL,
-                         "# bytes of noise received",
-                         YES))
+  if (OK != getStatValue (&noise,
+                          &lnoise, NULL, "# bytes of noise received", YES))
     return SYSERR;
-  buffer = MALLOC(512);
-  SNPRINTF(buffer,
-           512,
-           "# bytes received of type %d",
-           P2P_PROTO_gap_RESULT);
-  if (OK != getStatValue(&content,
-                         &lcontent,
-                         NULL,
-                         buffer,
-                         YES)) {
-    content = 0;
-    lcontent = 0;
-  }
-  SNPRINTF(buffer,
-           512,
-           "# bytes received of type %d",
-           p2p_PROTO_hello);
-  if (OK != getStatValue(&hellos,
-                         &lhellos,
-                         NULL,
-                         buffer,
-                         YES)) {
-    hellos = 0;
-    lhellos = 0;
-  }
-  SNPRINTF(buffer,
-           512,
-           "# bytes received of type %d",
-           P2P_PROTO_gap_QUERY);
-  if (OK != getStatValue(&queries,
-                         &lqueries,
-                         NULL,
-                         buffer,
-                         YES)) {
-    queries = 0;
-    lqueries = 0;
-  }
-  if (OK != getStatValue(&rlimit,
-                         &lrlimit,
-                         NULL,
-                         "# total bytes per second receive limit",
-                         NO)) {
-    rlimit = 0;
-    lrlimit = 0;
-  }
-  FREE(buffer);
+  buffer = MALLOC (512);
+  SNPRINTF (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_RESULT);
+  if (OK != getStatValue (&content, &lcontent, NULL, buffer, YES))
+    {
+      content = 0;
+      lcontent = 0;
+    }
+  SNPRINTF (buffer, 512, "# bytes received of type %d", p2p_PROTO_hello);
+  if (OK != getStatValue (&hellos, &lhellos, NULL, buffer, YES))
+    {
+      hellos = 0;
+      lhellos = 0;
+    }
+  SNPRINTF (buffer, 512, "# bytes received of type %d", P2P_PROTO_gap_QUERY);
+  if (OK != getStatValue (&queries, &lqueries, NULL, buffer, YES))
+    {
+      queries = 0;
+      lqueries = 0;
+    }
+  if (OK != getStatValue (&rlimit,
+                          &lrlimit,
+                          NULL, "# total bytes per second receive limit", NO))
+    {
+      rlimit = 0;
+      lrlimit = 0;
+    }
+  FREE (buffer);
   if (banddown == 0)
     return SYSERR;
 
@@ -277,32 +226,31 @@ static int getTrafficRecvStats(const void * closure,
   queries -= lqueries;
   content -= lcontent;
   hellos -= lhellos;
-  if (banddown < 0) {
-    data[0][0] = 0.0;
-    data[0][1] = 0.0;
-    data[0][2] = 0.0;
-    data[0][3] = 0.0;
-    data[0][4] = 0.0;
-    data[0][5] = 0.0;
-    return OK;
-  }
-  data[0][0] = ((gfloat) noise) / (banddown * dtime / cronSECONDS); /* red */
-  data[0][1] = ((gfloat) (content+noise)) / (banddown * dtime / cronSECONDS); /* green */
-  data[0][2] = ((gfloat)(queries+content+noise)) / (banddown * dtime / cronSECONDS); /* yellow */
-  data[0][3] = ((gfloat)(queries+content+noise+hellos)) / (banddown * dtime / cronSECONDS); /* blue */
-  data[0][4] = ((gfloat) total) / (banddown * dtime / cronSECONDS); /* gray */
-  data[0][5] = (gfloat) rlimit  / banddown; /* magenta */
+  if (banddown < 0)
+    {
+      data[0][0] = 0.0;
+      data[0][1] = 0.0;
+      data[0][2] = 0.0;
+      data[0][3] = 0.0;
+      data[0][4] = 0.0;
+      data[0][5] = 0.0;
+      return OK;
+    }
+  data[0][0] = ((gfloat) noise) / (banddown * dtime / cronSECONDS);     /* red */
+  data[0][1] = ((gfloat) (content + noise)) / (banddown * dtime / cronSECONDS); /* green */
+  data[0][2] = ((gfloat) (queries + content + noise)) / (banddown * dtime / cronSECONDS);       /* yellow */
+  data[0][3] = ((gfloat) (queries + content + noise + hellos)) / (banddown * dtime / cronSECONDS);      /* blue */
+  data[0][4] = ((gfloat) total) / (banddown * dtime / cronSECONDS);     /* gray */
+  data[0][5] = (gfloat) rlimit / banddown;      /* magenta */
 #if 0
-  printf("I: %f %f %f %f\n",
-         data[0][0],
-         data[0][1],
-         data[0][2]);
+  printf ("I: %f %f %f %f\n", data[0][0], data[0][1], data[0][2]);
 #endif
   return OK;
 }
 
-static int getTrafficSendStats(const void * closure,
-                               gfloat ** data) {
+static int
+getTrafficSendStats (const void *closure, gfloat ** data)
+{
   long long total;
   long long noise;
   long long content;
@@ -316,66 +264,42 @@ static int getTrafficSendStats(const void * closure,
   long long lhellos;
   long long lslimit;
   cron_t dtime;
-  char * buffer;
+  char *buffer;
 
-  if (OK != getStatValue(&total,        
-                         &ltotal,
-                         &dtime,
-                         "# bytes transmitted",
-                         YES))
+  if (OK != getStatValue (&total,
+                          &ltotal, &dtime, "# bytes transmitted", YES))
     return SYSERR;
-  if (OK != getStatValue(&noise,
-                         &lnoise,
-                         NULL,
-                         "# bytes noise sent",
-                         YES))
+  if (OK != getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", YES))
     return SYSERR;
-  buffer = MALLOC(512);
-  SNPRINTF(buffer,
-           512,
-            "# bytes transmitted of type %d",
-           P2P_PROTO_gap_RESULT);
-  if (OK != getStatValue(&content,
-                         &lcontent,
-                         NULL,
-                         buffer,
-                         YES)) {
-    content = 0;
-    lcontent = 0;
-  }
-  SNPRINTF(buffer,
-           512,
-            "# bytes transmitted of type %d",
-           P2P_PROTO_gap_QUERY);
-  if (OK != getStatValue(&queries,
-                         &lqueries,
-                         NULL,
-                         buffer,
-                         YES)) {
-    queries = 0;
-    lqueries = 0;
-  }
-  SNPRINTF(buffer,
-           512,
-            "# bytes transmitted of type %d",
-           p2p_PROTO_hello);
-  if (OK != getStatValue(&hellos,
-                         &lhellos,
-                         NULL,
-                         buffer,
-                         YES)) {
-    queries = 0;
-    lqueries = 0;
-  }
-  if (OK != getStatValue(&slimit,
-                         &lslimit,
-                         NULL,
-                         "# total bytes per second send limit",
-                         NO)) {
-    slimit = 0;
-    lslimit = 0;
-  }
-  FREE(buffer);
+  buffer = MALLOC (512);
+  SNPRINTF (buffer,
+            512, "# bytes transmitted of type %d", P2P_PROTO_gap_RESULT);
+  if (OK != getStatValue (&content, &lcontent, NULL, buffer, YES))
+    {
+      content = 0;
+      lcontent = 0;
+    }
+  SNPRINTF (buffer,
+            512, "# bytes transmitted of type %d", P2P_PROTO_gap_QUERY);
+  if (OK != getStatValue (&queries, &lqueries, NULL, buffer, YES))
+    {
+      queries = 0;
+      lqueries = 0;
+    }
+  SNPRINTF (buffer, 512, "# bytes transmitted of type %d", p2p_PROTO_hello);
+  if (OK != getStatValue (&hellos, &lhellos, NULL, buffer, YES))
+    {
+      queries = 0;
+      lqueries = 0;
+    }
+  if (OK != getStatValue (&slimit,
+                          &lslimit,
+                          NULL, "# total bytes per second send limit", NO))
+    {
+      slimit = 0;
+      lslimit = 0;
+    }
+  FREE (buffer);
   if (bandup == 0)
     return SYSERR;
   total -= ltotal;
@@ -383,34 +307,32 @@ static int getTrafficSendStats(const void * closure,
   queries -= lqueries;
   content -= lcontent;
   hellos -= lhellos;
-  if (bandup < 0) {
-    data[0][0] = 0.0;
-    data[0][1] = 0.0;
-    data[0][2] = 0.0;
-    data[0][3] = 0.0;
-    data[0][4] = 0.0;
-    data[0][5] = 0.0;
-    return OK;
-  }
-  data[0][0] = ((gfloat) noise) / (bandup * dtime / cronSECONDS); /* red */
-  data[0][1] = ((gfloat) (noise + content)) / (bandup*dtime / cronSECONDS); /* green */
-  data[0][2] = ((gfloat) (noise + content + queries)) / (bandup*dtime / cronSECONDS); /* yellow */
-  data[0][3] = ((gfloat) (noise + content + queries + hellos)) / (bandup*dtime / cronSECONDS); /* blue */
-  data[0][4] = ((gfloat) total) / (bandup*dtime / cronSECONDS); /* grey */
-  data[0][5] = ((gfloat) slimit) / bandup ; /* magenta */
+  if (bandup < 0)
+    {
+      data[0][0] = 0.0;
+      data[0][1] = 0.0;
+      data[0][2] = 0.0;
+      data[0][3] = 0.0;
+      data[0][4] = 0.0;
+      data[0][5] = 0.0;
+      return OK;
+    }
+  data[0][0] = ((gfloat) noise) / (bandup * dtime / cronSECONDS);       /* red */
+  data[0][1] = ((gfloat) (noise + content)) / (bandup * dtime / cronSECONDS);   /* green */
+  data[0][2] = ((gfloat) (noise + content + queries)) / (bandup * dtime / cronSECONDS); /* yellow */
+  data[0][3] = ((gfloat) (noise + content + queries + hellos)) / (bandup * dtime / cronSECONDS);        /* blue */
+  data[0][4] = ((gfloat) total) / (bandup * dtime / cronSECONDS);       /* grey */
+  data[0][5] = ((gfloat) slimit) / bandup;      /* magenta */
 #if 0
-  printf("O: %f %f %f %f\n",
-         data[0][0],
-         data[0][1],
-         data[0][2],
-         data[0][3]);
+  printf ("O: %f %f %f %f\n", data[0][0], data[0][1], data[0][2], data[0][3]);
 #endif
   return OK;
 }
 
 
-static int getEffectivenessStats(const void * closure,
-                                 gfloat ** data) {
+static int
+getEffectivenessStats (const void *closure, gfloat ** data)
+{
   static cron_t last;
   static double lastdata;
   static double lastavg;
@@ -422,39 +344,41 @@ static int getEffectivenessStats(const void * closure,
   long long llocal;
   cron_t now;
 
-  now = get_time();
-  if (now < last + 2 * cronMINUTES) {
-    data[0][0] = lastdata;
-    data[0][1] = lastavg;
-    return OK;
-  }
+  now = get_time ();
+  if (now < last + 2 * cronMINUTES)
+    {
+      data[0][0] = lastdata;
+      data[0][1] = lastavg;
+      return OK;
+    }
   last = now;
-  if (OK != getStatValue(&total,        
-                         &ltotal,
-                         NULL,
-                         "# gap requests forwarded (counting each peer)",
-                         YES))
+  if (OK != getStatValue (&total,
+                          &ltotal,
+                          NULL,
+                          "# gap requests forwarded (counting each peer)",
+                          YES))
     return SYSERR;
-  if (OK != getStatValue(&success,
-                         &lsuccess,
-                         NULL,
-                         "# gap routing successes (total)",
-                         YES))
+  if (OK != getStatValue (&success,
+                          &lsuccess,
+                          NULL, "# gap routing successes (total)", YES))
     return SYSERR;
-  if (OK != getStatValue(&local,
-                         &llocal,
-                         NULL,
-                         "# gap requests processed: local result",
-                         YES))
+  if (OK != getStatValue (&local,
+                          &llocal,
+                          NULL,
+                          "# gap requests processed: local result", YES))
     return SYSERR;
   total -= ltotal;
   data[0][0] = 0.0;
-  if (ltotal + total > 0) {
-    data[0][1] = lastavg = 1.0 * (success + lsuccess - local - llocal) / (total + ltotal);
-  } else {
-    data[0][1] = 0.0;
-    return OK;
-  }
+  if (ltotal + total > 0)
+    {
+      data[0][1] = lastavg =
+        1.0 * (success + lsuccess - local - llocal) / (total + ltotal);
+    }
+  else
+    {
+      data[0][1] = 0.0;
+      return OK;
+    }
   if (total == 0)
     return OK;
   success -= lsuccess;
@@ -467,9 +391,9 @@ static int getEffectivenessStats(const void * closure,
   return OK;
 }
 
-static int statsProcessor(const char * optName,
-                          unsigned long long value,
-                          void * data) {
+static int
+statsProcessor (const char *optName, unsigned long long value, void *data)
+{
   /**
    * Keep track of last match (or, more precisely, position
    * of next expected match) since 99.99% of the time we
@@ -477,7 +401,7 @@ static int statsProcessor(const char * optName,
    * this will predict correctly).
    */
   static unsigned int last;
-  cron_t * delta = data;
+  cron_t *delta = data;
   int j;
   int found;
 
@@ -485,33 +409,28 @@ static int statsProcessor(const char * optName,
     last = 0;
   j = last;
   found = -1;
-  if ( (j < lsv_size) &&
-       (0 == strcmp(optName,
-                    lastStatValues[j].statName)) )
+  if ((j < lsv_size) && (0 == strcmp (optName, lastStatValues[j].statName)))
     found = j;
-  if (found == -1) {
-    for (j=0;j<lsv_size;j++) {
-      if (0 == strcmp(optName,
-                      lastStatValues[j].statName)) {
-        found = j;
-        break;
-      }
+  if (found == -1)
+    {
+      for (j = 0; j < lsv_size; j++)
+        {
+          if (0 == strcmp (optName, lastStatValues[j].statName))
+            {
+              found = j;
+              break;
+            }
+        }
+    }
+  if (found == -1)
+    {
+      found = lsv_size;
+      GROW (lastStatValues, lsv_size, lsv_size + 1);
+      lastStatValues[found].statName = STRDUP (optName);
     }
-  }
-  if (found == -1) {
-    found = lsv_size;
-    GROW(lastStatValues,
-         lsv_size,
-         lsv_size+1);
-    lastStatValues[found].statName
-      = STRDUP(optName);
-  }
-  lastStatValues[found].lvalue
-    = lastStatValues[found].value;
-  lastStatValues[found].value
-    = value;
-  lastStatValues[found].delta
-    = *delta;
+  lastStatValues[found].lvalue = lastStatValues[found].value;
+  lastStatValues[found].value = value;
+  lastStatValues[found].delta = *delta;
   last = found + 1;
   return OK;
 }
@@ -519,129 +438,127 @@ static int statsProcessor(const char * optName,
 /**
  * Cron-job that updates all stat values.
  */
-static void updateStatValues(void * unused) {
+static void
+updateStatValues (void *unused)
+{
   static cron_t lastUpdate;
   cron_t now;
   cron_t delta;
 
-  now = get_time();
+  now = get_time ();
   delta = now - lastUpdate;
-  MUTEX_LOCK(lock);
-  if (OK == STATS_getStatistics(ectx,
-                                sock,
-                                &statsProcessor,
-                                &delta))
+  MUTEX_LOCK (lock);
+  if (OK == STATS_getStatistics (ectx, sock, &statsProcessor, &delta))
     lastUpdate = now;
-  MUTEX_UNLOCK(lock);
+  MUTEX_UNLOCK (lock);
 }
 
 
 StatEntry stats[] = {
   {
-    gettext_noop("Connectivity"),
-    gettext_noop("# connected nodes (100% = connection table size)"),
-    &getConnectedNodesStat,
-    NULL,
-    1,
-    NO,
-  },
+   gettext_noop ("Connectivity"),
+   gettext_noop ("# connected nodes (100% = connection table size)"),
+   &getConnectedNodesStat,
+   NULL,
+   1,
+   NO,
+   }
+  ,
   {
-    gettext_noop("System load"),
-    gettext_noop("CPU load (red), IO load (green), Network upload (yellow), Network download (blue)"),
-    &getLoadStat,
-    NULL,
-    4,
-    NO,
-  },
+   gettext_noop ("System load"),
+   gettext_noop
+   ("CPU load (red), IO load (green), Network upload (yellow), Network download (blue)"),
+   &getLoadStat,
+   NULL,
+   4,
+   NO,
+   }
+  ,
   {
-    gettext_noop("Datastore capacity"),
-    gettext_noop("Data in datastore (in percent of allowed quota)"),
-    &getQuotaStat,
-    NULL,
-    1,
-    NO,
-  },
+   gettext_noop ("Datastore capacity"),
+   gettext_noop ("Data in datastore (in percent of allowed quota)"),
+   &getQuotaStat,
+   NULL,
+   1,
+   NO,
+   }
+  ,
   {
-    gettext_noop("Inbound Traffic"),
-    gettext_noop("Noise (red), Content (green), Queries (yellow), Hellos (blue), other (gray), limit (magenta)"),
-    &getTrafficRecvStats,
-    NULL,
-    6,
-    5,
-  },
+   gettext_noop ("Inbound Traffic"),
+   gettext_noop
+   ("Noise (red), Content (green), Queries (yellow), Hellos (blue), other (gray), limit (magenta)"),
+   &getTrafficRecvStats,
+   NULL,
+   6,
+   5,
+   }
+  ,
   {
-    gettext_noop("Outbound Traffic"),
-    gettext_noop("Noise (red), Content (green), Queries (yellow), Hellos (blue), other (gray), limit (magenta)"),
-    &getTrafficSendStats,
-    NULL,
-    6,
-    5,
-  },
+   gettext_noop ("Outbound Traffic"),
+   gettext_noop
+   ("Noise (red), Content (green), Queries (yellow), Hellos (blue), other (gray), limit (magenta)"),
+   &getTrafficSendStats,
+   NULL,
+   6,
+   5,
+   }
+  ,
   {
-    gettext_noop("Routing Effectiveness"),
-    gettext_noop("Current (red) and average (green) effectiveness (100% = perfect)"),
-    &getEffectivenessStats,
-    NULL,
-    2,
-    NO,
-  },
+   gettext_noop ("Routing Effectiveness"),
+   gettext_noop
+   ("Current (red) and average (green) effectiveness (100% = perfect)"),
+   &getEffectivenessStats,
+   NULL,
+   2,
+   NO,
+   }
+  ,
   {
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    0,
-    NO,
-  },
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   0,
+   NO,
+   }
+  ,
 };
 
 static unsigned long long UPDATE_INTERVAL;
 
-void init_functions(struct GE_Context * e,
-                    struct GC_Configuration * c) {
+void
+init_functions (struct GE_Context *e, struct GC_Configuration *c)
+{
   ectx = e;
   cfg = c;
-  GC_get_configuration_value_number(cfg,
-                                    "GNUNET-GTK",
-                                    "STATS-INTERVAL",
-                                    1,
-                                    99 * cronYEARS,
-                                    30 * cronSECONDS,
-                                    &UPDATE_INTERVAL);
-  sock = client_connection_create(ectx,
-                                  cfg);
-  lock = MUTEX_CREATE(NO);
-  cron = gnunet_gtk_get_cron();
-  cron_add_job(cron,
-               &updateStatValues,
-               UPDATE_INTERVAL,
-               UPDATE_INTERVAL,
-               NULL);
-  cron_add_job(cron,
-               &updateConnectionGoal,
-               5 * cronMINUTES,
-               5 * cronMINUTES,
-               NULL);
+  GC_get_configuration_value_number (cfg,
+                                     "GNUNET-GTK",
+                                     "STATS-INTERVAL",
+                                     1,
+                                     99 * cronYEARS,
+                                     30 * cronSECONDS, &UPDATE_INTERVAL);
+  sock = client_connection_create (ectx, cfg);
+  lock = MUTEX_CREATE (NO);
+  cron = gnunet_gtk_get_cron ();
+  cron_add_job (cron,
+                &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL, NULL);
+  cron_add_job (cron,
+                &updateConnectionGoal,
+                5 * cronMINUTES, 5 * cronMINUTES, NULL);
 }
 
-void done_functions() {
+void
+done_functions ()
+{
   int i;
 
-  cron_del_job(cron,
-               &updateConnectionGoal,
-               5 * cronMINUTES,
-               NULL);
-  cron_del_job(cron,
-               &updateStatValues,
-               UPDATE_INTERVAL,
-               NULL);
-  MUTEX_DESTROY(lock);
-  connection_destroy(sock);
-  for (i=0;i<lsv_size;i++)
-    FREE(lastStatValues[i].statName);
-  GROW(lastStatValues,
-       lsv_size,
-       0);
+  cron_del_job (cron, &updateConnectionGoal, 5 * cronMINUTES, NULL);
+  cron_del_job (cron, &updateStatValues, UPDATE_INTERVAL, NULL);
+  MUTEX_DESTROY (lock);
+  connection_destroy (sock);
+  for (i = 0; i < lsv_size; i++)
+    FREE (lastStatValues[i].statName);
+  GROW (lastStatValues, lsv_size, 0);
   sock = NULL;
 }
 
diff --git a/src/plugins/stats/functions.h b/src/plugins/stats/functions.h
index ebd54cf1..a02ac4fa 100644
--- a/src/plugins/stats/functions.h
+++ b/src/plugins/stats/functions.h
@@ -24,8 +24,9 @@
 
 #include <GNUnet/gnunet_util.h>
 
-typedef struct {
-  char * statName;
+typedef struct
+{
+  char *statName;
   long long value;
   long long lvalue;
   cron_t delta;
@@ -35,24 +36,23 @@ typedef struct {
  * Callback function to obtain the latest stats
  * data for this stat display.
  */
-typedef int (*UpdateData)(const void * closure,
-                          gfloat ** data);
+typedef int (*UpdateData) (const void *closure, gfloat ** data);
 
 
-typedef struct SE_ {
-  char * paneName;
-  char * frameName;
+typedef struct SE_
+{
+  char *paneName;
+  char *frameName;
   UpdateData getData;
-  void * get_closure;
+  void *get_closure;
   unsigned int count;
-  int fill; /* fill first "fill" entries */
+  int fill;                     /* fill first "fill" entries */
 } StatEntry;
 
 extern StatEntry stats[];
 
-void init_functions(struct GE_Context * e,
-                    struct GC_Configuration * c);
+void init_functions (struct GE_Context *e, struct GC_Configuration *c);
 
-void done_functions(void);
+void done_functions (void);
 
 #endif
diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index d1da9422..4f8c34b1 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -32,7 +32,8 @@
 #define FRAME_WIDTH 0
 
 
-typedef struct {
+typedef struct
+{
   gint type;
   guint count;
   guint speed;
@@ -54,10 +55,11 @@ typedef struct {
   int statIdx;
 } LoadGraph;
 
-typedef struct {
-  GdkColor        bg_color;
-  GdkColor        frame_color;
-  GdkColor        mem_color[MAX_COLOR];
+typedef struct
+{
+  GdkColor bg_color;
+  GdkColor frame_color;
+  GdkColor mem_color[MAX_COLOR];
 } ProcConfig;
 
 static unsigned long long UPDATE_INTERVAL;
@@ -65,13 +67,15 @@ static unsigned long long UPDATE_INTERVAL;
 /**
  * Redraws the backing pixmap for the load graph and updates the window
  */
-static void load_graph_draw(LoadGraph *g) {
+static void
+load_graph_draw (LoadGraph * g)
+{
   guint i;
   guint j;
   gint dely;
   float delx;
   float max;
-  GdkFont * font;
+  GdkFont *font;
 
   if (!g->disp->window)
     return;
@@ -81,345 +85,342 @@ static void load_graph_draw(LoadGraph *g) {
 
   if (!g->pixmap)
     g->pixmap = gdk_pixmap_new (g->disp->window,
-                                g->draw_width, g->draw_height,
-                                gtk_widget_get_visual (g->disp)->depth);
+                                g->draw_width, g->draw_height,
+                                gtk_widget_get_visual (g->disp)->depth);
 
   /* Create GC if necessary. */
-  if (!g->gc) {
-    g->gc = gdk_gc_new (g->disp->window);
-    gdk_gc_copy (g->gc, g->disp->style->white_gc);
-  }
+  if (!g->gc)
+    {
+      g->gc = gdk_gc_new (g->disp->window);
+      gdk_gc_copy (g->gc, g->disp->style->white_gc);
+    }
 
   /* Allocate colors. */
-  if (!g->colors_allocated) {
-    GdkColormap *colormap;
+  if (!g->colors_allocated)
+    {
+      GdkColormap *colormap;
 
-    colormap = gdk_window_get_colormap (g->disp->window);
-    for (i=0;i<2+g->count;i++)
-      gdk_color_alloc (colormap, &(g->colors [i]));
+      colormap = gdk_window_get_colormap (g->disp->window);
+      for (i = 0; i < 2 + g->count; i++)
+        gdk_color_alloc (colormap, &(g->colors[i]));
 
-    g->colors_allocated = 1;
-  }
+      g->colors_allocated = 1;
+    }
   /* Erase Rectangle */
-  gdk_gc_set_foreground (g->gc, &(g->colors [0]));
+  gdk_gc_set_foreground (g->gc, &(g->colors[0]));
   gdk_draw_rectangle (g->pixmap,
-                      g->gc,
-                      TRUE, 0, 0,
-                      g->disp->allocation.width,
-                      g->disp->allocation.height);
+                      g->gc,
+                      TRUE, 0, 0,
+                      g->disp->allocation.width, g->disp->allocation.height);
 
   /* draw frame */
-  gdk_gc_set_foreground (g->gc, &(g->colors [1]));
+  gdk_gc_set_foreground (g->gc, &(g->colors[1]));
   gdk_draw_rectangle (g->pixmap,
-                      g->gc,
-                      FALSE, 0, 0,
-                      g->draw_width,
-                      g->disp->allocation.height);
+                      g->gc,
+                      FALSE, 0, 0, g->draw_width, g->disp->allocation.height);
 
-  max = 0.26; /* force showing at least the 25% line */
+  max = 0.26;                   /* force showing at least the 25% line */
   for (i = 0; i < g->num_points - 1; i++)
-    for (j=0;j<g->count;j++)
+    for (j = 0; j < g->count; j++)
       if (g->data[i][j] > max)
-        max = g->data[i][j];
-  max = max * 1.01; /* leave top 1% free */
+        max = g->data[i][j];
+  max = max * 1.01;             /* leave top 1% free */
 
-  font = gdk_font_load("fixed"); /* deprecated, but pango is far more than
-                                    what we need here -- fix later? */
+  font = gdk_font_load ("fixed");       /* deprecated, but pango is far more than
+                                           what we need here -- fix later? */
   /* draw lines at 25%, 50%, 75% and 100% of max */
   dely = g->draw_height / max / 4;
-  for (i = 1; i < 5; i++) {
-    gint y1 = g->draw_height + 1 - i * dely;
-    if ( (dely < 30) && (i != 4) )
-      continue; /* only print additional
-                   lines if there is enough space! */
-    if (y1 > 0) {
-      const gchar * label[] = {
-        NULL,
-        " 25%",
-        " 50%",
-        " 75%",
-        "100%",
-      };
-      gdk_draw_string(g->pixmap,
-                      font,
-                      g->gc,
-                      10,
-                      y1 - 8,
-                      label[i]);
-      gdk_draw_line (g->pixmap, g->gc,
-                     0, y1, g->draw_width, y1);
-      if (i == 4) {
-        /* extra-thick line at 100% */
-        gdk_draw_line (g->pixmap, g->gc,
-                       0, y1 - 1, g->draw_width, y1 - 1);
-        gdk_draw_line (g->pixmap, g->gc,
-                       0, y1 + 1, g->draw_width, y1 + 1);
-        
-      }
+  for (i = 1; i < 5; i++)
+    {
+      gint y1 = g->draw_height + 1 - i * dely;
+      if ((dely < 30) && (i != 4))
+        continue;               /* only print additional
+                                   lines if there is enough space! */
+      if (y1 > 0)
+        {
+          const gchar *label[] = {
+            NULL,
+            " 25%",
+            " 50%",
+            " 75%",
+            "100%",
+          };
+          gdk_draw_string (g->pixmap, font, g->gc, 10, y1 - 8, label[i]);
+          gdk_draw_line (g->pixmap, g->gc, 0, y1, g->draw_width, y1);
+          if (i == 4)
+            {
+              /* extra-thick line at 100% */
+              gdk_draw_line (g->pixmap, g->gc,
+                             0, y1 - 1, g->draw_width, y1 - 1);
+              gdk_draw_line (g->pixmap, g->gc,
+                             0, y1 + 1, g->draw_width, y1 + 1);
+
+            }
+        }
     }
-  }
-  gdk_gc_set_line_attributes(g->gc,
-                             2,
-                             GDK_LINE_SOLID,
-                             GDK_CAP_ROUND,
-                             GDK_JOIN_MITER);
-  delx = (float)g->draw_width / ( g->num_points - 1);
-
-  for (j=0;j<g->count;j++) {
-    gdk_gc_set_foreground (g->gc, &(g->colors [j + 2]));
-    for (i = 0; i < g->num_points - 1; i++) {
-      gint x1 = i * delx;
-      gint x2 = (i + 1) * delx;
-      gint y1 = g->data[i][j] / max * g->draw_height - 1;
-      gint y2 = g->data[i+1][j] / max * g->draw_height - 1;
-
-      if ((g->data[i][j] != -1) && (g->data[i+1][j] != -1)) {
-        if (stats[g->statIdx].fill <= j) {
-          gdk_draw_line(g->pixmap, g->gc,
-                        g->draw_width - x2,
-                        g->draw_height - y2,
-                        g->draw_width - x1,
-                        g->draw_height - y1);
-        } else {
-          GdkPoint points[4];
-        
-          points[0].x = g->draw_width - x2;
-          points[0].y = g->draw_height - y2;
-          points[1].x = g->draw_width - x1;
-          points[1].y = g->draw_height - y1;
-          points[2].x = g->draw_width - x1;
-          points[3].x = g->draw_width - x2;
-          if (j == 0) {
-            points[2].y = g->draw_height;
-            points[3].y = g->draw_height;
-          } else {
-            gint ly1 = g->data[i][j-1] / max * g->draw_height - 1;
-            gint ly2 = g->data[i+1][j-1] / max * g->draw_height - 1;
-            points[2].y = g->draw_height - ly1;
-            points[3].y = g->draw_height - ly2;
-          }
-          gdk_draw_polygon(g->pixmap,
-                           g->gc,
-                           1,
-                           points,
-                           4);
-        }
-      }
+  gdk_gc_set_line_attributes (g->gc,
+                              2,
+                              GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
+  delx = (float) g->draw_width / (g->num_points - 1);
+
+  for (j = 0; j < g->count; j++)
+    {
+      gdk_gc_set_foreground (g->gc, &(g->colors[j + 2]));
+      for (i = 0; i < g->num_points - 1; i++)
+        {
+          gint x1 = i * delx;
+          gint x2 = (i + 1) * delx;
+          gint y1 = g->data[i][j] / max * g->draw_height - 1;
+          gint y2 = g->data[i + 1][j] / max * g->draw_height - 1;
+
+          if ((g->data[i][j] != -1) && (g->data[i + 1][j] != -1))
+            {
+              if (stats[g->statIdx].fill <= j)
+                {
+                  gdk_draw_line (g->pixmap, g->gc,
+                                 g->draw_width - x2,
+                                 g->draw_height - y2,
+                                 g->draw_width - x1, g->draw_height - y1);
+                }
+              else
+                {
+                  GdkPoint points[4];
+
+                  points[0].x = g->draw_width - x2;
+                  points[0].y = g->draw_height - y2;
+                  points[1].x = g->draw_width - x1;
+                  points[1].y = g->draw_height - y1;
+                  points[2].x = g->draw_width - x1;
+                  points[3].x = g->draw_width - x2;
+                  if (j == 0)
+                    {
+                      points[2].y = g->draw_height;
+                      points[3].y = g->draw_height;
+                    }
+                  else
+                    {
+                      gint ly1 = g->data[i][j - 1] / max * g->draw_height - 1;
+                      gint ly2 =
+                        g->data[i + 1][j - 1] / max * g->draw_height - 1;
+                      points[2].y = g->draw_height - ly1;
+                      points[3].y = g->draw_height - ly2;
+                    }
+                  gdk_draw_polygon (g->pixmap, g->gc, 1, points, 4);
+                }
+            }
+        }
     }
-  }
 
   gdk_gc_set_line_attributes (g->gc, 1,
-                              GDK_LINE_SOLID,
-                              GDK_CAP_ROUND,
-                              GDK_JOIN_MITER );
+                              GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER);
 
   gdk_draw_pixmap (g->disp->window,
-                   g->disp->style->fg_gc [GTK_WIDGET_STATE(g->disp)],
-                   g->pixmap,
-                   0, 0,
-                   0, 0,
-                   g->disp->allocation.width,
-                   g->disp->allocation.height);
+                   g->disp->style->fg_gc[GTK_WIDGET_STATE (g->disp)],
+                   g->pixmap,
+                   0, 0,
+                   0, 0,
+                   g->disp->allocation.width, g->disp->allocation.height);
 }
 
 
 /* Updates the load graph when the timeout expires */
-static gboolean load_graph_update(gpointer ptr) {
+static gboolean
+load_graph_update (gpointer ptr)
+{
   LoadGraph *g = ptr;
   guint i;
   guint j;
 
-  for (i=0;i<g->num_points;i++)
-    memcpy(g->odata[i],
-           g->data[i],
-           g->data_size * g->count);
-  stats[g->statIdx].getData(stats[g->statIdx].get_closure,
-                            g->data);
-  for (i=0;i<g->num_points-1;i++)
-    for (j=0;j<g->count;j++)
-      g->data[i+1][j] = g->odata[i][j];
+  for (i = 0; i < g->num_points; i++)
+    memcpy (g->odata[i], g->data[i], g->data_size * g->count);
+  stats[g->statIdx].getData (stats[g->statIdx].get_closure, g->data);
+  for (i = 0; i < g->num_points - 1; i++)
+    for (j = 0; j < g->count; j++)
+      g->data[i + 1][j] = g->odata[i][j];
   if (g->draw)
     load_graph_draw (g);
   return TRUE;
 }
 
-static void load_graph_unalloc(LoadGraph *g) {
+static void
+load_graph_unalloc (LoadGraph * g)
+{
   int i;
   if (!g->allocated)
     return;
-  for (i = 0; i < g->num_points; i++) {
-    FREE(g->data[i]);
-    FREE(g->odata[i]);
-  }
-  FREE(g->data);
-  FREE(g->odata);
+  for (i = 0; i < g->num_points; i++)
+    {
+      FREE (g->data[i]);
+      FREE (g->odata[i]);
+    }
+  FREE (g->data);
+  FREE (g->odata);
   g->data = g->odata = NULL;
-  if (g->pixmap) {
-    gdk_pixmap_unref(g->pixmap);
-    g->pixmap = NULL;
-  }
+  if (g->pixmap)
+    {
+      gdk_pixmap_unref (g->pixmap);
+      g->pixmap = NULL;
+    }
   g->allocated = FALSE;
 }
 
-static void load_graph_alloc (LoadGraph *g) {
+static void
+load_graph_alloc (LoadGraph * g)
+{
   int i;
   int j;
 
   if (g->allocated)
     return;
 
-  g->data = MALLOC(sizeof(gfloat *) * g->num_points);
-  g->odata = MALLOC(sizeof(gfloat*) * g->num_points);
+  g->data = MALLOC (sizeof (gfloat *) * g->num_points);
+  g->odata = MALLOC (sizeof (gfloat *) * g->num_points);
   g->data_size = sizeof (gfloat);
-  for (i = 0; i < g->num_points; i++) {
-    g->data[i] = MALLOC(g->data_size * g->count);
-    g->odata[i] = MALLOC(g->data_size * g->count);
-  }
-  for (i=0;i<g->num_points;i++)
-    for (j=0;j<g->count;j++)
+  for (i = 0; i < g->num_points; i++)
+    {
+      g->data[i] = MALLOC (g->data_size * g->count);
+      g->odata[i] = MALLOC (g->data_size * g->count);
+    }
+  for (i = 0; i < g->num_points; i++)
+    for (j = 0; j < g->count; j++)
       g->data[i][j] = -1;
   g->allocated = TRUE;
 }
 
-static gint load_graph_configure(GtkWidget *widget,
-                                 GdkEventConfigure *event,
-                                 gpointer data_ptr) {
+static gint
+load_graph_configure (GtkWidget * widget,
+                      GdkEventConfigure * event, gpointer data_ptr)
+{
   LoadGraph *c = (LoadGraph *) data_ptr;
 
-  if (c->pixmap) {
-    gdk_pixmap_unref (c->pixmap);
-    c->pixmap = NULL;
-  }
+  if (c->pixmap)
+    {
+      gdk_pixmap_unref (c->pixmap);
+      c->pixmap = NULL;
+    }
 
   if (!c->pixmap)
-    c->pixmap = gdk_pixmap_new(widget->window,
-                               widget->allocation.width,
-                               widget->allocation.height,
-                               gtk_widget_get_visual (c->disp)->depth);
-  gdk_draw_rectangle(c->pixmap,
-                     widget->style->black_gc,
-                     TRUE, 0,0,
-                     widget->allocation.width,
-                     widget->allocation.height);
-  gdk_draw_pixmap(widget->window,
-                  c->disp->style->fg_gc[GTK_WIDGET_STATE(widget)],
-                  c->pixmap,
-                  0, 0,
-                  0, 0,
-                  c->disp->allocation.width,
-                  c->disp->allocation.height);
-
-  load_graph_draw(c);
+    c->pixmap = gdk_pixmap_new (widget->window,
+                                widget->allocation.width,
+                                widget->allocation.height,
+                                gtk_widget_get_visual (c->disp)->depth);
+  gdk_draw_rectangle (c->pixmap,
+                      widget->style->black_gc,
+                      TRUE, 0, 0,
+                      widget->allocation.width, widget->allocation.height);
+  gdk_draw_pixmap (widget->window,
+                   c->disp->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                   c->pixmap,
+                   0, 0,
+                   0, 0,
+                   c->disp->allocation.width, c->disp->allocation.height);
+
+  load_graph_draw (c);
   return TRUE;
 }
 
-static gint load_graph_expose(GtkWidget *widget,
-                              GdkEventExpose *event,
-                              gpointer data_ptr) {
+static gint
+load_graph_expose (GtkWidget * widget,
+                   GdkEventExpose * event, gpointer data_ptr)
+{
   LoadGraph *g = (LoadGraph *) data_ptr;
 
-  gdk_draw_pixmap(widget->window,
-                  widget->style->fg_gc [GTK_WIDGET_STATE(widget)],
-                  g->pixmap,
-                  event->area.x, event->area.y,
-                  event->area.x, event->area.y,
-                  event->area.width, event->area.height);
+  gdk_draw_pixmap (widget->window,
+                   widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
+                   g->pixmap,
+                   event->area.x, event->area.y,
+                   event->area.x, event->area.y,
+                   event->area.width, event->area.height);
   return FALSE;
 }
 
-static void load_graph_stop (LoadGraph *g) {
+static void
+load_graph_stop (LoadGraph * g)
+{
   if (!g)
     return;
-  if (g->timer_index != -1) {
-    gtk_timeout_remove(g->timer_index);
-    g->timer_index = -1;
-  }
+  if (g->timer_index != -1)
+    {
+      gtk_timeout_remove (g->timer_index);
+      g->timer_index = -1;
+    }
   g->draw = FALSE;
 }
 
-static void load_graph_destroy(GtkWidget *widget,
-                               gpointer data_ptr) {
+static void
+load_graph_destroy (GtkWidget * widget, gpointer data_ptr)
+{
   LoadGraph *g = (LoadGraph *) data_ptr;
-  load_graph_stop(g);
+  load_graph_stop (g);
   if (g->timer_index != -1)
     gtk_timeout_remove (g->timer_index);
-  load_graph_unalloc(g);
-  FREE(g->colors);
-  FREE(g);
+  load_graph_unalloc (g);
+  FREE (g->colors);
+  FREE (g);
 }
 
-static LoadGraph * load_graph_new(int statIdx,
-                                  const ProcConfig * config) {
+static LoadGraph *
+load_graph_new (int statIdx, const ProcConfig * config)
+{
   LoadGraph *g;
   unsigned int i;
 
-  if (stats[statIdx].count > MAX_COLOR) {
-    GE_BREAK(NULL, 0);
-    return NULL;
-  }
+  if (stats[statIdx].count > MAX_COLOR)
+    {
+      GE_BREAK (NULL, 0);
+      return NULL;
+    }
 
-  g = MALLOC(sizeof(LoadGraph));
+  g = MALLOC (sizeof (LoadGraph));
   g->statIdx = statIdx;
   g->count = stats[statIdx].count;
   g->speed = UPDATE_INTERVAL / cronMILLIS;
   g->num_points = 600;
-  g->colors = MALLOC(sizeof(GdkColor) * (2+g->count));
+  g->colors = MALLOC (sizeof (GdkColor) * (2 + g->count));
   g->colors[0] = config->bg_color;
   g->colors[1] = config->frame_color;
-  for (i=0;i<g->count;i++)
-    g->colors[2+i] = config->mem_color[i];
+  for (i = 0; i < g->count; i++)
+    g->colors[2 + i] = config->mem_color[i];
   g->timer_index = -1;
   g->draw = FALSE;
   g->main_widget = gtk_vbox_new (FALSE, FALSE);
-  gtk_widget_show(g->main_widget);
-  g->disp = gtk_drawing_area_new();
+  gtk_widget_show (g->main_widget);
+  g->disp = gtk_drawing_area_new ();
   gtk_widget_show (g->disp);
-  gtk_signal_connect(GTK_OBJECT (g->disp),
-                     "expose_event",
-                     GTK_SIGNAL_FUNC (load_graph_expose), g);
-  gtk_signal_connect(GTK_OBJECT(g->disp),
-                     "configure_event",
-                     GTK_SIGNAL_FUNC (load_graph_configure), g);
-  gtk_signal_connect(GTK_OBJECT(g->disp),
-                     "destroy",
-                     GTK_SIGNAL_FUNC (load_graph_destroy), g);
-  gtk_widget_add_events(g->disp,
-                        GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
-  gtk_box_pack_start(GTK_BOX(g->main_widget),
-                     g->disp,
-                     TRUE,
-                     TRUE,
-                     0);
-  load_graph_alloc(g);
-  gtk_widget_show_all(g->main_widget);
-  g->timer_index = gtk_timeout_add(g->speed,
-                                   &load_graph_update, g);
+  gtk_signal_connect (GTK_OBJECT (g->disp),
+                      "expose_event", GTK_SIGNAL_FUNC (load_graph_expose), g);
+  gtk_signal_connect (GTK_OBJECT (g->disp),
+                      "configure_event",
+                      GTK_SIGNAL_FUNC (load_graph_configure), g);
+  gtk_signal_connect (GTK_OBJECT (g->disp),
+                      "destroy", GTK_SIGNAL_FUNC (load_graph_destroy), g);
+  gtk_widget_add_events (g->disp, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK);
+  gtk_box_pack_start (GTK_BOX (g->main_widget), g->disp, TRUE, TRUE, 0);
+  load_graph_alloc (g);
+  gtk_widget_show_all (g->main_widget);
+  g->timer_index = gtk_timeout_add (g->speed, &load_graph_update, g);
 
   return g;
 }
 
-static GtkWidget * create_sys_view(int statIdx,
-                                   const ProcConfig * config) {
-  GtkWidget * mem_frame;
-  LoadGraph * mem_graph;
+static GtkWidget *
+create_sys_view (int statIdx, const ProcConfig * config)
+{
+  GtkWidget *mem_frame;
+  LoadGraph *mem_graph;
 
-  mem_graph = load_graph_new(statIdx,
-                             config);
+  mem_graph = load_graph_new (statIdx, config);
   if (mem_graph == NULL)
-    return NULL; /* oops */
-  mem_frame = gtk_frame_new(_(stats[statIdx].frameName));
-  gtk_container_add(GTK_CONTAINER(mem_frame),
-                    mem_graph->main_widget);
-  gtk_container_set_border_width(GTK_CONTAINER(mem_graph->main_widget),
-                                 GNOME_PAD_SMALL);
-  gtk_container_set_border_width(GTK_CONTAINER(mem_frame),
-                                 GNOME_PAD_SMALL);
-  gtk_widget_show(mem_frame);
+    return NULL;                /* oops */
+  mem_frame = gtk_frame_new (_(stats[statIdx].frameName));
+  gtk_container_add (GTK_CONTAINER (mem_frame), mem_graph->main_widget);
+  gtk_container_set_border_width (GTK_CONTAINER (mem_graph->main_widget),
+                                  GNOME_PAD_SMALL);
+  gtk_container_set_border_width (GTK_CONTAINER (mem_frame), GNOME_PAD_SMALL);
+  gtk_widget_show (mem_frame);
   if (mem_graph->timer_index == -1)
     mem_graph->timer_index
-      = gtk_timeout_add(mem_graph->speed,
-                        &load_graph_update,
-                        mem_graph);
+      = gtk_timeout_add (mem_graph->speed, &load_graph_update, mem_graph);
   mem_graph->draw = TRUE;
   return mem_frame;
 }
@@ -428,64 +429,50 @@ static GtkWidget * create_sys_view(int statIdx,
 
 
 
-void init_stats(struct GE_Context * ectx,
-                struct GC_Configuration * cfg) {
-  GtkWidget * sys_box;
-  GtkWidget * label;
-  GtkWidget * notebook;
+void
+init_stats (struct GE_Context *ectx, struct GC_Configuration *cfg)
+{
+  GtkWidget *sys_box;
+  GtkWidget *label;
+  GtkWidget *notebook;
   ProcConfig config;
   int i;
 
-  GC_get_configuration_value_number(cfg,
-                                    "GNUNET-GTK",
-                                    "STATS-INTERVAL",
-                                    1,
-                                    99 * cronYEARS,
-                                    30 * cronSECONDS,
-                                    &UPDATE_INTERVAL);
-  init_functions(ectx,
-                 cfg);
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "statsNotebook");
-  memset(&config,
-         0,
-         sizeof(ProcConfig));
-  gdk_color_parse("black",
-                  &config.bg_color);
-  gdk_color_parse("gray",
-                  &config.frame_color);
-  gdk_color_parse("red",
-                  &config.mem_color[0]);
-  gdk_color_parse("green",
-                  &config.mem_color[1]);
-  gdk_color_parse("yellow",
-                  &config.mem_color[2]);
-  gdk_color_parse("blue",
-                  &config.mem_color[3]);
-  gdk_color_parse("gray",
-                  &config.mem_color[4]);
-  gdk_color_parse("magenta",
-                  &config.mem_color[5]);
-  GE_ASSERT(ectx,
-            MAX_COLOR == 6);
+  GC_get_configuration_value_number (cfg,
+                                     "GNUNET-GTK",
+                                     "STATS-INTERVAL",
+                                     1,
+                                     99 * cronYEARS,
+                                     30 * cronSECONDS, &UPDATE_INTERVAL);
+  init_functions (ectx, cfg);
+  notebook = glade_xml_get_widget (getMainXML (), "statsNotebook");
+  memset (&config, 0, sizeof (ProcConfig));
+  gdk_color_parse ("black", &config.bg_color);
+  gdk_color_parse ("gray", &config.frame_color);
+  gdk_color_parse ("red", &config.mem_color[0]);
+  gdk_color_parse ("green", &config.mem_color[1]);
+  gdk_color_parse ("yellow", &config.mem_color[2]);
+  gdk_color_parse ("blue", &config.mem_color[3]);
+  gdk_color_parse ("gray", &config.mem_color[4]);
+  gdk_color_parse ("magenta", &config.mem_color[5]);
+  GE_ASSERT (ectx, MAX_COLOR == 6);
   i = -1;
-  while (stats[++i].paneName != NULL) {
-    sys_box = create_sys_view(i,
-                              &config);
-    if (sys_box == NULL)
-      continue; /* oops */
-
-    label = gtk_label_new(gettext(stats[i].paneName));
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
-                             sys_box,
-                             label);
-  }
-  gtk_widget_show(notebook);
+  while (stats[++i].paneName != NULL)
+    {
+      sys_box = create_sys_view (i, &config);
+      if (sys_box == NULL)
+        continue;               /* oops */
+
+      label = gtk_label_new (gettext (stats[i].paneName));
+      gtk_notebook_append_page (GTK_NOTEBOOK (notebook), sys_box, label);
+    }
+  gtk_widget_show (notebook);
 }
 
-void done_stats() {
-  done_functions();
+void
+done_stats ()
+{
+  done_functions ();
 }