[Ayttm-commits] CVS: ayttm/src account.h,1.11,1.12 chat_room.c,1.57,1.58 chat_window.c,1.63,1.64

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv25868/src

Modified Files:
        account.h chat_room.c chat_window.c 
Log Message:
Try to prevent a segfault when remote account didn't existed
while clicking him in chatroom



Index: account.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/account.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- account.h   29 Jan 2003 19:19:22 -0000      1.11
+++ account.h   24 Mar 2003 22:42:41 -0000      1.12
@@ -58,6 +58,7 @@
        void * status_button; /* GtkWidget */
        LList * status_menu;
         void *protocol_local_account_data;
+       int mgmt_flush_tag;
 } eb_local_account;
 
 typedef struct account {

Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- chat_room.c 24 Mar 2003 10:31:35 -0000      1.57
+++ chat_room.c 24 Mar 2003 22:42:41 -0000      1.58
@@ -96,6 +96,8 @@
        } else {
                ea = RUN_SERVICE(cr->local_user)->new_account(name);
                add_unknown_account_window_new(ea);
+               return; /* as add_unknown_account_window_new isn't modal 
+                       we'll open the chat_window next time */
        }
        eb_chat_window_display_account(ea);
 }

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- chat_window.c       24 Mar 2003 10:31:35 -0000      1.63
+++ chat_window.c       24 Mar 2003 22:42:41 -0000      1.64
@@ -1328,8 +1328,15 @@
 
 void eb_chat_window_display_account(eb_account * remote_account)
 {
-       struct contact * remote_contact  = remote_account->account_contact;
-       eb_local_account * account =find_suitable_local_account(NULL, 
remote_account->service_id);
+       struct contact * remote_contact = NULL;
+       eb_local_account * account = NULL;
+       
+       if (!remote_account)
+               return;
+       
+       remote_contact = remote_account->account_contact;
+       
+       account = find_suitable_local_account(NULL, remote_account->service_id);
 
        if(!remote_contact)
                return;