changeset 9166:1e51236d825e

[gaim-migrate @ 9951] This removes some stuff for im image that isn't used anymore. Basicly one of the things I did when i brought it back, was to make it so the host widget doesn't have to do any special handling for its imhtml to support <img id="###"> tags. And while this goal was achieved in 0.78, there's still code all over the place that checks flags that aren't used and iterates over lists that will always be empty. This doesn't remove all of it, but removes some of it anyway. committer: Tailor Script <[e-mail]>

--- a/src/conversation.c	Wed Jun 02 04:50:31 2004 +0000
+++ b/src/conversation.c	Wed Jun 02 05:08:49 2004 +0000
@@ -225,43 +225,21 @@
 						 gaim_conversation_get_name(conv), &sent);
 
 		if (sent != NULL && sent[0] != '\0') {
-			GaimConvImFlags imflags = 0;
 			GaimMessageFlags msgflags = GAIM_MESSAGE_SEND;
 
-			if (im->images != NULL) {
-				imflags |= GAIM_CONV_IM_IMAGES;
-				msgflags |= GAIM_MESSAGE_IMAGES;
-			}
-
 			if (gc && gc->flags & GAIM_CONNECTION_HTML) {
 				err = serv_send_im(gc, gaim_conversation_get_name(conv),
-				                   sent, imflags);
+				                   sent, 0);
 			} else {
 				gchar *tmp = gaim_unescape_html(sent);
 				err = serv_send_im(gc, gaim_conversation_get_name(conv),
-				                   tmp, imflags);
+				                   tmp, 0);
 				g_free(tmp);
 			}
 
 			if ((err > 0) && (displayed != NULL))
 				gaim_conv_im_write(im, NULL, displayed, msgflags, time(NULL));
 
-			if (im->images != NULL) {
-				GSList *tempy;
-				int image;
-
-				for (tempy = im->images;
-					 tempy != NULL;
-					 tempy = tempy->next) {
-
-					image = GPOINTER_TO_INT(tempy->data);
-					gaim_imgstore_unref(image);
-				}
-
-				g_slist_free(im->images);
-				im->images = NULL;
-			}
-
 			gaim_signal_emit(gaim_conversations_get_handle(), "sent-im-msg",
 							 gaim_conversation_get_account(conv),
 							 gaim_conversation_get_name(conv), sent);
@@ -982,22 +960,9 @@
 	conversations = g_list_remove(conversations, conv);
 
 	if (conv->type == GAIM_CONV_IM) {
-		GSList *tempy;
-		int image;
-
 		gaim_conv_im_stop_typing_timeout(conv->u.im);
 		gaim_conv_im_stop_type_again_timeout(conv->u.im);
 
-		for (tempy = conv->u.im->images;
-			 tempy != NULL;
-			 tempy = tempy->next) {
-
-			image = GPOINTER_TO_INT(tempy->data);
-			gaim_imgstore_unref(image);
-		}
-
-		g_slist_free(conv->u.im->images);
-
 		if (conv->u.im->icon != NULL)
 			gaim_buddy_icon_unref(conv->u.im->icon);
 

--- a/src/conversation.h	Wed Jun 02 04:50:31 2004 +0000
+++ b/src/conversation.h	Wed Jun 02 05:08:49 2004 +0000
@@ -115,7 +115,6 @@
 	GAIM_MESSAGE_NICK      = 0x0020, /**< Contains your nick.      */
 	GAIM_MESSAGE_NO_LOG    = 0x0040, /**< Do not log.              */
 	GAIM_MESSAGE_WHISPER   = 0x0080, /**< Whispered message.       */
-	GAIM_MESSAGE_IMAGES    = 0x0100, /**< Message contains images. */
 	GAIM_MESSAGE_ERROR     = 0x0200  /**< Error message.           */
 } GaimMessageFlags;
 
@@ -207,8 +206,6 @@
 	time_t type_again;                 /**< The type again time.         */
 	guint  type_again_timeout;         /**< The type again timer handle. */
 
-	GSList *images;                    /**< A list of images in the IM.  */
-
 	GaimBuddyIcon *icon;               /**< The buddy icon.              */
 };
 

--- a/src/server.c	Wed Jun 02 04:50:31 2004 +0000
+++ b/src/server.c	Wed Jun 02 05:08:49 2004 +0000
@@ -864,14 +864,10 @@
 	 * it's nice to pass whether or not it was an auto-response. So if it
 	 * was an auto-response, we set the appropriate flag. This is just so
 	 * prpls don't have to know about GAIM_MESSAGE_* (though some do anyway).
-	 * We also need to preserve the flag that tells the UI to look for the
-	 * associated images.
 	 */
 	msgflags = GAIM_MESSAGE_RECV;
 	if (imflags & GAIM_CONV_IM_AUTO_RESP)
 		msgflags |= GAIM_MESSAGE_AUTO_RESP;
-	if (imflags & GAIM_CONV_IM_IMAGES)
-		msgflags |= GAIM_MESSAGE_IMAGES;
 
 	/*
 	 * Alright. Two cases for how to handle this. Either we're away or