diff options
author | Christian Grothoff <christian@grothoff.org> | 2008-05-28 05:36:51 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2008-05-28 05:36:51 +0000 |
commit | 9bfd05bd7ecc0bf8fd4cb482bb0fd19508d2ab9d (patch) | |
tree | 67b85a343de4ae1bcb61e077d33ea71350f8564d | |
parent | ea3277bfbbb9a800fa844c8b6dcca23bf31b0c2e (diff) | |
download | gnunet-gtk-9bfd05bd7ecc0bf8fd4cb482bb0fd19508d2ab9d.tar.gz gnunet-gtk-9bfd05bd7ecc0bf8fd4cb482bb0fd19508d2ab9d.zip |
updating chat.c to new API
-rw-r--r-- | src/plugins/chat/chat.c | 7 | ||||
-rw-r--r-- | src/plugins/chat/chat.h | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/plugins/chat/chat.c b/src/plugins/chat/chat.c index 33245eaf..ab935b7d 100644 --- a/src/plugins/chat/chat.c +++ b/src/plugins/chat/chat.c | |||
@@ -294,15 +294,10 @@ create_chat_room_tab (char *room_name, char *nick) | |||
294 | client->room_name = GNUNET_malloc (strlen (room_name)); | 294 | client->room_name = GNUNET_malloc (strlen (room_name)); |
295 | strcpy (client->room_name, room_name); | 295 | strcpy (client->room_name, room_name); |
296 | 296 | ||
297 | client->priv_key = NULL; | ||
298 | client->priv_key = | ||
299 | GNUNET_CHAT_initPrivateKey (chat_ectx, chat_cfg, room_name, | ||
300 | &client->pub_key); | ||
301 | |||
302 | /* We do a silly strdup later on member_info... either check for NULL or only pass "" for member_info!! */ | 297 | /* We do a silly strdup later on member_info... either check for NULL or only pass "" for member_info!! */ |
303 | chatRoom = | 298 | chatRoom = |
304 | GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, | 299 | GNUNET_CHAT_join_room (chat_ectx, chat_cfg, nick, room_name, |
305 | &client->pub_key, client->priv_key, "", | 300 | "", |
306 | &receive_callback, client, &member_list_callback, | 301 | &receive_callback, client, &member_list_callback, |
307 | client); | 302 | client); |
308 | 303 | ||
diff --git a/src/plugins/chat/chat.h b/src/plugins/chat/chat.h index 1994f0c7..0b9900a0 100644 --- a/src/plugins/chat/chat.h +++ b/src/plugins/chat/chat.h | |||
@@ -45,8 +45,6 @@ struct GNUNET_CHAT_gui_chat_client | |||
45 | { | 45 | { |
46 | struct GNUNET_CHAT_gui_chat_client *next; | 46 | struct GNUNET_CHAT_gui_chat_client *next; |
47 | struct GNUNET_CHAT_gui_chat_client *prev; | 47 | struct GNUNET_CHAT_gui_chat_client *prev; |
48 | GNUNET_RSA_PublicKey pub_key; | ||
49 | const struct GNUNET_RSA_PrivateKey *priv_key; | ||
50 | int number; | 48 | int number; |
51 | GtkWidget *chatFrame; | 49 | GtkWidget *chatFrame; |
52 | struct GNUNET_CHAT_Room *room; | 50 | struct GNUNET_CHAT_Room *room; |