comparison src/conversation.c @ 520:fd6a3294366f

[gaim-migrate @ 530] Should fix problem with smileys causing resize to lose <BR> committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 24 Jul 2000 19:50:34 +0000
parents ee4e18868584
children 023c3851db0a
comparison
equal deleted inserted replaced
519:926ba0807a2d 520:fd6a3294366f
973 GdkPixmap *face; 973 GdkPixmap *face;
974 int state; 974 int state;
975 int y; 975 int y;
976 int i; 976 int i;
977 char *smiley = g_malloc(7); 977 char *smiley = g_malloc(7);
978 gboolean add_space = FALSE;
978 979
979 if (!who) { 980 if (!who) {
980 if (flags & WFLAG_SEND) 981 if (flags & WFLAG_SEND)
981 who = current_user->username; 982 who = current_user->username;
982 else 983 else
1066 buf2[y] = 0; 1067 buf2[y] = 0;
1067 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); 1068 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
1068 gtk_html_add_pixmap(GTK_HTML(c->text), face, 0); 1069 gtk_html_add_pixmap(GTK_HTML(c->text), face, 0);
1069 y = 0; 1070 y = 0;
1070 i += len - 1; 1071 i += len - 1;
1072 add_space = TRUE;
1071 } else { 1073 } else {
1072 buf2[y] = what[i]; 1074 buf2[y] = what[i];
1073 y++; 1075 y++;
1076 add_space = FALSE;
1074 1077
1075 } 1078 }
1076 } 1079 }
1077 1080
1078 if (y) 1081 if (y)
1079 { 1082 {
1080 buf2[y] = 0; 1083 buf2[y] = 0;
1081 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); 1084 gtk_html_append_text(GTK_HTML(c->text), buf2, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
1085 add_space = FALSE;
1082 } 1086 }
1087 if (add_space)
1088 gtk_html_append_text(GTK_HTML(c->text), " ", (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
1083 } 1089 }
1084 else 1090 else
1085 { 1091 {
1086 gtk_html_append_text(GTK_HTML(c->text), what, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0); 1092 gtk_html_append_text(GTK_HTML(c->text), what, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
1087 } 1093 }