indent

11 files changed, 81 insertions, 77 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index c9f218e8..1090fefa 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -698,8 +698,9 @@ GNUNET_GTK_run_gnunet_setup (gchar * conffile, gboolean run_wizard)
   return TRUE;
 }
 
-GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
-                                                       const char *windowName) 
+GtkWidget *
+GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
+                                            const char *windowName)
 {
   GtkContainer *window;
   GtkWidget *ret;
diff --git a/src/common/logging.c b/src/common/logging.c
index 355b4f3b..677c4783 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -38,9 +38,10 @@ init ()
   if (infoWindowTextView != NULL)
     return;
   infoWindowTextView
-    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML(),
-                            "messageWindowTextView");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "messageWindowTextView");
 }
+
 /**
  * Do not track more than MAX messages
  */
@@ -52,7 +53,7 @@ init ()
 static void *
 doInfoMessage (void *args)
 {
-  char * note = args;
+  char *note = args;
   GtkTextIter iter;
   GtkTextBuffer *buffer;
   GtkTextIter end;
@@ -63,7 +64,7 @@ doInfoMessage (void *args)
   gtk_text_buffer_insert (buffer, &iter, 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, &iter, MAX_LINES - 1);
       gtk_text_buffer_get_iter_at_line (buffer, &end, -1);
       gtk_text_buffer_delete (buffer, &iter, &end);
     }
@@ -79,7 +80,7 @@ void
 GNUNET_GTK_show_info_message (const char *format, ...)
 {
   va_list args;
-  gchar * note;
+  gchar *note;
 
   va_start (args, format);
   note = g_strdup_vprintf (format, args);
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index b0cce179..ff8e9034 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -175,7 +175,8 @@ struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
 
 
 GtkWidget *GNUNET_GTK_extract_main_widget_from_window (GladeXML * xml,
-                                                       const char *windowName);
+                                                       const char
+                                                       *windowName);
 
 
 
diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index 6db7bbfa..e4cbfa2f 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -262,8 +262,8 @@ create_chat_room_tab (const char *room_name, const char *nick)
     glade_xml_new (GNUNET_GTK_get_glade_filename (),
                    "chatFrame", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (client->chatXML);
-  client->chatFrame = GNUNET_GTK_extract_main_widget_from_window (client->chatXML,
-                                                   "chatFrame");
+  client->chatFrame =
+    GNUNET_GTK_extract_main_widget_from_window (client->chatXML, "chatFrame");
   chatLabel = gtk_label_new (room_name);
   gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
                             client->chatFrame, chatLabel);
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 0cab7e52..a120b03c 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -78,7 +78,7 @@ updateAppModel (void *dummy)
   char *pos;
   char *desc;
   GtkListStore *model;
-  
+
   model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   apps = NULL;
   sock = GNUNET_client_connection_create (ectx, cfg);
@@ -257,7 +257,7 @@ cronCheckDaemon (void *dummy)
     ret = 0;
   if (last != ret)
     {
-      updateAppModel(NULL);
+      updateAppModel (NULL);
       last = ret;
     }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
@@ -282,10 +282,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   gtk_widget_set_sensitive (launchEntry, FALSE);
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
-      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
-                              &cronCheckDaemon,
-                              15 * GNUNET_CRON_SECONDS,
-                              NULL);
+      GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
+                               &cronCheckDaemon,
+                               15 * GNUNET_CRON_SECONDS, NULL);
       return;
     }
   else
@@ -325,10 +324,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
                   GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
                 }
               g_free (fn);
-              GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
-                                      &cronCheckDaemon,
-                                      15 * GNUNET_CRON_SECONDS,
-                                      NULL);
+              GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
+                                       &cronCheckDaemon,
+                                       15 * GNUNET_CRON_SECONDS, NULL);
               return;
             }
           else
@@ -348,10 +346,9 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       if (fn != NULL)
         g_free (fn);
-      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
-                              &cronCheckDaemon,
-                              15 * GNUNET_CRON_SECONDS,
-                              NULL);
+      GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
+                               &cronCheckDaemon,
+                               15 * GNUNET_CRON_SECONDS, NULL);
     }
 }
 
@@ -390,10 +387,8 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       GNUNET_client_connection_destroy (sock);
     }
-  GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
-                          &cronCheckDaemon,
-                          15 * GNUNET_CRON_SECONDS,
-                          NULL);
+  GNUNET_cron_advance_job (GNUNET_GTK_get_cron_manager (),
+                           &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
 }
 
 void
@@ -474,8 +469,8 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
   GNUNET_free (daemon_config);
 
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS, 15 * GNUNET_CRON_SECONDS,
-                       NULL);
+  GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS,
+                       15 * GNUNET_CRON_SECONDS, NULL);
   GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
                        5 * GNUNET_CRON_MINUTES, NULL);
 }
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 067dce3c..5009b0a2 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -137,7 +137,8 @@ deleteCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
     }
   else
     {
-      GNUNET_GTK_show_info_message (_("Failed to stop collection (consult logs).\n"));
+      GNUNET_GTK_show_info_message (_
+                                    ("Failed to stop collection (consult logs).\n"));
     }
 }
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index e00668a0..55505074 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -676,23 +676,21 @@ fs_summary_stop ()
 
 }
 
-static void 
-init_cron_job(void * arg)
+static void
+init_cron_job (void *arg)
 {
-  GtkWidget * tab = arg;
+  GtkWidget *tab = arg;
 
-  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk",
-                           8, /* FIXME: allow user to configure download parallelism */
+  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8,  /* FIXME: allow user to configure download parallelism */
                            GNUNET_YES, &eventProcessor, NULL);
-  GNUNET_GTK_save_call((GNUNET_ThreadMainFunction) &gtk_widget_show,
-                       tab);
+  GNUNET_GTK_save_call ((GNUNET_ThreadMainFunction) & gtk_widget_show, tab);
 }
 
 void
 init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
 {
   GtkWidget *tab;
-  struct GNUNET_CronManager * cron;
+  struct GNUNET_CronManager *cron;
 
   ectx = e;
   cfg = c;
@@ -701,8 +699,8 @@ init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
   fs_collection_start ();
   fs_namespace_start ();
   tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
-  cron = GNUNET_GTK_get_cron_manager();
-  GNUNET_cron_add_job(cron, &init_cron_job, 0, 0, tab);
+  cron = GNUNET_GTK_get_cron_manager ();
+  GNUNET_cron_add_job (cron, &init_cron_job, 0, 0, tab);
 }
 
 static void *
@@ -712,19 +710,19 @@ cleanup_save_call (void *arg)
 
   fs_summary_stop ();
   fs_namespace_stop ();
-  gtk_widget_hide(tab);
+  gtk_widget_hide (tab);
   return NULL;
 }
 
 void
 done_fs ()
 {
-  struct GNUNET_CronManager * cron;
+  struct GNUNET_CronManager *cron;
   GtkWidget *tab;
 
   tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
-  cron = GNUNET_GTK_get_cron_manager();
-  GNUNET_cron_del_job(cron, &init_cron_job, 0, tab);
+  cron = GNUNET_GTK_get_cron_manager ();
+  GNUNET_cron_del_job (cron, &init_cron_job, 0, tab);
   if (ctx != NULL)
     GNUNET_FSUI_stop (ctx);
   GNUNET_GTK_save_call (&cleanup_save_call, tab);
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 987d0264..3e7108f1 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -120,9 +120,11 @@ makeNamespaceFrame (NamespaceList * entry)
     = glade_xml_new (GNUNET_GTK_get_glade_filename (),
                      "namespaceContentFrame", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (namespaceXML);
-  child = GNUNET_GTK_extract_main_widget_from_window (namespaceXML, "namespaceContentFrame");
-  resultList = glade_xml_get_widget (namespaceXML,
-                                     "namespaceContentFrameTreeView");
+  child =
+    GNUNET_GTK_extract_main_widget_from_window (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");
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index ed134192..83c0848e 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -80,10 +80,10 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
         {
           if (nsName != NULL)
             {
-              GNUNET_GE_ASSERT(NULL,
-                               GNUNET_OK ==
-                               GNUNET_pseudonym_name_to_id(ectx, cfg,
-                                                           nsName, &nsid));
+              GNUNET_GE_ASSERT (NULL,
+                                GNUNET_OK ==
+                                GNUNET_pseudonym_name_to_id (ectx, cfg,
+                                                             nsName, &nsid));
               newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
               rating = GNUNET_pseudonym_rank (ectx,
                                               cfg, &nsid, newrating - rating);
@@ -157,10 +157,10 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
         }
       else if (nsName != NULL)
         {
-          GNUNET_GE_ASSERT(NULL,
-                           GNUNET_OK ==
-                           GNUNET_pseudonym_name_to_id(ectx, cfg,
-                                                       nsName, &ns));
+          GNUNET_GE_ASSERT (NULL,
+                            GNUNET_OK ==
+                            GNUNET_pseudonym_name_to_id (ectx, cfg,
+                                                         nsName, &ns));
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
           gtk_widget_set_sensitive (spin, TRUE);
           keyword
@@ -261,7 +261,8 @@ saveDiscovery (void *cls)
     }
   if (found == GNUNET_NO)
     {
-      GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"), nni->namespaceName, desc);
+      GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"),
+                                    nni->namespaceName, desc);
       gtk_list_store_append (model, &iter);
       gtk_list_store_set (model,
                           &iter,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index aaabb079..889e5ff1 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -255,13 +255,13 @@ addEntryToSearchTree (SearchList * searchContext,
         }
     }
 #else
-  mime = GNUNET_strdup(rawMime);
+  mime = GNUNET_strdup (rawMime);
 #endif
 
   gtk_tree_store_set (searchContext->tree, iter,
                       SEARCH_NAME, name, SEARCH_SIZE, size, SEARCH_HSIZE,
-                      size_h, SEARCH_MIME, mime, 
-                      SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc,
+                      size_h, SEARCH_MIME, mime,
+                      SEARCH_RAW_MIME, rawMime, SEARCH_DESC, desc,
                       SEARCH_PIXBUF, pixbuf, SEARCH_URI,
                       GNUNET_ECRS_uri_duplicate (info->uri), SEARCH_META,
                       GNUNET_meta_data_duplicate (info->meta),
@@ -270,11 +270,11 @@ addEntryToSearchTree (SearchList * searchContext,
                       searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
                       SEARCH_STATUS, getStatusName (state),
                       SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT,
-                      (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, 
+                      (long long) 1, SEARCH_RANK_PIXBUF, rankbuf,
 #ifdef HAVE_GIO
                       SEARCH_ICON, icon,
 #endif
-                      -1);
+                      -1);
   g_object_unref (rankbuf);
   if (pixbuf != NULL)
     g_object_unref (pixbuf);
@@ -711,15 +711,16 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                    PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
   list->searchpage
-    = GNUNET_GTK_extract_main_widget_from_window (list->searchXML, "searchResultsFrame");
+    =
+    GNUNET_GTK_extract_main_widget_from_window (list->searchXML,
+                                                "searchResultsFrame");
   /* setup tree view and renderers */
   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 */
+  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 */
@@ -739,7 +740,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                                    GDK_TYPE_PIXBUF,     /* ranking visualization */
                                    G_TYPE_INT64 /* numeric sort */
 #ifdef HAVE_GIO
-                                   , GDK_TYPE_PIXBUF     /* icon */
+                                   , GDK_TYPE_PIXBUF    /* icon */
 #endif
     );
 
@@ -935,7 +936,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                      "searchTabLabelWindow", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (list->labelXML);
   list->tab_label
-    = GNUNET_GTK_extract_main_widget_from_window (list->labelXML, "searchTabLabelWindow");
+    =
+    GNUNET_GTK_extract_main_widget_from_window (list->labelXML,
+                                                "searchTabLabelWindow");
   /* process existing results */
   for (i = 0; i < resultCount; i++)
     fs_search_result_received (list, &results[i], uri);
@@ -1186,14 +1189,14 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
       if (nsName != NULL)
         {
           char *ustring;
-          GNUNET_EncName enc;
-          GNUNET_HashCode nsid;
+          GNUNET_EncName enc;
+          GNUNET_HashCode nsid;
 
-          GNUNET_GE_ASSERT(NULL,
-                           GNUNET_OK ==
-                           GNUNET_pseudonym_name_to_id(ectx, cfg,
-                                                       nsName, &nsid));
-          GNUNET_hash_to_enc(&nsid, &enc);
+          GNUNET_GE_ASSERT (NULL,
+                            GNUNET_OK ==
+                            GNUNET_pseudonym_name_to_id (ectx, cfg,
+                                                         nsName, &nsid));
+          GNUNET_hash_to_enc (&nsid, &enc);
 
           ustring =
             GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
@@ -1201,7 +1204,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                            strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
           strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
           strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
-          strcat (ustring, (const char*)&enc);
+          strcat (ustring, (const char *) &enc);
           strcat (ustring, "/");
           strcat (ustring, searchString);
           fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 4c179dd0..256b5de8 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -478,7 +478,8 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
   return GNUNET_OK;
 }
 
-struct UpdateClosure {
+struct UpdateClosure
+{
   GNUNET_CronTime delta;
   int is_running;
 };
@@ -489,7 +490,7 @@ struct UpdateClosure {
 static void *
 updateDaemonStatus (void *cls)
 {
-  struct UpdateClosure * uc = cls;
+  struct UpdateClosure *uc = cls;
   static gboolean once = TRUE;
   static int last_status = -5;
   unsigned long long connected_peers;