Changeset 22968

Timestamp:

03/22/2008 11:24:07 AM (8 months ago)

Author:

evands

Message:

Resuppress the 'Could not add buddy 1 for an unknown reason' message and handle it in all languages. Fixes #8762

Files:

• trunk/Plugins/Purple Service/SLPurpleCocoaAdapter.m (modified) (3 diffs)

trunk/Plugins/Purple Service/SLPurpleCocoaAdapter.m

@@ -658 +658 @@
-        //Suppress notification warnings we have no interest in seeing
-        if (secondaryString) {
-                /*
-                 We previously suppressed:
-                        if (([secondaryString rangeOfString:@"Could not add the buddy 1 for an unknown reason"].location != NSNotFound) ||
-                 is it still needed?
-                 */
-                if ((strcmp(secondary, _("Not supported by host")) == 0) || /* OSCAR */
-                        (strcmp(secondary, _("Not logged in")) == 0) || /* OSCAR */
@@ -670 +665 @@
-                }
-                
+                if ([secondaryString isEqualToString:
+                         [NSString stringWithFormat:[NSString stringWithUTF8String:_("Could not add the buddy %s for an unknown reason.")], "1"]]) {
+                        /* Rather random error displayed by OSCAR (since forever, as of libpurple 2.4.0) for some clients while connecting */
+                        return NULL;
+                }
+                
-                if ([secondaryString rangeOfString:@"Your contact is using Windows Live"].location != NSNotFound) {
-                         /* Yahoo without MSN support - English string from the server */
@@ -677 +678 @@
-        } else if ([primaryString rangeOfString: @"did not get sent"].location != NSNotFound) {
-                //Oscar send error
+                //This may not ever occur as of libpurple 2.4.0; I can't find the phrase 'did not get sent' in any of the code. -evands
-                NSString *targetUserName = [[[[primaryString componentsSeparatedByString:@" message to "] objectAtIndex:1] componentsSeparatedByString:@" did not get "] objectAtIndex:0];
-