[GNUnet-SVN] r6561 - gnunet-gtk/src/plugins/chat

[gnunet]

Author: nevans
Date: 2008-03-12 17:32:06 -0600 (Wed, 12 Mar 2008)
New Revision: 6561

Modified:
   gnunet-gtk/src/plugins/chat/chat.c
   gnunet-gtk/src/plugins/chat/chat.h
Log:


Modified: gnunet-gtk/src/plugins/chat/chat.c
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.c  2008-03-12 19:11:59 UTC (rev 6560)
+++ gnunet-gtk/src/plugins/chat/chat.c  2008-03-12 23:32:06 UTC (rev 6561)
@@ -28,7 +28,7 @@
 
 #include "chat.h"
 
-const GNUNET_RSA_PublicKey pub_key;
+GNUNET_RSA_PublicKey pub_key;
 const struct GNUNET_RSA_PrivateKey *priv_key;
 
 static struct GNUNET_ClientServerConnection *sock;
@@ -48,7 +48,6 @@
 {
        struct GNUNET_CHAT_safe_write_struct *writeholder = arg;
        GtkTextBuffer *buffer;
-       char *char_buf;
        char *message_buf;
        int message_buf_size;
        
@@ -58,7 +57,7 @@
        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;
+       return NULL;
 }
 
 /**
@@ -84,14 +83,13 @@
                   GNUNET_CronTime timestamp, GNUNET_CHAT_MSG_OPTIONS options)
 {
        struct GNUNET_CHAT_gui_chat_client *client = cls;
-  GtkWidget *chatvbox;
   GtkWidget *chattextviewer;
   
   GList *children;
   struct GNUNET_CHAT_safe_write_struct writearg;
   
-       children = gtk_container_get_children(client->chatFrame);
-       chattextviewer = 
g_list_nth_data(gtk_container_get_children(g_list_nth_data(gtk_container_get_children(GTK_VBOX(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;
@@ -216,7 +214,7 @@
        GtkEntry *chat_entry;   
        
        char *message;
-       gchar *room_name;
+       const gchar *room_name;
        struct GNUNET_CHAT_gui_chat_client *client; 
        struct GNUNET_CHAT_gui_chat_client *pos; 
                
@@ -227,7 +225,7 @@
        room_name = gtk_label_get_text(GTK_LABEL(chatlabel));
        
        chathbox = gtk_widget_get_ancestor (widget,GTK_TYPE_HBOX);
-       children = gtk_container_get_children (chathbox);
+       children = gtk_container_get_children (GTK_CONTAINER(chathbox));
        
        chat_entry=NULL;
        while(children != NULL)

Modified: gnunet-gtk/src/plugins/chat/chat.h
===================================================================
--- gnunet-gtk/src/plugins/chat/chat.h  2008-03-12 19:11:59 UTC (rev 6560)
+++ gnunet-gtk/src/plugins/chat/chat.h  2008-03-12 23:32:06 UTC (rev 6561)
@@ -57,8 +57,8 @@
 struct GNUNET_CHAT_safe_write_struct
 {
        GtkWidget *chatWindow;
-       char *message;
-       char *senderNick;
+       const char *message;
+       const char *senderNick;
 };