comparison: src/server.c
src/server.c
- changeset 5539
- a13dd0ba205a
- parent 5498
- 01eec144d71b
- child 5545
- a8b1a1262402
equal
deleted
inserted
replaced
| 5538:4a9c1b637f11 | 5539:a13dd0ba205a |
|---|---|
| 36 #include "multi.h" | 36 #include "multi.h" |
| 37 #include "gaim.h" | 37 #include "gaim.h" |
| 38 #include "sound.h" | 38 #include "sound.h" |
| 39 #include "pounce.h" | 39 #include "pounce.h" |
| 40 #include "notify.h" | 40 #include "notify.h" |
| 41 #include "prefs.h" | |
| 41 | 42 |
| 42 void serv_login(struct gaim_account *account) | 43 void serv_login(struct gaim_account *account) |
| 43 { | 44 { |
| 44 GaimPlugin *p = gaim_find_prpl(account->protocol); | 45 GaimPlugin *p = gaim_find_prpl(account->protocol); |
| 45 GaimPluginProtocolInfo *prpl_info = NULL; | 46 GaimPluginProtocolInfo *prpl_info = NULL; |
| 811 | 812 |
| 812 /* | 813 /* |
| 813 * If you can't figure this out, stop reading right now. | 814 * If you can't figure this out, stop reading right now. |
| 814 * "We're not worthy! We're not worthy!" | 815 * "We're not worthy! We're not worthy!" |
| 815 */ | 816 */ |
| 816 if ((len < 0) && (convo_options & OPT_CONVO_SEND_LINKS)) { | 817 if (len < 0 && |
| 818 gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) { | |
| 819 | |
| 817 buffy = linkify_text(message); | 820 buffy = linkify_text(message); |
| 818 g_free(message); | 821 g_free(message); |
| 819 message = buffy; | 822 message = buffy; |
| 820 } | 823 } |
| 821 | 824 |
| 1367 who = angel; | 1370 who = angel; |
| 1368 message = buffy; | 1371 message = buffy; |
| 1369 | 1372 |
| 1370 | 1373 |
| 1371 | 1374 |
| 1372 if (convo_options & OPT_CONVO_SEND_LINKS) | 1375 if (gaim_prefs_get_bool("/gaim/gtk/conversations/urls_as_links")) |
| 1373 buf = linkify_text(message); | 1376 buf = linkify_text(message); |
| 1374 else | 1377 else |
| 1375 buf = g_strdup(message); | 1378 buf = g_strdup(message); |
| 1376 | 1379 |
| 1377 if (whisper) | 1380 if (whisper) |
