Changeset f5c0d8e for protocols/oscar

Timestamp:

2010-08-31T20:06:14Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0c85c08

Parents:

8358691 (diff), 31dbb90a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline stuff.

Location:

protocols/oscar

Files:

• Makefile (modified) (2 diffs)
• oscar.c (modified) (1 diff)

protocols/oscar/Makefile

@@ -31 +31 @@
 
 distclean: clean
+        rm -rf .depend
 
 ### MAIN PROGRAM
@@ -43 +44 @@
         @echo '*' Linking oscar_mod.o
         @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
+
+-include .depend/*.d

protocols/oscar/oscar.c

@@ -517 +517 @@
                         /* Incorrect nick/password */
                         imcb_error(ic, _("Incorrect nickname or password."));
+                        {
+                                int max = od->icq ? 8 : 16;
+                                if (strlen(ic->acc->pass) > max)
+                                        imcb_log(ic, "Note that the maximum password "
+                                                 "length supported by this protocol is "
+                                                 "%d characters, try logging in using "
+                                                 "a shorter password.", max);
+                        }
 //                      plugin_event(event_error, (void *)980, 0, 0, 0);
                         break;