[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.21,1.22

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory subversions:/tmp/cvs-serv1417/modules/yahoo2

Modified Files:
        yahoo.c 
Log Message:
service_callbacks not static any more


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- yahoo.c     23 Jan 2003 06:34:26 -0000      1.21
+++ yahoo.c     23 Jan 2003 07:46:57 -0000      1.22
@@ -2528,70 +2528,71 @@
 
 struct service_callbacks *query_callbacks()
 {
-       static struct service_callbacks sc;
+       struct service_callbacks *sc;
 
        LOG(("yahoo_query_callbacks"));
+       sc = y_new0(struct service_callbacks, 1);
 
-       sc.query_connected              = eb_yahoo_query_connected;
-       sc.login                        = eb_yahoo_login;
-       sc.logout                       = eb_yahoo_logout;
-
-       sc.send_im                      = eb_yahoo_send_im;
-       sc.send_typing                  = eb_yahoo_send_typing;
-       sc.send_cr_typing               = eb_yahoo_send_cr_typing;
-
-       sc.read_local_account_config    = eb_yahoo_read_local_account_config;
-       sc.write_local_config           = eb_yahoo_write_local_config;
-       sc.read_account_config          = eb_yahoo_read_account_config;
-
-       sc.get_states                   = eb_yahoo_get_states;
-       sc.get_current_state            = eb_yahoo_get_current_state;
-       sc.set_current_state            = eb_yahoo_set_current_state;
-       sc.check_login                  = eb_yahoo_check_login;
+       sc->query_connected             = eb_yahoo_query_connected;
+       sc->login                       = eb_yahoo_login;
+       sc->logout                      = eb_yahoo_logout;
+
+       sc->send_im                     = eb_yahoo_send_im;
+       sc->send_typing                 = eb_yahoo_send_typing;
+       sc->send_cr_typing              = eb_yahoo_send_cr_typing;
+
+       sc->read_local_account_config   = eb_yahoo_read_local_account_config;
+       sc->write_local_config          = eb_yahoo_write_local_config;
+       sc->read_account_config         = eb_yahoo_read_account_config;
+
+       sc->get_states                  = eb_yahoo_get_states;
+       sc->get_current_state           = eb_yahoo_get_current_state;
+       sc->set_current_state           = eb_yahoo_set_current_state;
+       sc->check_login                 = eb_yahoo_check_login;
        
-       sc.add_user                     = eb_yahoo_add_user;
-       sc.del_user                     = eb_yahoo_del_user;
-       sc.ignore_user                  = eb_yahoo_ignore_user;
-       sc.unignore_user                = eb_yahoo_unignore_user;
-       sc.change_group                 = eb_yahoo_change_group;
-       sc.rename_group                 = eb_yahoo_rename_group;
-       sc.del_group                    = NULL;
+       sc->add_user                    = eb_yahoo_add_user;
+       sc->del_user                    = eb_yahoo_del_user;
+       sc->ignore_user                 = eb_yahoo_ignore_user;
+       sc->unignore_user               = eb_yahoo_unignore_user;
+       sc->change_group                = eb_yahoo_change_group;
+       sc->rename_group                = eb_yahoo_rename_group;
+       sc->del_group                   = NULL;
 
-       sc.is_suitable                  = eb_yahoo_is_suitable;
-       sc.new_account                  = eb_yahoo_new_account;
+       sc->is_suitable                 = eb_yahoo_is_suitable;
+       sc->new_account                 = eb_yahoo_new_account;
 
-       sc.get_status_string            = eb_yahoo_get_status_string;
-       sc.get_status_pixmap            = eb_yahoo_get_status_pixmap;
+       sc->get_status_string           = eb_yahoo_get_status_string;
+       sc->get_status_pixmap           = eb_yahoo_get_status_pixmap;
 
-       sc.set_idle                     = eb_yahoo_set_idle;
-       sc.set_away                     = eb_yahoo_set_away;
+       sc->set_idle                    = eb_yahoo_set_idle;
+       sc->set_away                    = eb_yahoo_set_away;
 
-       sc.send_chat_room_message       = eb_yahoo_send_chat_room_message;
+       sc->send_chat_room_message      = eb_yahoo_send_chat_room_message;
 
-       sc.join_chat_room               = eb_yahoo_join_chat_room;
-       sc.leave_chat_room              = eb_yahoo_leave_chat_room;
+       sc->join_chat_room              = eb_yahoo_join_chat_room;
+       sc->leave_chat_room             = eb_yahoo_leave_chat_room;
 
-       sc.make_chat_room               = eb_yahoo_make_chat_room;
+       sc->make_chat_room              = eb_yahoo_make_chat_room;
 
-       sc.send_invite                  = eb_yahoo_send_invite;
-       sc.accept_invite                = eb_yahoo_accept_invite;
-       sc.decline_invite               = eb_yahoo_decline_invite;
+       sc->send_invite                 = eb_yahoo_send_invite;
+       sc->accept_invite               = eb_yahoo_accept_invite;
+       sc->decline_invite              = eb_yahoo_decline_invite;
 
-       sc.send_file                    = eb_yahoo_send_file;
+       sc->send_file                   = eb_yahoo_send_file;
 
-       sc.terminate_chat               = NULL;
+       sc->terminate_chat              = NULL;
 
-       sc.get_info                     = eb_yahoo_get_info;
-       sc.get_prefs                    = eb_yahoo_get_prefs;
-       sc.read_prefs_config            = eb_yahoo_read_prefs_config;
-       sc.write_prefs_config           = eb_yahoo_write_prefs_config;
+       sc->get_info                    = eb_yahoo_get_info;
+       sc->get_prefs                   = eb_yahoo_get_prefs;
+       sc->read_prefs_config           = eb_yahoo_read_prefs_config;
+       sc->write_prefs_config          = eb_yahoo_write_prefs_config;
 
-       sc.add_importers                = NULL;
+       sc->add_importers               = NULL;
 
-       sc.get_color                    = eb_yahoo_get_color;
-       sc.get_smileys                  = eb_yahoo_get_smileys;
+       sc->get_color                   = eb_yahoo_get_color;
+       sc->get_smileys                 = eb_yahoo_get_smileys;
 
-       return ≻
+       return sc;
 }
 
 static void register_callbacks()