comparison src/dialogs.c @ 6878:618124fe3289

[gaim-migrate @ 7424] <javabsp> KingAnt: Should link in info enabled only if "show URL as links" is enabled? I actually thought about that last night, but for some reason I decided against it. It's definitely better this way. In other news, is anyone else in favor of removing the preference for Message Text->Show URLs as links? I don't know when you would want that to be off. It seems unnecessary to me. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Wed, 17 Sep 2003 13:42:38 +0000
parents bb70dc397782
children 66dd420d3d23
comparison
equal deleted inserted replaced
6877:1b5b0cea6915 6878:618124fe3289
1867 options ^= GTK_IMHTML_NO_COMMENTS; 1867 options ^= GTK_IMHTML_NO_COMMENTS;
1868 options ^= GTK_IMHTML_NO_TITLE; 1868 options ^= GTK_IMHTML_NO_TITLE;
1869 options ^= GTK_IMHTML_NO_NEWLINE; 1869 options ^= GTK_IMHTML_NO_NEWLINE;
1870 options ^= GTK_IMHTML_NO_SCROLL; 1870 options ^= GTK_IMHTML_NO_SCROLL;
1871 1871
1872 linkifyinated = linkify_text(info); 1872 if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) {
1873 gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); 1873 linkifyinated = linkify_text(info);
1874 g_free(linkifyinated); 1874 gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options);
1875 g_free(linkifyinated);
1876 } else
1877 gtk_imhtml_append_text(GTK_IMHTML(b->text), info, -1, options);
1875 1878
1876 va_start(ap, info); 1879 va_start(ap, info);
1877 while ((more_info = va_arg(ap, char *)) != NULL) { 1880 while ((more_info = va_arg(ap, char *)) != NULL) {
1878 gchar *linkifyinated = linkify_text(more_info); 1881 if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) {
1879 gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); 1882 linkifyinated = linkify_text(more_info);
1880 g_free(linkifyinated); 1883 gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options);
1884 g_free(linkifyinated);
1885 } else
1886 gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, -1, options);
1881 } 1887 }
1882 va_end(ap); 1888 va_end(ap);
1883 1889
1884 if (away) 1890 if (away)
1885 info_dlgs = g_slist_remove(info_dlgs, b); 1891 info_dlgs = g_slist_remove(info_dlgs, b);