comparison src/server.c @ 9453:28280c108cc4

[gaim-migrate @ 10277] Ok, this should make those "<foo> logged out" type messages actually say "<foo>" instead of "". I hope I did this right. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Mon, 05 Jul 2004 19:24:33 +0000
parents f1fd56e83567
children d27156c9c876
comparison
equal deleted inserted replaced
9452:0de62d92fb3b 9453:28280c108cc4
1135 int evil, time_t signon, time_t idle, int type) 1135 int evil, time_t signon, time_t idle, int type)
1136 { 1136 {
1137 GaimAccount *account; 1137 GaimAccount *account;
1138 GaimConversation *c; 1138 GaimConversation *c;
1139 GaimBuddy *b; 1139 GaimBuddy *b;
1140 char *alias;
1140 GSList *buddies; 1141 GSList *buddies;
1141 int old_idle; 1142 int old_idle;
1142 time_t current_time = time(NULL); 1143 time_t current_time = time(NULL);
1143 int signing_on = 0; 1144 int signing_on = 0;
1144 int signing_off = 0; 1145 int signing_off = 0;
1158 /* store things how THEY want it... */ 1159 /* store things how THEY want it... */
1159 if (strcmp(name, b->name)) { 1160 if (strcmp(name, b->name)) {
1160 gaim_blist_rename_buddy(b, name); 1161 gaim_blist_rename_buddy(b, name);
1161 } 1162 }
1162 1163
1164 alias = gaim_escape_html(gaim_get_buddy_alias(b));
1165
1163 old_idle = b->idle; 1166 old_idle = b->idle;
1164 1167
1165 if (loggedin) { 1168 if (loggedin) {
1166 if (!GAIM_BUDDY_IS_ONLINE(b)) { 1169 if (!GAIM_BUDDY_IS_ONLINE(b)) {
1167 signing_on = TRUE; 1170 signing_on = TRUE;
1171 } 1174 }
1172 1175
1173 1176
1174 if (signing_on) { 1177 if (signing_on) {
1175 if (c != NULL) { 1178 if (c != NULL) {
1176 char *tmp = g_strdup_printf(_("%s logged in."), 1179 char *tmp = g_strdup_printf(_("%s logged in."), alias);
1177 gaim_get_buddy_alias(b));
1178 1180
1179 gaim_conversation_write(c, NULL, tmp, GAIM_MESSAGE_SYSTEM, 1181 gaim_conversation_write(c, NULL, tmp, GAIM_MESSAGE_SYSTEM,
1180 time(NULL)); 1182 time(NULL));
1181 g_free(tmp); 1183 g_free(tmp);
1182 } 1184 }
1183 else if (awayqueue && find_queue_total_by_name(b->name)) { 1185 else if (awayqueue && find_queue_total_by_name(b->name)) {
1184 struct queued_message *qm = g_new0(struct queued_message, 1); 1186 struct queued_message *qm = g_new0(struct queued_message, 1);
1185 g_snprintf(qm->name, sizeof(qm->name), "%s", b->name); 1187 g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
1186 qm->message = g_strdup_printf(_("%s logged in."), 1188 qm->message = g_strdup_printf(_("%s logged in."), alias);
1187 gaim_get_buddy_alias(b));
1188 qm->account = gc->account; 1189 qm->account = gc->account;
1189 qm->tm = time(NULL); 1190 qm->tm = time(NULL);
1190 qm->flags = GAIM_MESSAGE_SYSTEM; 1191 qm->flags = GAIM_MESSAGE_SYSTEM;
1191 message_queue = g_slist_append(message_queue, qm); 1192 message_queue = g_slist_append(message_queue, qm);
1192 } 1193 }
1194 1195
1195 if(gaim_prefs_get_bool("/core/logging/log_system") && 1196 if(gaim_prefs_get_bool("/core/logging/log_system") &&
1196 gaim_prefs_get_bool("/core/logging/log_signon_signoff")) { 1197 gaim_prefs_get_bool("/core/logging/log_signon_signoff")) {
1197 GaimAccount *account = gaim_connection_get_account(gc); 1198 GaimAccount *account = gaim_connection_get_account(gc);
1198 GaimLog *log = gaim_account_get_log(account); 1199 GaimLog *log = gaim_account_get_log(account);
1199 char *tmp = g_strdup_printf(_("%s signed on"), 1200 char *tmp = g_strdup_printf(_("%s signed on"), alias);
1200 gaim_get_buddy_alias(b));
1201 1201
1202 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b), 1202 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
1203 current_time, tmp); 1203 current_time, tmp);
1204 g_free(tmp); 1204 g_free(tmp);
1205 } 1205 }
1210 GaimAccount *account = gaim_connection_get_account(gc); 1210 GaimAccount *account = gaim_connection_get_account(gc);
1211 GaimLog *log = gaim_account_get_log(account); 1211 GaimLog *log = gaim_account_get_log(account);
1212 char *tmp = NULL; 1212 char *tmp = NULL;
1213 1213
1214 if((b->uc & UC_UNAVAILABLE) && !(type & UC_UNAVAILABLE)) 1214 if((b->uc & UC_UNAVAILABLE) && !(type & UC_UNAVAILABLE))
1215 tmp = g_strdup_printf(_("%s came back"), gaim_get_buddy_alias(b)); 1215 tmp = g_strdup_printf(_("%s came back"), alias);
1216 else if(!(b->uc & UC_UNAVAILABLE) && (type & UC_UNAVAILABLE)) 1216 else if(!(b->uc & UC_UNAVAILABLE) && (type & UC_UNAVAILABLE))
1217 tmp = g_strdup_printf(_("%s went away"), gaim_get_buddy_alias(b)); 1217 tmp = g_strdup_printf(_("%s went away"), alias);
1218 1218
1219 if(tmp){ 1219 if(tmp){
1220 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b), 1220 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
1221 current_time, tmp); 1221 current_time, tmp);
1222 g_free(tmp); 1222 g_free(tmp);
1226 if (!old_idle && idle) { 1226 if (!old_idle && idle) {
1227 if(gaim_prefs_get_bool("/core/logging/log_system") && 1227 if(gaim_prefs_get_bool("/core/logging/log_system") &&
1228 gaim_prefs_get_bool("/core/logging/log_idle_state")) { 1228 gaim_prefs_get_bool("/core/logging/log_idle_state")) {
1229 GaimAccount *account = gaim_connection_get_account(gc); 1229 GaimAccount *account = gaim_connection_get_account(gc);
1230 GaimLog *log = gaim_account_get_log(account); 1230 GaimLog *log = gaim_account_get_log(account);
1231 char *tmp = g_strdup_printf(_("%s became idle"), 1231 char *tmp = g_strdup_printf(_("%s became idle"), alias);
1232 gaim_get_buddy_alias(b));
1233 1232
1234 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b), 1233 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
1235 current_time, tmp); 1234 current_time, tmp);
1236 g_free(tmp); 1235 g_free(tmp);
1237 } 1236 }
1238 } else if (old_idle && !idle) { 1237 } else if (old_idle && !idle) {
1239 if(gaim_prefs_get_bool("/core/logging/log_system") && 1238 if(gaim_prefs_get_bool("/core/logging/log_system") &&
1240 gaim_prefs_get_bool("/core/logging/log_idle_state")) { 1239 gaim_prefs_get_bool("/core/logging/log_idle_state")) {
1241 GaimAccount *account = gaim_connection_get_account(gc); 1240 GaimAccount *account = gaim_connection_get_account(gc);
1242 GaimLog *log = gaim_account_get_log(account); 1241 GaimLog *log = gaim_account_get_log(account);
1243 char *tmp = g_strdup_printf(_("%s became unidle"), 1242 char *tmp = g_strdup_printf(_("%s became unidle"), alias);
1244 gaim_get_buddy_alias(b));
1245 1243
1246 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b), 1244 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
1247 current_time, tmp); 1245 current_time, tmp);
1248 g_free(tmp); 1246 g_free(tmp);
1249 } 1247 }
1250 } 1248 }
1251 1249
1252 if (signing_off) { 1250 if (signing_off) {
1253 if (c != NULL) { 1251 if (c != NULL) {
1254 char *tmp = g_strdup_printf(_("%s logged out."), 1252 char *tmp = g_strdup_printf(_("%s logged out."), alias);
1255 gaim_get_buddy_alias(b));
1256 gaim_conversation_write(c, NULL, tmp, 1253 gaim_conversation_write(c, NULL, tmp,
1257 GAIM_MESSAGE_SYSTEM, time(NULL)); 1254 GAIM_MESSAGE_SYSTEM, time(NULL));
1258 g_free(tmp); 1255 g_free(tmp);
1259 } else if (awayqueue && find_queue_total_by_name(b->name)) { 1256 } else if (awayqueue && find_queue_total_by_name(b->name)) {
1260 struct queued_message *qm = g_new0(struct queued_message, 1); 1257 struct queued_message *qm = g_new0(struct queued_message, 1);
1261 g_snprintf(qm->name, sizeof(qm->name), "%s", b->name); 1258 g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
1262 qm->message = g_strdup_printf(_("%s logged out."), 1259 qm->message = g_strdup_printf(_("%s logged out."), alias);
1263 gaim_get_buddy_alias(b));
1264 qm->account = gc->account; 1260 qm->account = gc->account;
1265 qm->tm = time(NULL); 1261 qm->tm = time(NULL);
1266 qm->flags = GAIM_MESSAGE_SYSTEM; 1262 qm->flags = GAIM_MESSAGE_SYSTEM;
1267 message_queue = g_slist_append(message_queue, qm); 1263 message_queue = g_slist_append(message_queue, qm);
1268 } 1264 }
1271 1267
1272 if(gaim_prefs_get_bool("/core/logging/log_system") && 1268 if(gaim_prefs_get_bool("/core/logging/log_system") &&
1273 gaim_prefs_get_bool("/core/logging/log_signon_signoff")) { 1269 gaim_prefs_get_bool("/core/logging/log_signon_signoff")) {
1274 GaimAccount *account = gaim_connection_get_account(gc); 1270 GaimAccount *account = gaim_connection_get_account(gc);
1275 GaimLog *log = gaim_account_get_log(account); 1271 GaimLog *log = gaim_account_get_log(account);
1276 char *tmp = g_strdup_printf(_("%s signed off"), 1272 char *tmp = g_strdup_printf(_("%s signed off"), alias);
1277 gaim_get_buddy_alias(b));
1278 1273
1279 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b), 1274 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, gaim_get_buddy_alias(b),
1280 current_time, tmp); 1275 current_time, tmp);
1281 g_free(tmp); 1276 g_free(tmp);
1282 } 1277 }
1312 gaim_blist_update_buddy_presence(b, loggedin); 1307 gaim_blist_update_buddy_presence(b, loggedin);
1313 gaim_blist_update_buddy_idle(b, idle); 1308 gaim_blist_update_buddy_idle(b, idle);
1314 gaim_blist_update_buddy_evil(b, evil); 1309 gaim_blist_update_buddy_evil(b, evil);
1315 gaim_blist_update_buddy_status(b, type); 1310 gaim_blist_update_buddy_status(b, type);
1316 } 1311 }
1312 g_free(alias);
1317 } 1313 }
1318 1314
1319 1315
1320 void serv_got_eviled(GaimConnection *gc, const char *name, int lev) 1316 void serv_got_eviled(GaimConnection *gc, const char *name, int lev)
1321 { 1317 {