Mercurial > pidgin

comparison src/protocols/yahoo/yahoo.c @ 4730:9d3b7b106def

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5043] Fixed a pair of bugs. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Wed, 12 Mar 2003 23:19:39 +0000
parents 751c37a940dd
children 6f0ecc21db46
comparison
equal deleted inserted replaced
4729:751c37a940dd 4730:9d3b7b106def
1041 return _("Out To Lunch"); 1041 return _("Out To Lunch");
1042 case YAHOO_STATUS_STEPPEDOUT: 1042 case YAHOO_STATUS_STEPPEDOUT:
1043 return _("Stepped Out"); 1043 return _("Stepped Out");
1044 case YAHOO_STATUS_INVISIBLE: 1044 case YAHOO_STATUS_INVISIBLE:
1045 return _("Invisible"); 1045 return _("Invisible");
1046 case YAHOO_STATUS_IDLE:
1047 return _("Idle");
1046 default: 1048 default:
1047 return _("Online"); 1049 return _("Online");
1048 } 1050 }
1049 } 1051 }
1050 1052
1066 } 1068 }
1067 1069
1068 static const char *yahoo_status_text(struct buddy *b) 1070 static const char *yahoo_status_text(struct buddy *b)
1069 { 1071 {
1070 struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data; 1072 struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
1071 if (b->uc & UC_UNAVAILABLE && b->uc >> 2 != YAHOO_STATUS_IDLE) { 1073 if (b->uc & UC_UNAVAILABLE) {
1072 if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) 1074 if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM)
1073 return yahoo_get_status_string(b->uc >> 2); 1075 return yahoo_get_status_string(b->uc >> 2);
1074 else 1076 else
1075 return g_hash_table_lookup(yd->hash, b->name); 1077 return g_hash_table_lookup(yd->hash, b->name);
1076 } 1078 }
1077 return NULL; 1079 return NULL;
1078 } 1080 }
1079 1081
1080 static char *yahoo_tooltip_text(struct buddy *b) 1082 static char *yahoo_tooltip_text(struct buddy *b)
1081 { 1083 {
1082 struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data; 1084 struct yahoo_data *yd = (struct yahoo_data*)b->account->gc->proto_data;
1083 if (b->uc & UC_UNAVAILABLE && b->uc >> 2 != YAHOO_STATUS_IDLE) { 1085 if (b->uc & UC_UNAVAILABLE) {
1084 if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM) 1086 if ((b->uc >> 2) != YAHOO_STATUS_CUSTOM)
1085 return g_strdup(yahoo_get_status_string(b->uc >> 2)); 1087 return g_strdup(yahoo_get_status_string(b->uc >> 2));
1086 else 1088 else
1087 return g_strdup(g_hash_table_lookup(yd->hash, b->name)); 1089 return g_strdup(g_hash_table_lookup(yd->hash, b->name));
1088 } 1090 <<<<<<< yahoo.c
1091 }
1089 return NULL; 1092 return NULL;
1090 } 1093 }
1091 1094
1095 =======
1096 }
1097 return NULL;
1098 }
1099
1100 >>>>>>> 1.76
1092 static GList *yahoo_buddy_menu(struct gaim_connection *gc, char *who) 1101 static GList *yahoo_buddy_menu(struct gaim_connection *gc, char *who)
1093 { 1102 {
1094 GList *m = NULL; 1103 GList *m = NULL;
1095 struct proto_buddy_menu *pbm; 1104 struct proto_buddy_menu *pbm;
1096 struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data; 1105 struct yahoo_data *yd = (struct yahoo_data *)gc->proto_data;