[GNUnet-SVN] r6751 - in gnunet-gtk/src: common core plugins/chat plugins/fs plugins/stats

[gnunet]

Author: grothoff
Date: 2008-04-24 00:10:16 -0600 (Thu, 24 Apr 2008)
New Revision: 6751

Modified:
   gnunet-gtk/src/common/helper.c
   gnunet-gtk/src/core/eggtrayicon.c
   gnunet-gtk/src/plugins/chat/chat.c
   gnunet-gtk/src/plugins/chat/chat.h
   gnunet-gtk/src/plugins/fs/meta.c
   gnunet-gtk/src/plugins/stats/functions.c
Log:
formatting

Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c      2008-04-24 06:10:06 UTC (rev 6750)
+++ gnunet-gtk/src/common/helper.c      2008-04-24 06:10:16 UTC (rev 6751)
@@ -186,7 +186,8 @@
 /**
  * Simple accessor method.
  */
-GtkIconFactory *GNUNET_GTK_get_iconFactory ()
+GtkIconFactory *
+GNUNET_GTK_get_iconFactory ()
 {
   return iconFactory;
 }
@@ -367,7 +368,7 @@
                                  GNUNET_GE_FATAL | GNUNET_GE_USER |
                                  GNUNET_GE_IMMEDIATE, "glade_xml_new",
                                  gladeFile);
-  iconFactory = gtk_icon_factory_new();
+  iconFactory = gtk_icon_factory_new ();
   gtk_icon_factory_add_default (iconFactory);
 #if GTK_CHECK_VERSION (2,10,0)
   trayIcon = gtk_status_icon_new ();

Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c   2008-04-24 06:10:06 UTC (rev 6750)
+++ gnunet-gtk/src/core/eggtrayicon.c   2008-04-24 06:10:16 UTC (rev 6751)
@@ -688,7 +688,7 @@
     g_build_filename (instDir, "..", "gnunet-gtk",
                       "gnunet-gtk-status-connected.svg", NULL);
   gtk_icon_source_set_filename (iconSource, iconPath);
-  g_free (iconPath); 
+  g_free (iconPath);
   gtk_icon_set_add_source (iconSet, iconSource);
   iconPath =
     g_build_filename (instDir, "..", "gnunet-gtk",
@@ -698,9 +698,8 @@
   gtk_icon_source_set_size_wildcarded (iconSource, FALSE);
   gtk_icon_set_add_source (iconSet, iconSource);
 
-  gtk_icon_factory_add (GNUNET_GTK_get_iconFactory(),
-                        "gnunet-gtk-status-connected",
-                        iconSet);
+  gtk_icon_factory_add (GNUNET_GTK_get_iconFactory (),
+                        "gnunet-gtk-status-connected", iconSet);
   gtk_icon_set_unref (iconSet);
   gtk_icon_source_free (iconSource);
   GNUNET_free (instDir);

Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c  2008-04-24 06:10:06 UTC (rev 6750)
+++ gnunet-gtk/src/plugins/chat/chat.c  2008-04-24 06:10:16 UTC (rev 6751)
@@ -190,8 +190,7 @@
 
 static int
 member_list_callback (void *cls, const char *senderNick,
-                     int is_joining,
-                      GNUNET_CronTime timestamp)
+                      int is_joining, GNUNET_CronTime timestamp)
 {
   struct GNUNET_CHAT_gui_chat_client *client = cls;
   GtkWidget *chatnicklist;
@@ -207,7 +206,7 @@
   /* chatnicklist is the GtkTextView object */
   writearg.nick = senderNick;
   writearg.nickList = chatnicklist;
-  
+
   g_print ("received nick %s calling safe write call\n", writearg.nick);
   if (is_joining)
     GNUNET_GTK_save_call (&write_nick_save_call, &writearg);
@@ -227,9 +226,9 @@
   chat_cfg = cfg;
   room_member_list = NULL;
 
-  
+
   /*priv_key = GNUNET_RSA_create_key ();
-  GNUNET_RSA_get_public_key (priv_key, &pub_key);*/
+     GNUNET_RSA_get_public_key (priv_key, &pub_key); */
 
   sock = GNUNET_client_connection_create (chat_ectx, chat_cfg);
   lock = GNUNET_mutex_create (GNUNET_NO);
@@ -294,16 +293,19 @@
   client = GNUNET_malloc (sizeof (struct GNUNET_CHAT_gui_chat_client));
   client->room_name = GNUNET_malloc (strlen (room_name));
   strcpy (client->room_name, room_name);
-       
-       client->priv_key = NULL;
-  client->priv_key = GNUNET_CHAT_initPrivateKey 
(chat_ectx,chat_cfg,room_name,&client->pub_key);
 
+  client->priv_key = NULL;
+  client->priv_key =
+    GNUNET_CHAT_initPrivateKey (chat_ectx, chat_cfg, room_name,
+                                &client->pub_key);
+
   /* We do a silly strdup later on member_info... either check for NULL or 
only pass "" for member_info!! */
   chatRoom =
-    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, 
&client->pub_key,
-                           client->priv_key, "", &receive_callback, client,
-                           &member_list_callback, client);
-                           
+    GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name,
+                           &client->pub_key, client->priv_key, "",
+                           &receive_callback, client, &member_list_callback,
+                           client);
+
   client->room = chatRoom;
   client->chatFrame = newChatWindow;
   client->number =

Modified: gnunet-gtk/src/plugins/chat/chat.h
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.h  2008-04-24 06:10:06 UTC (rev 6750)
+++ gnunet-gtk/src/plugins/chat/chat.h  2008-04-24 06:10:16 UTC (rev 6751)
@@ -46,7 +46,7 @@
   struct GNUNET_CHAT_gui_chat_client *next;
   struct GNUNET_CHAT_gui_chat_client *prev;
   GNUNET_RSA_PublicKey pub_key;
-       const struct GNUNET_RSA_PrivateKey *priv_key;
+  const struct GNUNET_RSA_PrivateKey *priv_key;
   int number;
   GtkWidget *chatFrame;
   struct GNUNET_CHAT_Room *room;

Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c    2008-04-24 06:10:06 UTC (rev 6750)
+++ gnunet-gtk/src/plugins/fs/meta.c    2008-04-24 06:10:16 UTC (rev 6751)
@@ -398,7 +398,9 @@
         }
       while (gtk_tree_model_iter_next (keymodel, &iter));
     }
-  keywordURI = GNUNET_ECRS_keyword_command_line_to_uri (NULL, kpos, (const 
char**) keywords);
+  keywordURI =
+    GNUNET_ECRS_keyword_command_line_to_uri (NULL, kpos,
+                                             (const char **) keywords);
   while (kpos > 0)
     GNUNET_free (keywords[--kpos]);
   GNUNET_array_grow (keywords, ksize, 0);

Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c    2008-04-24 06:10:06 UTC (rev 
6750)
+++ gnunet-gtk/src/plugins/stats/functions.c    2008-04-24 06:10:16 UTC (rev 
6751)
@@ -538,9 +538,8 @@
       gtk_icon_source_set_size_wildcarded (iconSource, FALSE);
       gtk_icon_set_add_source (iconSet, iconSource);
 
-      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory(),
-                            "gnunet-gtk-status-nodaemon",
-                            iconSet);
+      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory (),
+                            "gnunet-gtk-status-nodaemon", iconSet);
       gtk_icon_set_unref (iconSet);
 
       iconSet = gtk_icon_set_new ();
@@ -557,9 +556,8 @@
       gtk_icon_source_set_size_wildcarded (iconSource, FALSE);
       gtk_icon_set_add_source (iconSet, iconSource);
 
-      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory(),
-                            "gnunet-gtk-status-disconnected",
-                            iconSet);
+      gtk_icon_factory_add (GNUNET_GTK_get_iconFactory (),
+                            "gnunet-gtk-status-disconnected", iconSet);
       gtk_icon_set_unref (iconSet);
 
 
@@ -584,8 +582,7 @@
               gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                         GTK_STOCK_DIALOG_ERROR, 1);
 #if GTK_CHECK_VERSION (2,10,0)
-              gtk_status_icon_set_tooltip (trayIcon,
-                                           _("Unknown status"));
+              gtk_status_icon_set_tooltip (trayIcon, _("Unknown status"));
               gtk_status_icon_set_from_stock (trayIcon,
                                               "gnunet-gtk-status-nodaemon");
 #endif
@@ -637,8 +634,7 @@
           gtk_image_set_from_stock (GTK_IMAGE (statusConnexionsPic),
                                     GTK_STOCK_DISCONNECT, 1);
 #if GTK_CHECK_VERSION (2,10,0)
-          gtk_status_icon_set_tooltip (trayIcon,
-                                       _("GNUnet - Disconnected"));
+          gtk_status_icon_set_tooltip (trayIcon, _("GNUnet - Disconnected"));
           gtk_status_icon_set_from_stock (trayIcon,
                                           "gnunet-gtk-status-disconnected");
 #endif
@@ -654,8 +650,7 @@
 #if GTK_CHECK_VERSION (2,10,0)
       gtk_status_icon_set_tooltip (trayIcon,
                                    _("GNUnet - Daemon not running"));
-      gtk_status_icon_set_from_stock (trayIcon,
-                                      "gnunet-gtk-status-nodaemon");
+      gtk_status_icon_set_from_stock (trayIcon, "gnunet-gtk-status-nodaemon");
 #endif
       last_status = -2;
     }