diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-31 22:06:14 +0200 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-31 22:06:14 +0200 |
| commit | f5c0d8e4dd3ce01945a6334a5d87c89a9f43b16b (patch) | |
| tree | e741ed193ad1921c695a8aec4c4ea57fe82e7fd7 /protocols/oscar | |
| parent | 83586911a0aa768ed196051950ebd8ffce37d467 (diff) | |
| parent | 31dbb90a2d32d6988706ae4b5c2292cd43d89595 (diff) | |
Merge mainline stuff.
Diffstat (limited to 'protocols/oscar')
| -rw-r--r-- | protocols/oscar/Makefile | 3 | ||||
| -rw-r--r-- | protocols/oscar/oscar.c | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/protocols/oscar/Makefile b/protocols/oscar/Makefile index c1a966ad..a83830df 100644 --- a/protocols/oscar/Makefile +++ b/protocols/oscar/Makefile @@ -30,6 +30,7 @@ clean: rm -f *.o core distclean: clean + rm -rf .depend ### MAIN PROGRAM @@ -42,3 +43,5 @@ $(objects): %.o: $(SRCDIR)%.c oscar_mod.o: $(objects) @echo '*' Linking oscar_mod.o @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o + +-include .depend/*.d diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c index aba08c1f..3eea5825 100644 --- a/protocols/oscar/oscar.c +++ b/protocols/oscar/oscar.c @@ -516,6 +516,14 @@ static int gaim_parse_auth_resp(aim_session_t *sess, aim_frame_t *fr, ...) { case 0x05: /* 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; case 0x11: |