comparison src/protocols/msn/msn.c @ 7322:ab828b8c3f22

[gaim-migrate @ 7908] all sorts of stuff including tweaks to logging so it mostly works again for jabber. committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 24 Oct 2003 05:46:01 +0000
parents ff9127038a5a
children 603a58cd23dc
comparison
equal deleted inserted replaced
7321:c41e522028f2 7322:ab828b8c3f22
34 34
35 #define BUDDY_ALIAS_MAXLEN 388 35 #define BUDDY_ALIAS_MAXLEN 388
36 36
37 static GaimPlugin *my_protocol = NULL; 37 static GaimPlugin *my_protocol = NULL;
38 38
39 static const char *msn_normalize(const char *str); 39 static const char *msn_normalize(const GaimAccount *account, const char *str);
40 40
41 typedef struct 41 typedef struct
42 { 42 {
43 GaimConnection *gc; 43 GaimConnection *gc;
44 const char *passport; 44 const char *passport;
479 gc->proto_data = session; 479 gc->proto_data = session;
480 480
481 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS); 481 gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS);
482 482
483 /* Hmm, I don't like this. */ 483 /* Hmm, I don't like this. */
484 username = msn_normalize(gaim_account_get_username(account)); 484 username = msn_normalize(account, gaim_account_get_username(account));
485 485
486 if (strcmp(username, gaim_account_get_username(account))) 486 if (strcmp(username, gaim_account_get_username(account)))
487 gaim_account_set_username(account, username); 487 gaim_account_set_username(account, username);
488 488
489 if (!msn_session_connect(session)) { 489 if (!msn_session_connect(session)) {
672 MsnGroup *msn_group = NULL; 672 MsnGroup *msn_group = NULL;
673 const char *who; 673 const char *who;
674 char outparams[MSN_BUF_LEN]; 674 char outparams[MSN_BUF_LEN];
675 GSList *l; 675 GSList *l;
676 676
677 who = msn_normalize(name); 677 who = msn_normalize(gc->account, name);
678 678
679 if (strchr(who, ' ')) { 679 if (strchr(who, ' ')) {
680 /* This is a broken blist entry. */ 680 /* This is a broken blist entry. */
681 return; 681 return;
682 } 682 }
1205 msn_switchboard_destroy(swboard); 1205 msn_switchboard_destroy(swboard);
1206 } 1206 }
1207 } 1207 }
1208 1208
1209 static const char * 1209 static const char *
1210 msn_normalize(const char *str) 1210 msn_normalize(const GaimAccount *account, const char *str)
1211 { 1211 {
1212 static char buf[BUF_LEN]; 1212 static char buf[BUF_LEN];
1213 1213
1214 g_return_val_if_fail(str != NULL, NULL); 1214 g_return_val_if_fail(str != NULL, NULL);
1215 1215