diff src/gtknotify.c @ 8962:4ff4c34b7500

[gaim-migrate @ 9736] IM Image, WYSIWYG. It's still somewhat buggy, although the worse problems are with oscar's direct connect. We could always yank oscar's im image flag if we think it will cause too many bug reports. I made the GaimImgstore struct opque. I modified oscar's sending function to parse im images better, and everything seems to work. I made it write some errors to the conversation if you try to send an image and you aren't direct connected. That's just a hack until you can set formatting flags on a per conversation bases. There's a scrolling bug I haven't tracked down. I think it may exist normally and this just causes it better. It's worth noting jabber also uses this for pics in profiles, although I never did find a test case. Hopefully some other stuff can use this soon too, maybe Yahoo! pics in profiles or something. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Mon, 17 May 2004 06:47:20 +0000
parents f041cc8d86cf
children 230cf4032e3d
line wrap: on
line diff
--- a/src/gtknotify.c	Mon May 17 04:39:14 2004 +0000
+++ b/src/gtknotify.c	Mon May 17 06:47:20 2004 +0000
@@ -303,7 +303,6 @@
 	GtkWidget *button;
 	GtkWidget *imhtml;
 	GtkWidget *sw;
-	GSList *images = NULL;
 	int options = 0;
 	char label_text[2048];
 	char *linked_text;
@@ -376,29 +375,12 @@
 	options ^= GTK_IMHTML_NO_NEWLINE;
 	options ^= GTK_IMHTML_NO_SCROLL;
 
-	gaim_gtk_find_images(text, &images);
-
 	/* Make sure URLs are clickable */
 	linked_text = gaim_markup_linkify(text);
-	gtk_imhtml_append_text_with_images(GTK_IMHTML(imhtml), linked_text,
-									   options, images);
+	gtk_imhtml_append_text(GTK_IMHTML(imhtml), linked_text,
+									   options);
 	g_free(linked_text);
 
-	if (images)
-	{
-		GSList *tmp;
-
-		for (tmp = images; tmp; tmp = tmp->next)
-		{
-			GdkPixbuf *pixbuf = tmp->data;
-
-			if (pixbuf != NULL)
-				g_object_unref(pixbuf);
-		}
-
-		g_slist_free(images);
-	}
-
 	/* Show the window */
 	gtk_widget_show(window);