[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r6597 - in gnunet-gtk/src: core plugins/chat plugins/fs plu
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r6597 - in gnunet-gtk/src: core plugins/chat plugins/fs plugins/stats |
|
Date: |
Sat, 22 Mar 2008 01:00:40 -0600 (MDT) |
Author: grothoff
Date: 2008-03-22 01:00:39 -0600 (Sat, 22 Mar 2008)
New Revision: 6597
Modified:
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/collection.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/namespace_create.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
gnunet-gtk/src/plugins/stats/functions.c
Log:
format
Modified: gnunet-gtk/src/core/eggtrayicon.c
===================================================================
--- gnunet-gtk/src/core/eggtrayicon.c 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/core/eggtrayicon.c 2008-03-22 07:00:39 UTC (rev 6597)
@@ -681,7 +681,8 @@
trayIcon = GNUNET_GTK_get_trayIcon ();
instDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
iconPath =
- g_strconcat (instDir, "/../gnunet-gtk/gnunet-gtk-status-nodaemon.svg",
NULL);
+ g_strconcat (instDir, "/../gnunet-gtk/gnunet-gtk-status-nodaemon.svg",
+ NULL);
GNUNET_free (instDir);
gtk_status_icon_set_from_file (trayIcon, iconPath);
g_free (iconPath);
Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/plugins/chat/chat.c 2008-03-22 07:00:39 UTC (rev 6597)
@@ -48,91 +48,98 @@
static void *
write_save_call (void *arg)
{
- struct GNUNET_CHAT_safe_write_struct *writeholder = arg;
- GtkTextBuffer *buffer;
- char *message_buf;
- int message_buf_size;
-
- buffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(writeholder->chatWindow));
- message_buf_size = snprintf(NULL,0,"<%s>
%s",writeholder->senderNick,writeholder->message);
- message_buf = GNUNET_malloc(message_buf_size + 2);
- snprintf(message_buf,message_buf_size + 2,"<%s>
%s\n",writeholder->senderNick,writeholder->message);
- gtk_text_buffer_insert_at_cursor(buffer,message_buf,message_buf_size +
1);
-
- return NULL;
+ struct GNUNET_CHAT_safe_write_struct *writeholder = arg;
+ GtkTextBuffer *buffer;
+ char *message_buf;
+ int message_buf_size;
+
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (writeholder->chatWindow));
+ message_buf_size =
+ snprintf (NULL, 0, "<%s> %s", writeholder->senderNick,
+ writeholder->message);
+ message_buf = GNUNET_malloc (message_buf_size + 2);
+ snprintf (message_buf, message_buf_size + 2, "<%s> %s\n",
+ writeholder->senderNick, writeholder->message);
+ gtk_text_buffer_insert_at_cursor (buffer, message_buf,
+ message_buf_size + 1);
+
+ return NULL;
}
/* Safe call to add a nick to the chat room view */
static void *
write_nick_save_call (void *arg)
{
- struct GNUNET_CHAT_safe_nick_write_struct *writeholder = arg;
-
- GtkTextBuffer *buffer;
- char *message_buf;
- int message_buf_size;
- struct GNUNET_CHAT_member_list *pos = room_member_list;
-
- g_print("received chat name %s\n",writeholder->nick);
- while(pos != NULL)
- {
- if (strcmp(pos->nick,writeholder->nick) == 0)
- return NULL;
- pos = pos->next;
- }
-
- g_print("adding chat name %s to the list\n",writeholder->nick);
-
- pos = GNUNET_malloc(sizeof(struct GNUNET_CHAT_member_list));
- pos->nick = GNUNET_malloc(strlen(writeholder->nick) + 1);
- strcpy(pos->nick,writeholder->nick);
- pos->next = room_member_list;
- if (room_member_list != NULL)
- room_member_list->prev = pos;
- room_member_list = pos;
- buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(writeholder->nickList));
- message_buf_size = snprintf(NULL,0,"%s",writeholder->nick);
- message_buf = GNUNET_malloc(message_buf_size + 2);
- snprintf(message_buf,message_buf_size + 2,"%s\n",writeholder->nick);
- gtk_text_buffer_insert_at_cursor(buffer,message_buf,message_buf_size +
1);
+ struct GNUNET_CHAT_safe_nick_write_struct *writeholder = arg;
- return NULL;
+ GtkTextBuffer *buffer;
+ char *message_buf;
+ int message_buf_size;
+ struct GNUNET_CHAT_member_list *pos = room_member_list;
+
+ g_print ("received chat name %s\n", writeholder->nick);
+ while (pos != NULL)
+ {
+ if (strcmp (pos->nick, writeholder->nick) == 0)
+ return NULL;
+ pos = pos->next;
+ }
+
+ g_print ("adding chat name %s to the list\n", writeholder->nick);
+
+ pos = GNUNET_malloc (sizeof (struct GNUNET_CHAT_member_list));
+ pos->nick = GNUNET_malloc (strlen (writeholder->nick) + 1);
+ strcpy (pos->nick, writeholder->nick);
+ pos->next = room_member_list;
+ if (room_member_list != NULL)
+ room_member_list->prev = pos;
+ room_member_list = pos;
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (writeholder->nickList));
+ message_buf_size = snprintf (NULL, 0, "%s", writeholder->nick);
+ message_buf = GNUNET_malloc (message_buf_size + 2);
+ snprintf (message_buf, message_buf_size + 2, "%s\n", writeholder->nick);
+ gtk_text_buffer_insert_at_cursor (buffer, message_buf,
+ message_buf_size + 1);
+
+ return NULL;
}
/* 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 *writeholder = arg;
-
- GtkTextBuffer *buffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(writeholder->nickList));
- char *message_buf;
- int message_buf_size;
- struct GNUNET_CHAT_member_list *pos = room_member_list;
-
- while(pos != NULL)
- {
- if (strcmp(pos->nick,writeholder->nick) == 0)
- {
- pos->prev->next = pos->next;
- pos->next->prev = pos->prev;
- GNUNET_free(pos);
- /*buffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(writeholder->nickList));*/
- buffer = gtk_text_buffer_new (NULL);
- return NULL;
- }
- pos = pos->next;
- }
-
- return NULL;
-
-
- message_buf_size = snprintf(NULL,0,"%s",writeholder->nick);
- message_buf = GNUNET_malloc(message_buf_size + 2);
- snprintf(message_buf,message_buf_size + 2,"%s\n",writeholder->nick);
- gtk_text_buffer_insert_at_cursor(buffer,message_buf,message_buf_size +
1);
+ struct GNUNET_CHAT_safe_nick_write_struct *writeholder = arg;
- return NULL;
+ GtkTextBuffer *buffer =
+ gtk_text_view_get_buffer (GTK_TEXT_VIEW (writeholder->nickList));
+ char *message_buf;
+ int message_buf_size;
+ struct GNUNET_CHAT_member_list *pos = room_member_list;
+
+ while (pos != NULL)
+ {
+ if (strcmp (pos->nick, writeholder->nick) == 0)
+ {
+ pos->prev->next = pos->next;
+ pos->next->prev = pos->prev;
+ GNUNET_free (pos);
+ /*buffer =
gtk_text_view_get_buffer(GTK_TEXT_VIEW(writeholder->nickList)); */
+ buffer = gtk_text_buffer_new (NULL);
+ return NULL;
+ }
+ pos = pos->next;
+ }
+
+ return NULL;
+
+
+ message_buf_size = snprintf (NULL, 0, "%s", writeholder->nick);
+ message_buf = GNUNET_malloc (message_buf_size + 2);
+ snprintf (message_buf, message_buf_size + 2, "%s\n", writeholder->nick);
+ gtk_text_buffer_insert_at_cursor (buffer, message_buf,
+ message_buf_size + 1);
+
+ return NULL;
}
/**
@@ -157,229 +164,263 @@
const char *message,
GNUNET_CronTime timestamp, GNUNET_CHAT_MSG_OPTIONS options)
{
- struct GNUNET_CHAT_gui_chat_client *client = cls;
+ struct GNUNET_CHAT_gui_chat_client *client = cls;
GtkWidget *chattextviewer;
-
+
GList *children;
struct GNUNET_CHAT_safe_write_struct writearg;
-
- children = gtk_container_get_children(GTK_CONTAINER(client->chatFrame));
- chattextviewer =
g_list_nth_data((gtk_container_get_children(GTK_CONTAINER(g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(children->data)),0)))),0);
+ children = gtk_container_get_children (GTK_CONTAINER (client->chatFrame));
+ chattextviewer =
+ g_list_nth_data ((gtk_container_get_children
+ (GTK_CONTAINER
+ (g_list_nth_data
+ (gtk_container_get_children
+ (GTK_CONTAINER (children->data)), 0)))), 0);
+
writearg.chatWindow = chattextviewer;
writearg.message = message;
writearg.senderNick = senderNick;
- GNUNET_GTK_save_call (&write_save_call, &writearg);
-
+ GNUNET_GTK_save_call (&write_save_call, &writearg);
+
/*Write the message to the appropriate room...
* Somehow G wants me to do this without knowing which room it's headed to,
but I don't see how...
* perhaps with the closure argument...*/
-
+
return GNUNET_OK;
}
static int
-member_list_callback (void *cls,const char *senderNick, GNUNET_CronTime
timestamp)
+member_list_callback (void *cls, const char *senderNick,
+ GNUNET_CronTime timestamp)
{
- struct GNUNET_CHAT_gui_chat_client *client = cls;
+ struct GNUNET_CHAT_gui_chat_client *client = cls;
GtkWidget *chatnicklist;
-
+
struct GNUNET_CHAT_safe_nick_write_struct writearg;
-
- chatnicklist =
g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(client->chatFrame)),1);
- chatnicklist =
g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(chatnicklist)),0);
-
- /* chatnicklist is the GtkTextView object */
- writearg.nick = senderNick;
- writearg.nickList = chatnicklist;
-
- g_print("received nick %s calling safe write call\n",writearg.nick);
-
- GNUNET_GTK_save_call(&write_nick_save_call,&writearg);
-
+
+ chatnicklist =
+ g_list_nth_data (gtk_container_get_children
+ (GTK_CONTAINER (client->chatFrame)), 1);
+ chatnicklist =
+ g_list_nth_data (gtk_container_get_children
+ (GTK_CONTAINER (chatnicklist)), 0);
+
+ /* chatnicklist is the GtkTextView object */
+ writearg.nick = senderNick;
+ writearg.nickList = chatnicklist;
+
+ g_print ("received nick %s calling safe write call\n", writearg.nick);
+
+ GNUNET_GTK_save_call (&write_nick_save_call, &writearg);
+
return GNUNET_OK;
}
static int
-member_remove_callback (void *cls,const char *senderNick, GNUNET_CronTime
timestamp)
+member_remove_callback (void *cls, const char *senderNick,
+ GNUNET_CronTime timestamp)
{
- struct GNUNET_CHAT_gui_chat_client *client = cls;
+ struct GNUNET_CHAT_gui_chat_client *client = cls;
GtkWidget *chatnicklist;
-
+
struct GNUNET_CHAT_safe_nick_write_struct writearg;
-
- chatnicklist =
g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(client->chatFrame)),1);
- chatnicklist =
g_list_nth_data(gtk_container_get_children(GTK_CONTAINER(chatnicklist)),0);
-
- /* chatnicklist is the GtkTextView object */
- writearg.nick = senderNick;
- writearg.nickList = chatnicklist;
-
- GNUNET_GTK_save_call(&remove_nick_save_call,&writearg);
-
+
+ chatnicklist =
+ g_list_nth_data (gtk_container_get_children
+ (GTK_CONTAINER (client->chatFrame)), 1);
+ chatnicklist =
+ g_list_nth_data (gtk_container_get_children
+ (GTK_CONTAINER (chatnicklist)), 0);
+
+ /* chatnicklist is the GtkTextView object */
+ writearg.nick = senderNick;
+ writearg.nickList = chatnicklist;
+
+ GNUNET_GTK_save_call (&remove_nick_save_call, &writearg);
+
return GNUNET_OK;
}
void
init_chat (struct GNUNET_GE_Context *ectx,
- struct GNUNET_GC_Configuration *cfg)
+ struct GNUNET_GC_Configuration *cfg)
{
GtkWidget *tab;
-
+
chat_ectx = ectx;
chat_cfg = cfg;
room_member_list = NULL;
-
- /*GNUNET_disable_entropy_gathering ();*/
- /* FIXME: yes G, read key from disk */
- priv_key = GNUNET_RSA_create_key ();
+
+ /*GNUNET_disable_entropy_gathering (); */
+ /* FIXME: yes G, read key from disk */
+ priv_key = GNUNET_RSA_create_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);
cron = GNUNET_GTK_get_cron_manager ();
-
+
tab =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"chatnotebookvbox");
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+ "chatnotebookvbox");
gtk_widget_show (tab);
}
void
-on_chat_room_name_button_click_event_chat(GtkWidget* widget, gpointer data)
+on_chat_room_name_button_click_event_chat (GtkWidget * widget, gpointer data)
{
- GtkEntry *room_entry;
- GtkEntry *nick_entry;
- char *room_text;
- char *nick_text;
-
- room_entry = GTK_ENTRY(glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (), "chatRoomNameEntry"));
- nick_entry = GTK_ENTRY(glade_xml_get_widget
(GNUNET_GTK_get_main_glade_XML (), "chatRoomMonikerEntry"));
-
- room_text = (char*)gtk_entry_get_text (room_entry);
- nick_text = (char*)gtk_entry_get_text (nick_entry);
-
- create_chat_room_tab(room_text,nick_text);
-
- gtk_entry_set_text(nick_entry,"");
- gtk_entry_set_text(room_entry,"");
+ GtkEntry *room_entry;
+ GtkEntry *nick_entry;
+ char *room_text;
+ char *nick_text;
+
+ room_entry =
+ GTK_ENTRY (glade_xml_get_widget
+ (GNUNET_GTK_get_main_glade_XML (), "chatRoomNameEntry"));
+ nick_entry =
+ GTK_ENTRY (glade_xml_get_widget
+ (GNUNET_GTK_get_main_glade_XML (), "chatRoomMonikerEntry"));
+
+ room_text = (char *) gtk_entry_get_text (room_entry);
+ nick_text = (char *) gtk_entry_get_text (nick_entry);
+
+ create_chat_room_tab (room_text, nick_text);
+
+ gtk_entry_set_text (nick_entry, "");
+ gtk_entry_set_text (room_entry, "");
}
int
-create_chat_room_tab(char *room_name,char *nick)
+create_chat_room_tab (char *room_name, char *nick)
{
- GladeXML *chatXML;
- GtkWidget *newChatWindow;
- GtkWidget *chatnotebook;
- GtkWidget *chatLabel;
- struct GNUNET_CHAT_Room *chatRoom;
- struct GNUNET_CHAT_gui_chat_client *client;
- struct GNUNET_CHAT_gui_chat_client *pos;
-
- chatnotebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
"chatnotebook");
- chatXML = glade_xml_new (GNUNET_GTK_get_glade_filename (),
"chatFrame",PACKAGE_NAME);
+ GladeXML *chatXML;
+ GtkWidget *newChatWindow;
+ GtkWidget *chatnotebook;
+ GtkWidget *chatLabel;
+ struct GNUNET_CHAT_Room *chatRoom;
+ struct GNUNET_CHAT_gui_chat_client *client;
+ struct GNUNET_CHAT_gui_chat_client *pos;
+
+ chatnotebook =
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "chatnotebook");
+ chatXML =
+ glade_xml_new (GNUNET_GTK_get_glade_filename (), "chatFrame",
+ PACKAGE_NAME);
GNUNET_GTK_connect_glade_with_plugins (chatXML);
newChatWindow = extractMainWidgetFromWindow (chatXML, "chatFrame");
- chatLabel = gtk_label_new(room_name);
- gtk_notebook_insert_page
(GTK_NOTEBOOK(chatnotebook),newChatWindow,chatLabel,1);
-
- gtk_widget_show (chatnotebook);
-
- client = GNUNET_malloc(sizeof(struct GNUNET_CHAT_gui_chat_client));
- client->room_name = GNUNET_malloc(strlen(room_name));
- strcpy(client->room_name,room_name);
-
-
- /* 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,&pub_key,priv_key,"",&receive_callback,client,&member_list_callback,client,&member_remove_callback,client);
-
- client->room = chatRoom;
- client->chatFrame = newChatWindow;
- client->number =
gtk_notebook_get_current_page(GTK_NOTEBOOK(chatnotebook));
-
- if (list == NULL)
- list = client;
- else
- {
- pos = list;
- while(pos->next != NULL)
- {
- pos = pos->next;
- }
- pos->next = client;
- }
-
- return GNUNET_OK;
+ chatLabel = gtk_label_new (room_name);
+ gtk_notebook_insert_page (GTK_NOTEBOOK (chatnotebook), newChatWindow,
+ chatLabel, 1);
+
+ gtk_widget_show (chatnotebook);
+
+ client = GNUNET_malloc (sizeof (struct GNUNET_CHAT_gui_chat_client));
+ client->room_name = GNUNET_malloc (strlen (room_name));
+ strcpy (client->room_name, room_name);
+
+
+ /* 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, &pub_key,
+ priv_key, "", &receive_callback, client,
+ &member_list_callback, client,
+ &member_remove_callback, client);
+
+ client->room = chatRoom;
+ client->chatFrame = newChatWindow;
+ client->number =
+ gtk_notebook_get_current_page (GTK_NOTEBOOK (chatnotebook));
+
+ if (list == NULL)
+ list = client;
+ else
+ {
+ pos = list;
+ while (pos->next != NULL)
+ {
+ pos = pos->next;
+ }
+ pos->next = client;
+ }
+
+ return GNUNET_OK;
}
int
-remove_chat_room_tab(char *room_name)
+remove_chat_room_tab (char *room_name)
{
-
- return GNUNET_SYSERR;
+
+ return GNUNET_SYSERR;
}
void
-on_chat_frame_send_button_click_event_chat(GtkWidget* widget, gpointer data)
+on_chat_frame_send_button_click_event_chat (GtkWidget * widget, gpointer data)
{
- GtkWidget *chatnotebook;
- GtkWidget *chathbox;
- GtkWidget *chatlabel;
- GtkWidget *curr_page;
- GList *children;
- GtkEntry *chat_entry;
-
- char *message;
- const gchar *room_name;
- struct GNUNET_CHAT_gui_chat_client *client;
- struct GNUNET_CHAT_gui_chat_client *pos;
-
- chatnotebook = gtk_widget_get_ancestor (widget,GTK_TYPE_NOTEBOOK);
- curr_page =
gtk_notebook_get_nth_page(GTK_NOTEBOOK(chatnotebook),gtk_notebook_get_current_page(GTK_NOTEBOOK(chatnotebook)));
- chatlabel = gtk_notebook_get_tab_label
(GTK_NOTEBOOK(chatnotebook),curr_page);
-
- room_name = gtk_label_get_text(GTK_LABEL(chatlabel));
-
- chathbox = gtk_widget_get_ancestor (widget,GTK_TYPE_HBOX);
- children = gtk_container_get_children (GTK_CONTAINER(chathbox));
-
- chat_entry=NULL;
- while(children != NULL)
- {
-
if(strcmp(gtk_widget_get_name(children->data),"chatLineTextEntry") == 0)
- {
- chat_entry = GTK_ENTRY(children->data);
- }
- children = children->next;
- }
-
- message = (char *)gtk_entry_get_text (chat_entry);
-
- /* Almost there... need to find room in linked list (provided it
exists!)
- * before sending out the message...
- */
+ GtkWidget *chatnotebook;
+ GtkWidget *chathbox;
+ GtkWidget *chatlabel;
+ GtkWidget *curr_page;
+ GList *children;
+ GtkEntry *chat_entry;
+
+ char *message;
+ const gchar *room_name;
+ struct GNUNET_CHAT_gui_chat_client *client;
+ struct GNUNET_CHAT_gui_chat_client *pos;
+
+ chatnotebook = gtk_widget_get_ancestor (widget, GTK_TYPE_NOTEBOOK);
+ curr_page =
+ gtk_notebook_get_nth_page (GTK_NOTEBOOK (chatnotebook),
+ gtk_notebook_get_current_page (GTK_NOTEBOOK
+ (chatnotebook)));
+ chatlabel =
+ gtk_notebook_get_tab_label (GTK_NOTEBOOK (chatnotebook), curr_page);
+
+ room_name = gtk_label_get_text (GTK_LABEL (chatlabel));
+
+ chathbox = gtk_widget_get_ancestor (widget, GTK_TYPE_HBOX);
+ children = gtk_container_get_children (GTK_CONTAINER (chathbox));
+
+ chat_entry = NULL;
+ while (children != NULL)
+ {
+ if (strcmp (gtk_widget_get_name (children->data), "chatLineTextEntry")
+ == 0)
+ {
+ chat_entry = GTK_ENTRY (children->data);
+ }
+ children = children->next;
+ }
+
+ message = (char *) gtk_entry_get_text (chat_entry);
+
+ /* Almost there... need to find room in linked list (provided it exists!)
+ * before sending out the message...
+ */
if (list == NULL)
- return;
- else
- {
- pos = list;
- while((pos!=NULL)&&(strcmp(pos->room_name,room_name) != 0))
- {
- pos = pos->next;
- }
- }
- if(pos != NULL)
- client = pos;
- else
- return;
-
- GNUNET_CHAT_send_message (client->room,message,NULL,
- NULL,GNUNET_CHAT_MSG_OPTION_NONE,NULL);
+ return;
+ else
+ {
+ pos = list;
+ while ((pos != NULL) && (strcmp (pos->room_name, room_name) != 0))
+ {
+ pos = pos->next;
+ }
+ }
+ if (pos != NULL)
+ client = pos;
+ else
+ return;
- gtk_entry_set_text(chat_entry,"");
-
+ GNUNET_CHAT_send_message (client->room, message, NULL,
+ NULL, GNUNET_CHAT_MSG_OPTION_NONE, NULL);
+
+ gtk_entry_set_text (chat_entry, "");
+
}
/* end of chat.c */
Modified: gnunet-gtk/src/plugins/chat/chat.h
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.h 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/plugins/chat/chat.h 2008-03-22 07:00:39 UTC (rev 6597)
@@ -33,52 +33,51 @@
#include "gnunetgtk_common.h"
void
-on_chat_room_name_button_click_event_chat(GtkWidget* widget, gpointer data);
+on_chat_room_name_button_click_event_chat (GtkWidget * widget, gpointer data);
-int
-create_chat_room_tab(char *room_name,char *nick);
+int create_chat_room_tab (char *room_name, char *nick);
-int
-remove_chat_room_tab(char *room_name);
-
+int remove_chat_room_tab (char *room_name);
-
+
+
struct GNUNET_CHAT_gui_chat_client
{
- struct GNUNET_CHAT_gui_chat_client *next;
- struct GNUNET_CHAT_gui_chat_client *prev;
- int number;
- GtkWidget *chatFrame;
- struct GNUNET_CHAT_Room *room;
- gchar *room_name;
-
+ struct GNUNET_CHAT_gui_chat_client *next;
+ struct GNUNET_CHAT_gui_chat_client *prev;
+ int number;
+ GtkWidget *chatFrame;
+ struct GNUNET_CHAT_Room *room;
+ gchar *room_name;
+
};
struct GNUNET_CHAT_safe_write_struct
{
- GtkWidget *chatWindow;
- const char *message;
- const char *senderNick;
+ GtkWidget *chatWindow;
+ const char *message;
+ const char *senderNick;
};
struct GNUNET_CHAT_safe_nick_write_struct
{
- GtkWidget *nickList;
- const char *nick;
+ GtkWidget *nickList;
+ const char *nick;
};
struct GNUNET_CHAT_member_list
{
- struct GNUNET_CHAT_member_list *next;
- struct GNUNET_CHAT_member_list *prev;
- char *nick;
+ struct GNUNET_CHAT_member_list *next;
+ struct GNUNET_CHAT_member_list *prev;
+ char *nick;
};
-
+
void
-on_chat_frame_send_button_click_event_chat(GtkWidget* widget, gpointer data);
-
-
-#endif /*CHAT_H_*/
+on_chat_frame_send_button_click_event_chat (GtkWidget * widget,
+ gpointer data);
+
+#endif /*CHAT_H_ */
+
/* end of chat.h */
Modified: gnunet-gtk/src/plugins/fs/collection.c
===================================================================
--- gnunet-gtk/src/plugins/fs/collection.c 2008-03-22 06:59:09 UTC (rev
6596)
+++ gnunet-gtk/src/plugins/fs/collection.c 2008-03-22 07:00:39 UTC (rev
6597)
@@ -46,7 +46,8 @@
}
void
-on_collectionMetaDataValueEntry_activate_fs (GtkWidget *
collectionMetaDataValueEntry,
+on_collectionMetaDataValueEntry_activate_fs (GtkWidget *
+ collectionMetaDataValueEntry,
gpointer dummy)
{
const char *input;
@@ -59,8 +60,8 @@
"collectionMetaDataValueEntry",
"collectionMetaDataTreeView");
}
-
+
void
createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
{
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2008-03-22 06:59:09 UTC (rev
6596)
+++ gnunet-gtk/src/plugins/fs/download.c 2008-03-22 07:00:39 UTC (rev
6597)
@@ -292,8 +292,7 @@
(GNUNET_URITRACK_DOWNLOAD_STARTED),
SEARCH_STATUS,
getStatusName
- (GNUNET_URITRACK_DOWNLOAD_STARTED),
- -1);
+ (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
break;
}
valid = gtk_tree_model_iter_next (model, &iter);
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/plugins/fs/fs.c 2008-03-22 07:00:39 UTC (rev 6597)
@@ -529,7 +529,8 @@
-1,
_("Name"),
renderer,
- "text",
DOWNLOAD_SHORTNAME,
+ "text",
+ DOWNLOAD_SHORTNAME,
NULL);
column = gtk_tree_view_get_column (downloadList, col - 1);
@@ -561,8 +562,7 @@
_("Progress"),
renderer,
"value",
- DOWNLOAD_PROGRESS,
- NULL);
+ DOWNLOAD_PROGRESS, 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);
Modified: gnunet-gtk/src/plugins/fs/namespace_create.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace_create.c 2008-03-22 06:59:09 UTC
(rev 6596)
+++ gnunet-gtk/src/plugins/fs/namespace_create.c 2008-03-22 07:00:39 UTC
(rev 6597)
@@ -79,8 +79,7 @@
void
on_namespaceKeywordEntry_activate_fs (GtkWidget *
- namespaceKeywordEntry,
- gpointer dummy)
+ namespaceKeywordEntry, gpointer dummy)
{
const char *input;
@@ -94,8 +93,7 @@
void
on_namespaceMetaDataEntry_activate_fs (GtkWidget *
- namespaceMetaDataEntry,
- gpointer dummy)
+ namespaceMetaDataEntry, gpointer dummy)
{
const char *input;
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/plugins/fs/search.c 2008-03-22 07:00:39 UTC (rev 6597)
@@ -139,8 +139,7 @@
SEARCH_CELL_BG_COLOR, getColorCode (state),
SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
- SEARCH_STATUS, getStatusName (state),
- -1);
+ SEARCH_STATUS, getStatusName (state), -1);
if (pixbuf != NULL)
g_object_unref (pixbuf);
GNUNET_free (size_h);
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2008-03-22 06:59:09 UTC (rev 6596)
+++ gnunet-gtk/src/plugins/fs/upload.c 2008-03-22 07:00:39 UTC (rev 6597)
@@ -229,7 +229,8 @@
}
void
-on_fileInformationKeywordEntry_activate_fs (GtkWidget *
fileInformationKeywordEntry,
+on_fileInformationKeywordEntry_activate_fs (GtkWidget *
+ fileInformationKeywordEntry,
gpointer dummy)
{
const char *input;
Modified: gnunet-gtk/src/plugins/stats/functions.c
===================================================================
--- gnunet-gtk/src/plugins/stats/functions.c 2008-03-22 06:59:09 UTC (rev
6596)
+++ gnunet-gtk/src/plugins/stats/functions.c 2008-03-22 07:00:39 UTC (rev
6597)
@@ -76,7 +76,8 @@
}
#if FUNCTIONS_DEBUG
GNUNET_GE_LOG (ectx,
- GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
GNUNET_GE_USER | GNUNET_GE_BULK,
+ GNUNET_GE_ERROR | GNUNET_GE_DEVELOPER | GNUNET_GE_ADMIN |
+ GNUNET_GE_USER | GNUNET_GE_BULK,
"Statistic not found: `%s'\n", optName);
#endif
return GNUNET_SYSERR;
@@ -169,18 +170,19 @@
data[0][0] = 0;
data[0][1] = 0;
- if ( (GNUNET_OK == getStatValue (&allowed,
- NULL, NULL, "# bytes allowed in datastore",
- GNUNET_NO)) &&
- (allowed != 0) &&
- (GNUNET_OK == getStatValue (&have, NULL, NULL, "# bytes in datastore",
GNUNET_NO)) )
+ if ((GNUNET_OK == getStatValue (&allowed,
+ NULL, NULL, "# bytes allowed in datastore",
+ GNUNET_NO)) &&
+ (allowed != 0) &&
+ (GNUNET_OK ==
+ getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO)))
data[0][0] = ((gfloat) have) / allowed;
- if ( (GNUNET_OK == getStatValue (&allowed,
- NULL, NULL, "# max bytes allowed in dstore",
- GNUNET_NO)) &&
- (allowed != 0) &&
- (GNUNET_OK ==
- getStatValue (&have, NULL, NULL, "# bytes in dstore", GNUNET_NO)) )
+ if ((GNUNET_OK == getStatValue (&allowed,
+ NULL, NULL, "# max bytes allowed in dstore",
+ GNUNET_NO)) &&
+ (allowed != 0) &&
+ (GNUNET_OK ==
+ getStatValue (&have, NULL, NULL, "# bytes in dstore", GNUNET_NO)))
data[0][1] = ((gfloat) have) / allowed;
return GNUNET_OK;
}
@@ -383,7 +385,8 @@
return GNUNET_SYSERR;
if (GNUNET_OK != getStatValue (&awarded,
&lawarded,
- NULL, "# gap total trust awarded",
GNUNET_YES))
+ NULL, "# gap total trust awarded",
+ GNUNET_YES))
return GNUNET_SYSERR;
max = spent;
if (earned > max)
@@ -409,26 +412,24 @@
static int
getEffectivenessStats (const void *closure, gfloat ** data)
{
- unsigned long long total; /* total number of queries passed on to remote */
- unsigned long long success; /* responses forwarded (including local and
remote) */
+ unsigned long long total; /* total number of queries passed on to remote
*/
+ unsigned long long success; /* responses forwarded (including local and
remote) */
unsigned long long ltotal;
- unsigned long long lsuccess;
+ unsigned long long lsuccess;
if (GNUNET_OK != getStatValue (&total,
- <otal,
- NULL,
- "# gap requests total sent",
- GNUNET_YES))
+ <otal,
+ NULL,
+ "# gap requests total sent", GNUNET_YES))
return GNUNET_SYSERR;
if (GNUNET_OK != getStatValue (&success,
&lsuccess,
- NULL, "# gap routes succeeded",
- GNUNET_YES))
+ NULL, "# gap routes succeeded", GNUNET_YES))
return GNUNET_SYSERR;
if (total > 0)
- data[0][0] = 1.0 * success / total;
+ data[0][0] = 1.0 * success / total;
else
- data[0][0] = 0.0;
+ data[0][0] = 0.0;
return GNUNET_OK;
}
@@ -519,13 +520,16 @@
#endif
GNUNET_free (instDir);
g_free (dataDir);
- iconFile = g_strconcat (finalPath, "gnunet-gtk-status-nodaemon.svg",
NULL);
+ iconFile =
+ g_strconcat (finalPath, "gnunet-gtk-status-nodaemon.svg", NULL);
iconNoDaemon = gdk_pixbuf_new_from_file (iconFile, NULL);
g_free (iconFile);
- iconFile = g_strconcat (finalPath, "gnunet-gtk-status-disconnected.svg",
NULL);
+ iconFile =
+ g_strconcat (finalPath, "gnunet-gtk-status-disconnected.svg", NULL);
iconDisconnected = gdk_pixbuf_new_from_file (iconFile, NULL);
g_free (iconFile);
- iconFile = g_strconcat (finalPath, "gnunet-gtk-status-connected.svg",
NULL);
+ iconFile =
+ g_strconcat (finalPath, "gnunet-gtk-status-connected.svg", NULL);
iconConnected = gdk_pixbuf_new_from_file (iconFile, NULL);
g_free (iconFile);
GNUNET_free (finalPath);
@@ -708,8 +712,7 @@
,
{
gettext_noop ("Routing Effectiveness"),
- gettext_noop
- ("Average (red) effectiveness (100% = perfect)"),
+ gettext_noop ("Average (red) effectiveness (100% = perfect)"),
&getEffectivenessStats,
NULL,
1,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r6597 - in gnunet-gtk/src: core plugins/chat plugins/fs plugins/stats,
gnunet <=