Mercurial > pidgin.yaz
comparison src/server.c @ 5539:de09863bd4b5
[gaim-migrate @ 5939]
Split Show URLs as Links into Show URLs as Links and Send URLs as Links,
and converted them to the new prefs system.
Also, added a function in gtkprefs.c called prefs_checkbox(), which works
with the new prefs.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Tue, 27 May 2003 20:10:21 +0000 |
parents | cce2d7868c78 |
children | 7a64114641c3 |
comparison
equal
deleted
inserted
replaced
5538:f7dc3f656f03 | 5539:de09863bd4b5 |
---|---|
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) |