Mercurial > pidgin
comparison libpurple/protocols/msn/user.c @ 20399:6f986caeab59
merge of 'b4911943cba6f29cf0694dfd563cac17612236dc'
and 'c28931a50bfa21e0be81777bcd91fdeab9116d77'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 15 Apr 2007 04:29:56 +0000 |
| parents | 60bc06498746 4a099e4d0d09 |
| children | 7c0a2ef88018 |
comparison
equal
deleted
inserted
replaced
| 19843:60bc06498746 | 20399:6f986caeab59 |
|---|---|
| 220 FILE *fp; | 220 FILE *fp; |
| 221 MsnObject *msnobj = msn_user_get_object(user); | 221 MsnObject *msnobj = msn_user_get_object(user); |
| 222 | 222 |
| 223 g_return_if_fail(user != NULL); | 223 g_return_if_fail(user != NULL); |
| 224 | 224 |
| 225 if (filename == NULL || g_stat(filename, &st) == -1){ | 225 if (filename == NULL || g_stat(filename, &st) == -1) |
| 226 { | |
| 226 msn_user_set_object(user, NULL); | 227 msn_user_set_object(user, NULL); |
| 227 }else if ((fp = g_fopen(filename, "rb")) != NULL){ | 228 } |
| 229 else if ((fp = g_fopen(filename, "rb")) != NULL) | |
| 230 { | |
| 228 PurpleCipherContext *ctx; | 231 PurpleCipherContext *ctx; |
| 229 char *buf; | 232 char *buf; |
| 230 gsize len; | 233 gsize len; |
| 231 char *base64; | 234 char *base64; |
| 232 unsigned char digest[20]; | 235 unsigned char digest[20]; |
| 233 | 236 |
| 234 if (msnobj == NULL) { | 237 if (msnobj == NULL) |
| 238 { | |
| 235 msnobj = msn_object_new(); | 239 msnobj = msn_object_new(); |
| 236 msn_object_set_local(msnobj); | 240 msn_object_set_local(msnobj); |
| 237 msn_object_set_type(msnobj, MSN_OBJECT_USERTILE); | 241 msn_object_set_type(msnobj, MSN_OBJECT_USERTILE); |
| 238 msn_object_set_location(msnobj, "TFR2C2.tmp"); | 242 msn_object_set_location(msnobj, "TFR2C2.tmp"); |
| 239 msn_object_set_creator(msnobj, msn_user_get_passport(user)); | 243 msn_object_set_creator(msnobj, msn_user_get_passport(user)); |
| 281 g_free(buf); | 285 g_free(buf); |
| 282 | 286 |
| 283 base64 = purple_base64_encode(digest, sizeof(digest)); | 287 base64 = purple_base64_encode(digest, sizeof(digest)); |
| 284 msn_object_set_sha1c(msnobj, base64); | 288 msn_object_set_sha1c(msnobj, base64); |
| 285 g_free(base64); | 289 g_free(base64); |
| 286 }else{ | 290 } |
| 291 else | |
| 292 { | |
| 287 purple_debug_error("msn", "Unable to open buddy icon %s!\n", filename); | 293 purple_debug_error("msn", "Unable to open buddy icon %s!\n", filename); |
| 288 msn_user_set_object(user, NULL); | 294 msn_user_set_object(user, NULL); |
| 289 } | 295 } |
| 290 } | 296 } |
| 291 | 297 |
| 315 | 321 |
| 316 purple_debug_info("User","group id:%s,name:%s,user:%s\n",group_id,group_name,passport); | 322 purple_debug_info("User","group id:%s,name:%s,user:%s\n",group_id,group_name,passport); |
| 317 | 323 |
| 318 g = purple_find_group(group_name); | 324 g = purple_find_group(group_name); |
| 319 | 325 |
| 320 if ((id == NULL) && (g == NULL)){ | 326 if ((id == NULL) && (g == NULL)) |
| 327 { | |
| 321 g = purple_group_new(group_name); | 328 g = purple_group_new(group_name); |
| 322 purple_blist_add_group(g, NULL); | 329 purple_blist_add_group(g, NULL); |
| 323 } | 330 } |
| 324 | 331 |
| 325 b = purple_find_buddy_in_group(account, passport, g); | 332 b = purple_find_buddy_in_group(account, passport, g); |
| 326 if (b == NULL){ | 333 if (b == NULL) |
| 334 { | |
| 327 b = purple_buddy_new(account, passport, NULL); | 335 b = purple_buddy_new(account, passport, NULL); |
| 328 purple_blist_add_buddy(b, NULL, g, NULL); | 336 purple_blist_add_buddy(b, NULL, g, NULL); |
| 329 } | 337 } |
| 330 b->proto_data = user; | 338 b->proto_data = user; |
| 331 /*Update the blist Node info*/ | 339 /*Update the blist Node info*/ |