[Ayttm-commits] CVS: ayttm/src chat_window.c,1.59,1.60 plugin_api.h,1.6,1.7 status.c,1.59,1.60

[Colin Leroy <address@hidden>]

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

Modified Files:
        chat_window.c plugin_api.h status.c 
Log Message:
local account in callback data


Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- chat_window.c       20 Mar 2003 10:21:38 -0000      1.59
+++ chat_window.c       20 Mar 2003 10:41:41 -0000      1.60
@@ -842,9 +842,16 @@
                        for(list = md->menu_items; list; list  = list->next ) {
                                ecd=ebmContactData_new();
                                ecd->contact=cw->contact->nick;
+                               mid=list->data;
                                if (cw->preferred)
                                        
ecd->remote_account=cw->preferred->handle;
-                               mid=list->data;
+                               if (cw->local_user)
+                                       ecd->local_account = 
cw->local_user->handle;
+                               else if (mid->protocol != NULL) {
+                                       eb_local_account *a = 
find_suitable_local_account(NULL, 
+                                                       
get_service_id(mid->protocol));
+                                       ecd->local_account = a ? 
a->handle:NULL;        
+                               }
                                mid->data=(ebmCallbackData *)ecd;
                                if (mid->protocol == NULL
                                || find_account_for_protocol(cw->contact, 
get_service_id(mid->protocol))) {

Index: plugin_api.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin_api.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin_api.h        20 Mar 2003 10:06:40 -0000      1.6
+++ plugin_api.h        20 Mar 2003 10:41:41 -0000      1.7
@@ -92,6 +92,7 @@
        ebmCallbackData cd;
        char *contact;          /* Name of the contact we're chatting with */
        char *remote_account;   /* The actual account name the contact is using 
*/
+       char *local_account;    /* The actual account we're using */
 } ebmContactData;
 
 typedef void (*eb_callback_action) (void *data, int value);

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- status.c    20 Mar 2003 10:06:40 -0000      1.59
+++ status.c    20 Mar 2003 10:41:41 -0000      1.60
@@ -404,6 +404,11 @@
                        ecd->contact=conn->nick;
                        mid=(menu_item_data *)list->data;
                        mid->data=(ebmCallbackData *)ecd;
+                       if (mid->protocol != NULL) {
+                               eb_local_account *a = 
find_suitable_local_account(NULL, 
+                                               get_service_id(mid->protocol));
+                               ecd->local_account = a ? a->handle:NULL;        
+                       }
                        
                        if (mid->protocol == NULL
                        || find_account_for_protocol(conn, 
get_service_id(mid->protocol))) {