1 files changed, 88 insertions, 109 deletions

diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c
index fb3b609a..b9fceec8 100644
--- a/src/plugins/chat/chat.c
+++ b/src/plugins/chat/chat.c
@@ -32,7 +32,7 @@
 
 struct GNUNET_CHAT_safe_write_struct
 {
-  GtkWidget * text_view;
+  GtkWidget *text_view;
   const char *message;
   const char *sender;
 };
@@ -40,7 +40,7 @@ struct GNUNET_CHAT_safe_write_struct
 struct GNUNET_CHAT_safe_nick_write_struct
 {
   GtkListStore *model;
-  GdkPixbuf * icon;
+  GdkPixbuf *icon;
   const struct GNUNET_ECRS_MetaData *meta;
   const char *nick;
   GNUNET_HashCode pid;
@@ -49,9 +49,9 @@ struct GNUNET_CHAT_safe_nick_write_struct
 struct GNUNET_CHAT_gui_chat_client
 {
   struct GNUNET_CHAT_gui_chat_client *next;
-  GtkWidget * send_button;
-  GtkWidget * text_view;
-  GtkListStore * nick_model;
+  GtkWidget *send_button;
+  GtkWidget *text_view;
+  GtkListStore *nick_model;
   GtkWidget *chatFrame;
   GtkWidget *chat_entry;
   GladeXML *chatXML;
@@ -90,59 +90,51 @@ write_save_call (void *arg)
 
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (cls->text_view));
   message_buf_size =
-    snprintf (NULL, 0,
-              "<%s>: %s\n", 
-              cls->sender,
-              cls->message);
+    snprintf (NULL, 0, "<%s>: %s\n", cls->sender, cls->message);
   message_buf = GNUNET_malloc (message_buf_size + 1);
-  GNUNET_snprintf (message_buf, 
-                   message_buf_size + 1,
-                   "<%s>: %s\n",
-                   cls->sender,
-                   cls->message);
-  gtk_text_buffer_insert_at_cursor (buffer,
-                                    message_buf,
-                                    message_buf_size);
-  GNUNET_free(message_buf);
+  GNUNET_snprintf (message_buf,
+                   message_buf_size + 1,
+                   "<%s>: %s\n", cls->sender, cls->message);
+  gtk_text_buffer_insert_at_cursor (buffer, message_buf, message_buf_size);
+  GNUNET_free (message_buf);
   return NULL;
 }
 
 /**
- * Safe call to add a nick to the chat room view 
+ * Safe call to add a nick to the chat room view
  */
 static void *
 add_nick_save_call (void *arg)
 {
   struct GNUNET_CHAT_safe_nick_write_struct *cls = arg;
-  GtkListStore * model;
+  GtkListStore *model;
   GtkTreeIter iter;
-  GNUNET_HashCode * pid;
-  
+  GNUNET_HashCode *pid;
+
   model = GTK_LIST_STORE (cls->model);
   gtk_list_store_append (model, &iter);
-  pid = GNUNET_malloc(sizeof(GNUNET_HashCode));
+  pid = GNUNET_malloc (sizeof (GNUNET_HashCode));
   *pid = cls->pid;
-  gtk_list_store_set(model,
-                     &iter,
-                     CHAT_PID, pid,
-                     CHAT_METADATA, GNUNET_ECRS_meta_data_duplicate(cls->meta),
-                     CHAT_ICON, cls->icon,
-                     CHAT_NICKNAME, cls->nick,
-                     -1);
+  gtk_list_store_set (model,
+                      &iter,
+                      CHAT_PID, pid,
+                      CHAT_METADATA,
+                      GNUNET_ECRS_meta_data_duplicate (cls->meta), CHAT_ICON,
+                      cls->icon, CHAT_NICKNAME, cls->nick, -1);
   return NULL;
 }
 
 /**
- * Safe call to remove a nick from the chat room view 
+ * Safe call to remove a nick from the chat room view
  */
 static void *
 remove_nick_save_call (void *arg)
 {
   struct GNUNET_CHAT_safe_nick_write_struct *cls = arg;
-  GtkListStore * model;
+  GtkListStore *model;
   GtkTreeIter iter;
-  GNUNET_HashCode * pid;
-  struct GNUNET_ECRS_MetaData * meta;
+  GNUNET_HashCode *pid;
+  struct GNUNET_ECRS_MetaData *meta;
 
   model = GTK_LIST_STORE (cls->model);
   /* find and remove existing entry */
@@ -153,19 +145,15 @@ remove_nick_save_call (void *arg)
           pid = NULL;
           gtk_tree_model_get (GTK_TREE_MODEL (model),
                               &iter,
-                              CHAT_PID, &pid,
-                              CHAT_METADATA, &meta,
-                              -1);
-          if ( (pid != NULL) && 
-               (0 == memcmp(pid,
-                            &cls->pid,
-                            sizeof(GNUNET_HashCode))) )
-            {
-              GNUNET_ECRS_meta_data_destroy(meta);
-              GNUNET_free(pid);
-              gtk_list_store_remove(model, &iter);
-              return NULL; /* done! */
-            }
+                              CHAT_PID, &pid, CHAT_METADATA, &meta, -1);
+          if ((pid != NULL) &&
+              (0 == memcmp (pid, &cls->pid, sizeof (GNUNET_HashCode))))
+            {
+              GNUNET_ECRS_meta_data_destroy (meta);
+              GNUNET_free (pid);
+              gtk_list_store_remove (model, &iter);
+              return NULL;      /* done! */
+            }
         }
       while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
     }
@@ -189,40 +177,38 @@ remove_nick_save_call (void *arg)
 static int
 receive_callback (void *cls,
                   struct GNUNET_CHAT_Room *room,
-                  const GNUNET_HashCode *sender,
-                  const struct GNUNET_ECRS_MetaData * member_info,
-                  const char *message,
-                  GNUNET_CHAT_MSG_OPTIONS options)
+                  const GNUNET_HashCode * sender,
+                  const struct GNUNET_ECRS_MetaData *member_info,
+                  const char *message, GNUNET_CHAT_MSG_OPTIONS options)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   struct GNUNET_CHAT_safe_write_struct writearg;
-  char * sndr;
-  
-  sndr = sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name(chat_ectx, chat_cfg, sender);  
+  char *sndr;
+
+  sndr =
+    sender == NULL ? _("anonymous") : GNUNET_PSEUDO_id_to_name (chat_ectx,
+                                                                chat_cfg,
+                                                                sender);
   writearg.text_view = client->text_view;
   writearg.message = message;
   writearg.sender = sndr;
   GNUNET_GTK_save_call (&write_save_call, &writearg);
-  GNUNET_free_non_null(sndr);
+  GNUNET_free_non_null (sndr);
   return GNUNET_OK;
 }
 
 static int
 member_list_callback (void *cls,
-                      const struct GNUNET_ECRS_MetaData * member_info,
-                      const GNUNET_RSA_PublicKey * pkey,
-                      GNUNET_CHAT_MSG_OPTIONS opt)
+                      const struct GNUNET_ECRS_MetaData *member_info,
+                      const GNUNET_RSA_PublicKey * pkey,
+                      GNUNET_CHAT_MSG_OPTIONS opt)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   struct GNUNET_CHAT_safe_nick_write_struct writearg;
   char *nick;
 
-  GNUNET_hash(pkey,
-              sizeof(GNUNET_RSA_PublicKey),
-              &writearg.pid);
-  nick = GNUNET_PSEUDO_id_to_name(chat_ectx,
-                                  chat_cfg,
-                                  &writearg.pid);
+  GNUNET_hash (pkey, sizeof (GNUNET_RSA_PublicKey), &writearg.pid);
+  nick = GNUNET_PSEUDO_id_to_name (chat_ectx, chat_cfg, &writearg.pid);
   writearg.model = client->nick_model;
   /* FIXME: set icon if pid == ours */
   writearg.icon = NULL;
@@ -232,7 +218,7 @@ member_list_callback (void *cls,
     GNUNET_GTK_save_call (&add_nick_save_call, &writearg);
   else
     GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
-  GNUNET_free(nick);
+  GNUNET_free (nick);
   return GNUNET_OK;
 }
 
@@ -243,20 +229,17 @@ on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
   const char *message;
   struct GNUNET_CHAT_gui_chat_client *pos;
 
-  GNUNET_mutex_lock(lock);
+  GNUNET_mutex_lock (lock);
   pos = list;
-  while ( (pos != NULL) &&
-          (pos->send_button != widget) )
+  while ((pos != NULL) && (pos->send_button != widget))
     pos = pos->next;
-  GNUNET_GE_ASSERT(NULL, pos != NULL);
-  
-  message = (const char *) gtk_entry_get_text (GTK_ENTRY(pos->chat_entry));
-  GNUNET_CHAT_send_message (pos->room, 
-                            message,
-                            GNUNET_CHAT_MSG_OPTION_NONE, 
-                            NULL, &seq);
-  gtk_entry_set_text (GTK_ENTRY(pos->chat_entry), "");
-  GNUNET_mutex_unlock(lock);
+  GNUNET_GE_ASSERT (NULL, pos != NULL);
+
+  message = (const char *) gtk_entry_get_text (GTK_ENTRY (pos->chat_entry));
+  GNUNET_CHAT_send_message (pos->room,
+                            message, GNUNET_CHAT_MSG_OPTION_NONE, NULL, &seq);
+  gtk_entry_set_text (GTK_ENTRY (pos->chat_entry), "");
+  GNUNET_mutex_unlock (lock);
 }
 
 /** FIXME: move to gtkcommon! */
@@ -275,44 +258,44 @@ extractMainWidgetFromWindow (GladeXML * xml, const char *windowName)
 }
 
 static void
-create_chat_room_tab (const char *room_name, 
-                      const char *nick)
+create_chat_room_tab (const char *room_name, const char *nick)
 {
   GtkWidget *chatLabel;
   GtkWidget *chatnotebook;
   GtkTreeView *treeview;
   struct GNUNET_CHAT_gui_chat_client *client;
-  struct GNUNET_ECRS_MetaData * meta;
+  struct GNUNET_ECRS_MetaData *meta;
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   int col;
- 
+
   chatnotebook =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "chatnotebook");
 
   client = GNUNET_malloc (sizeof (struct GNUNET_CHAT_gui_chat_client));
   client->chatXML =
     glade_xml_new (GNUNET_GTK_get_glade_filename (),
-                   "chatFrame",
-                   PACKAGE_NAME);
+                   "chatFrame", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (client->chatXML);
   client->chatFrame = extractMainWidgetFromWindow (client->chatXML,
-                                                   "chatFrame");
+                                                   "chatFrame");
   chatLabel = gtk_label_new (room_name);
-  gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook), 
-                            client->chatFrame,
-                            chatLabel);
+  gtk_notebook_append_page (GTK_NOTEBOOK (chatnotebook),
+                            client->chatFrame, chatLabel);
   gtk_widget_show (chatnotebook);
 
-  client->nick_model = gtk_list_store_new (CHAT_NUM,
-                                           G_TYPE_STRING,       /* nickname */
-                                           G_TYPE_POINTER,      /* metadata */
-                                           GDK_TYPE_PIXBUF,     /* icon */
-                                           G_TYPE_POINTER);      /* pid */
-  client->send_button = glade_xml_get_widget (client->chatXML, "chatSendButton");
+  client->nick_model = gtk_list_store_new (CHAT_NUM, G_TYPE_STRING,     /* nickname */
+                                           G_TYPE_POINTER,      /* metadata */
+                                           GDK_TYPE_PIXBUF,     /* icon */
+                                           G_TYPE_POINTER);     /* pid */
+  client->send_button =
+    glade_xml_get_widget (client->chatXML, "chatSendButton");
   client->text_view = glade_xml_get_widget (client->chatXML, "chatLogViewer");
-  client->chat_entry = glade_xml_get_widget (client->chatXML, "chatLineTextEntry");
-  treeview = GTK_TREE_VIEW(glade_xml_get_widget (client->chatXML, "roomMembersTreeView"));
+  client->chat_entry =
+    glade_xml_get_widget (client->chatXML, "chatLineTextEntry");
+  treeview =
+    GTK_TREE_VIEW (glade_xml_get_widget
+                   (client->chatXML, "roomMembersTreeView"));
   gtk_tree_view_set_model (treeview, GTK_TREE_MODEL (client->nick_model));
 
   renderer = gtk_cell_renderer_text_new ();
@@ -328,7 +311,7 @@ create_chat_room_tab (const char *room_name,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, CHAT_NICKNAME);
   gtk_tree_view_column_set_min_width (column, 0);
-  
+
   renderer = gtk_cell_renderer_pixbuf_new ();
   col = gtk_tree_view_insert_column_with_attributes (treeview,
                                                      -1,
@@ -341,25 +324,21 @@ create_chat_room_tab (const char *room_name,
   gtk_tree_view_column_set_clickable (column, FALSE);
   gtk_tree_view_column_set_reorderable (column, FALSE);
 
-  GNUNET_mutex_lock(lock);
+  GNUNET_mutex_lock (lock);
   client->next = list;
   list = client;
-  GNUNET_mutex_unlock(lock);
+  GNUNET_mutex_unlock (lock);
 
-  meta = GNUNET_ECRS_meta_data_create();
-  GNUNET_ECRS_meta_data_insert(meta,
-                               EXTRACTOR_TITLE,
-                               nick);
+  meta = GNUNET_ECRS_meta_data_create ();
+  GNUNET_ECRS_meta_data_insert (meta, EXTRACTOR_TITLE, nick);
   client->room =
     GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick,
-                           meta,
-                           room_name,
-                           -1, 
+                           meta,
+                           room_name,
+                           -1,
                            &receive_callback, client, &member_list_callback,
-                           client,
-                           NULL, NULL,
-                           &client->mypid);
-  GNUNET_ECRS_meta_data_destroy(meta);
+                           client, NULL, NULL, &client->mypid);
+  GNUNET_ECRS_meta_data_destroy (meta);
 }
 
 void