From: Mark D. <the...@us...> - 2003-09-17 13:42:43
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv15243/src Modified Files: dialogs.c Log Message: <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. Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.530 retrieving revision 1.531 diff -u -d -p -r1.530 -r1.531 --- dialogs.c 17 Sep 2003 04:42:42 -0000 1.530 +++ dialogs.c 17 Sep 2003 13:42:38 -0000 1.531 @@ -1869,15 +1869,21 @@ void g_show_info_text(GaimConnection *gc options ^= GTK_IMHTML_NO_NEWLINE; options ^= GTK_IMHTML_NO_SCROLL; - linkifyinated = linkify_text(info); - gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); - g_free(linkifyinated); + if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) { + linkifyinated = linkify_text(info); + gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); + g_free(linkifyinated); + } else + gtk_imhtml_append_text(GTK_IMHTML(b->text), info, -1, options); va_start(ap, info); while ((more_info = va_arg(ap, char *)) != NULL) { - gchar *linkifyinated = linkify_text(more_info); - gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); - g_free(linkifyinated); + if (gaim_prefs_get_bool("/gaim/gtk/conversations/show_urls_as_links")) { + linkifyinated = linkify_text(more_info); + gtk_imhtml_append_text(GTK_IMHTML(b->text), linkifyinated, -1, options); + g_free(linkifyinated); + } else + gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, -1, options); } va_end(ap); |