Changeset e248c7f


Ignore:
Timestamp:
2009-10-12T22:23:49Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4524f66
Parents:
dd0d57b1
Message:

Automatically try prpl-$proto if $proto doesn't exist, and disable native
protocol modules if purple is enabled; they don't go together very well.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • configure

    rdd0d57b1 re248c7f  
    450450protoobjs=''
    451451
    452 if [ "$msn" = 0 ]; then
    453         echo '#undef WITH_MSN' >> config.h
    454 else
    455         echo '#define WITH_MSN' >> config.h
    456         protocols=$protocols'msn '
    457         protoobjs=$protoobjs'msn_mod.o '
    458 fi
    459 
    460 if [ "$jabber" = 0 ]; then
    461         echo '#undef WITH_JABBER' >> config.h
    462 else
    463         echo '#define WITH_JABBER' >> config.h
    464         protocols=$protocols'jabber '
    465         protoobjs=$protoobjs'jabber_mod.o '
    466 fi
    467 
    468 if [ "$oscar" = 0 ]; then
    469         echo '#undef WITH_OSCAR' >> config.h
    470 else
    471         echo '#define WITH_OSCAR' >> config.h
    472         protocols=$protocols'oscar '
    473         protoobjs=$protoobjs'oscar_mod.o '
    474 fi
    475 
    476 if [ "$yahoo" = 0 ]; then
    477         echo '#undef WITH_YAHOO' >> config.h
    478 else
    479         echo '#define WITH_YAHOO' >> config.h
    480         protocols=$protocols'yahoo '
    481         protoobjs=$protoobjs'yahoo_mod.o '
    482 fi
    483 
    484452if [ "$purple" = 0 ]; then
    485453        echo '#undef WITH_PURPLE' >> config.h
     
    489457        protocols=$protocols'purple '
    490458        protoobjs=$protoobjs'purple_mod.o '
     459
     460        # Having both libpurple and native IM modules in one binary may
     461        # do strange things. Let's not do that.
     462        msn=0
     463        jabber=0
     464        oscar=0
     465        yahoo=0
     466fi
     467
     468if [ "$msn" = 0 ]; then
     469        echo '#undef WITH_MSN' >> config.h
     470else
     471        echo '#define WITH_MSN' >> config.h
     472        protocols=$protocols'msn '
     473        protoobjs=$protoobjs'msn_mod.o '
     474fi
     475
     476if [ "$jabber" = 0 ]; then
     477        echo '#undef WITH_JABBER' >> config.h
     478else
     479        echo '#define WITH_JABBER' >> config.h
     480        protocols=$protocols'jabber '
     481        protoobjs=$protoobjs'jabber_mod.o '
     482fi
     483
     484if [ "$oscar" = 0 ]; then
     485        echo '#undef WITH_OSCAR' >> config.h
     486else
     487        echo '#define WITH_OSCAR' >> config.h
     488        protocols=$protocols'oscar '
     489        protoobjs=$protoobjs'oscar_mod.o '
     490fi
     491
     492if [ "$yahoo" = 0 ]; then
     493        echo '#undef WITH_YAHOO' >> config.h
     494else
     495        echo '#define WITH_YAHOO' >> config.h
     496        protocols=$protocols'yahoo '
     497        protoobjs=$protoobjs'yahoo_mod.o '
    491498fi
    492499
  • protocols/nogaim.c

    rdd0d57b1 re248c7f  
    102102{
    103103        GList *gl;
    104         for (gl = protocols; gl; gl = gl->next)
     104       
     105        for( gl = protocols; gl; gl = gl->next )
    105106        {
    106107                struct prpl *proto = gl->data;
    107                 if(!g_strcasecmp(proto->name, name))
     108               
     109                if( g_strcasecmp( proto->name, name ) == 0 )
    108110                        return proto;
     111
     112#ifdef WITH_PURPLE
     113                /* I know, hardcoding is evil, but that doesn't make it
     114                   impossible. :-) */
     115                if( g_strncasecmp( proto->name, "prpl-", 5 ) == 0 &&
     116                    g_strcasecmp( proto->name + 5, name ) == 0 )
     117                        return proto;
     118#endif
    109119        }
     120       
    110121        return NULL;
    111122}
Note: See TracChangeset for help on using the changeset viewer.