comparison: src/conversation.c
src/conversation.c
- changeset 8942
- 7419d0b874fe
- parent 8900
- 14f4b7ae958e
- child 8979
- b2e7d7b9ca4d
equal
deleted
inserted
replaced
| 8941:732cc7b7347f | 8942:7419d0b874fe |
|---|---|
| 299 } | 299 } |
| 300 else { | 300 else { |
| 301 gaim_notify_error(NULL, NULL, _("Unable to send message."), NULL); | 301 gaim_notify_error(NULL, NULL, _("Unable to send message."), NULL); |
| 302 } | 302 } |
| 303 } | 303 } |
| 304 else { | |
| 305 if (err > 0 && | |
| 306 gaim_prefs_get_bool("/core/conversations/away_back_on_send")) { | |
| 307 | |
| 308 if (awaymessage != NULL) { | |
| 309 do_im_back(NULL, NULL); | |
| 310 } | |
| 311 else if (gc->away) { | |
| 312 serv_set_away(gc, GAIM_AWAY_CUSTOM, NULL); | |
| 313 } | |
| 314 } | |
| 315 } | |
| 316 | 304 |
| 317 g_free(displayed); | 305 g_free(displayed); |
| 318 g_free(sent); | 306 g_free(sent); |
| 319 } | 307 } |
| 320 | 308 |
| 2606 * Register preferences | 2594 * Register preferences |
| 2607 **********************************************************************/ | 2595 **********************************************************************/ |
| 2608 | 2596 |
| 2609 /* Conversations */ | 2597 /* Conversations */ |
| 2610 gaim_prefs_add_none("/core/conversations"); | 2598 gaim_prefs_add_none("/core/conversations"); |
| 2611 gaim_prefs_add_bool("/core/conversations/away_back_on_send", TRUE); | |
| 2612 gaim_prefs_add_bool("/core/conversations/use_alias_for_title", TRUE); | 2599 gaim_prefs_add_bool("/core/conversations/use_alias_for_title", TRUE); |
| 2613 gaim_prefs_add_bool("/core/conversations/combine_chat_im", FALSE); | 2600 gaim_prefs_add_bool("/core/conversations/combine_chat_im", FALSE); |
| 2614 | 2601 |
| 2615 /* Conversations -> Chat */ | 2602 /* Conversations -> Chat */ |
| 2616 gaim_prefs_add_none("/core/conversations/chat"); | 2603 gaim_prefs_add_none("/core/conversations/chat"); |
