Changeset 123cac7


Ignore:
Timestamp:
2010-04-07T19:40:39Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
91cec2f
Parents:
3e57660 (diff), 1014cab (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:

Merging Twitter support.

Files:
7 added
2 edited

Legend:

Unmodified
Added
Removed
  • configure

    r3e57660 r123cac7  
    2626oscar=1
    2727yahoo=1
     28twitter=1
    2829
    2930debug=0
     
    6667--oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
    6768--yahoo=0/1     Disable/enable Yahoo part               $yahoo
     69--twitter=0/1 Disable/enable Twitter part               $twitter
    6870
    6971--debug=0/1     Disable/enable debugging                $debug
     
    524526fi
    525527
     528if [ "$twitter" = 0 ]; then
     529        echo '#undef WITH_TWITTER' >> config.h
     530else
     531        echo '#define WITH_TWITTER' >> config.h
     532        protocols=$protocols'twitter '
     533        protoobjs=$protoobjs'twitter_mod.o '
     534fi
     535
    526536if [ "$protocols" = "PROTOCOLS = " ]; then
    527537        echo "Warning: You haven't selected any communication protocol to compile!"
  • protocols/nogaim.c

    r3e57660 r123cac7  
    133133        extern void byahoo_initmodule();
    134134        extern void jabber_initmodule();
     135        extern void twitter_initmodule();
    135136
    136137#ifdef WITH_MSN
     
    148149#ifdef WITH_JABBER
    149150        jabber_initmodule();
     151#endif
     152
     153#ifdef WITH_TWITTER
     154        twitter_initmodule();
    150155#endif
    151156
Note: See TracChangeset for help on using the changeset viewer.