im.pidgin.pidgin: 2c70b0a3d94cceda2826edc93fac5566775bab35

[jeff2 at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 2c70b0a3d94cceda2826edc93fac5566775bab35
Ancestor: 69ca65a19d58168311263e62480f7f6e05ec29c7
Author: jeff2 at soc.pidgin.im
Date: 2008-01-20T05:02:15
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/myspace/myspace.c

ChangeLog: 

a

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/myspace.c	a05b23c104a123293966b4593aaa971b5c82d7d5
+++ libpurple/protocols/myspace/myspace.c	9924e551f852257ad74722cb1b6714b650d507c0
@@ -117,7 +117,7 @@ msim_load(PurplePlugin *plugin)
 	}
 	return TRUE;
 }
-
+    
 /**
  * Get possible user status types. Based on mockprpl.
  *
@@ -552,23 +552,8 @@ msim_send_im(PurpleConnection *gc, const
 		 * return 1 even if the message could not be sent, since I don't know if
 		 * it has failed yet--because the IM is only sent after the userid is
 		 * retrieved from the server (which happens after this function returns).
+                 * If an error does occur, it should be logged to the IM window.
 		 */
-		/* TODO: maybe if message is delayed, don't echo to conv window,
-		 * but do echo it to conv window manually once it is actually
-		 * sent? Would be complicated. 
-		 *
-		 * Actually, we should instead show in the IM window if an error
-		 * occurred sending the message, but still show it. For example, in AIM
-		 * sending a message to a non-existent or offline user does this:
-		 *
-		 * (5:33:02 PM) me: hi
-		 * (5:33:02 PM) Unable to send message: Not logged in
-		 *
-		 * msimprpl currently pops up a dialog if an error occurs in user
-		 * lookup, but it should be shown in the IM window instead.
-		 *
-		 * Filed as bug #4687.
-		 */
 		rc = 1;
 	} else {
 		rc = -1;
@@ -2175,7 +2160,10 @@ msim_postprocess_outgoing_cb(MsimSession
 		gchar *msg;
 
 		msg = g_strdup_printf(_("No such user: %s"), username);
-		purple_notify_error(NULL, NULL, _("User lookup"), msg);
+                if (!purple_conv_present_error(username, session->account, msg)) { 
+                    purple_notify_error(NULL, NULL, _("User lookup"), msg); 
+                }
+
 		g_free(msg);
 		g_free(username);
 		/* TODO: free