Mercurial > pidgin
changeset 2162:a464da684307
[gaim-migrate @ 2172]
couple fixes. Max Horn told me about one of them.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 24 Aug 2001 01:36:05 +0000 |
| parents | 757e10018950 |
| children | f47ff201c53c |
| files | autogen.sh configure.ac src/protocols/icq/gaim_icq.c src/protocols/irc/irc.c src/protocols/jabber/jabber.c src/protocols/msn/msn.c src/protocols/napster/napster.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c src/protocols/yahoo/yay.c src/protocols/zephyr/zephyr.c src/prpl.h |
| diffstat | 12 files changed, 25 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/autogen.sh Fri Aug 24 01:10:51 2001 +0000 +++ b/autogen.sh Fri Aug 24 01:36:05 2001 +0000 @@ -40,6 +40,13 @@ echo n | gettextize --copy --force; echo "Running libtoolize, please ignore non-fatal messages...." echo n | libtoolize --copy --force; + +# we do this because autoconf defaults to installing to /usr/local +# and aclocal defaults to only looking in /usr/share/aclocal +if test -d /usr/local/share/aclocal ; then + export ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/local/share/aclocal" +fi + aclocal -I m4 $ACLOCAL_FLAGS; autoheader; automake --add-missing --copy;
--- a/configure.ac Fri Aug 24 01:10:51 2001 +0000 +++ b/configure.ac Fri Aug 24 01:36:05 2001 +0000 @@ -32,7 +32,8 @@ AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_CHECK_FUNCS(socket strdup strstr atexit getaddrinfo) -AC_TRY_COMPILE(sys/socket.h, typedef unsigned int socklen_t;, AC_DEFINE(NEED_SOCKLEN_T),) +AC_TRY_COMPILE([#include <sys/types.h> +#include <sys/socket.h>], typedef unsigned int socklen_t;, AC_DEFINE(NEED_SOCKLEN_T),) dnl Checks for getopt in standard library AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] )
--- a/src/protocols/icq/gaim_icq.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/icq/gaim_icq.c Fri Aug 24 01:36:05 2001 +0000 @@ -567,7 +567,7 @@ char *description() { - return "Allows gaim to use the ICQ protocol"; + return PRPL_DESC("ICQ"); } #endif
--- a/src/protocols/irc/irc.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/irc/irc.c Fri Aug 24 01:36:05 2001 +0000 @@ -2111,7 +2111,7 @@ char *description() { - return "Allows gaim to use the IRC protocol"; + return PRPL_DESC("IRC"); } #endif
--- a/src/protocols/jabber/jabber.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/jabber/jabber.c Fri Aug 24 01:36:05 2001 +0000 @@ -2041,7 +2041,7 @@ char *description() { - return "Allows gaim to use the Jabber protocol"; + return PRPL_DESC("Jabber"); } #endif
--- a/src/protocols/msn/msn.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/msn/msn.c Fri Aug 24 01:36:05 2001 +0000 @@ -1416,7 +1416,7 @@ char *description() { - return "Allows gaim to use the MSN protocol."; + return PRPL_DESC("MSN"); } #endif
--- a/src/protocols/napster/napster.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/napster/napster.c Fri Aug 24 01:36:05 2001 +0000 @@ -1234,7 +1234,7 @@ char *description() { - return "Allows gaim to use the Napster protocol. Yes, kids, drugs are bad."; + return PRPL_DESC("Napster"); } #endif
--- a/src/protocols/oscar/oscar.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/oscar/oscar.c Fri Aug 24 01:36:05 2001 +0000 @@ -3309,7 +3309,7 @@ char *description() { - return "Allows gaim to use the Oscar protocol."; + return PRPL_DESC("Oscar"); } #endif
--- a/src/protocols/toc/toc.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/toc/toc.c Fri Aug 24 01:36:05 2001 +0000 @@ -1276,7 +1276,7 @@ char *description() { - return "Allows gaim to use the TOC protocol."; + return PRPL_DESC("TOC"); } #endif
--- a/src/protocols/yahoo/yay.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/yahoo/yay.c Fri Aug 24 01:36:05 2001 +0000 @@ -806,7 +806,7 @@ char *description() { - return "Allows gaim to use the Yahoo protocol"; + return PRPL_DESC("Yahoo"); } #endif
--- a/src/protocols/zephyr/zephyr.c Fri Aug 24 01:10:51 2001 +0000 +++ b/src/protocols/zephyr/zephyr.c Fri Aug 24 01:36:05 2001 +0000 @@ -973,7 +973,7 @@ char *description() { - return "Allows gaim to use the Zephyr protocol"; + return PRPL_DESC("Zephyr"); } #endif
--- a/src/prpl.h Fri Aug 24 01:10:51 2001 +0000 +++ b/src/prpl.h Fri Aug 24 01:36:05 2001 +0000 @@ -39,6 +39,13 @@ /* DON'T TAKE AN UNASSIGNED NUMBER! Talk to Eric or Rob if you'd like * to create a new PRPL. */ +#define PRPL_DESC(x) "Allows gaim to use the " x " protocol.\n\n" \ + "Now that you have loaded this protocol, use the " \ + "Account Editor to add an account that uses this " \ + "protocol. You can access the Account Editor from " \ + "the \"Accounts\" button on the login window or " \ + "in the \"Tools\" menu in the buddy list window." + #define DEFAULT_PROTO PROTO_OSCAR /* These should all be stuff that some plugins can do and others can't */