Changeset 123cac7

Timestamp:

2010-04-07T19:40:39Z (15 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:

• configure (modified) (3 diffs)
• protocols/nogaim.c (modified) (2 diffs)
• protocols/twitter/Makefile (added)
• protocols/twitter/twitter.c (added)
• protocols/twitter/twitter.h (added)
• protocols/twitter/twitter_http.c (added)
• protocols/twitter/twitter_http.h (added)
• protocols/twitter/twitter_lib.c (added)
• protocols/twitter/twitter_lib.h (added)

configure

@@ -26 +26 @@
 oscar=1
 yahoo=1
+twitter=1
 
 debug=0
@@ -66 +67 @@
 --oscar=0/1     Disable/enable Oscar part (ICQ, AIM)    $oscar
 --yahoo=0/1     Disable/enable Yahoo part               $yahoo
+--twitter=0/1 Disable/enable Twitter part               $twitter
 
 --debug=0/1     Disable/enable debugging                $debug
@@ -524 +526 @@
 fi
 
+if [ "$twitter" = 0 ]; then
+        echo '#undef WITH_TWITTER' >> config.h
+else
+        echo '#define WITH_TWITTER' >> config.h
+        protocols=$protocols'twitter '
+        protoobjs=$protoobjs'twitter_mod.o '
+fi
+
 if [ "$protocols" = "PROTOCOLS = " ]; then
         echo "Warning: You haven't selected any communication protocol to compile!"

protocols/nogaim.c

@@ -133 +133 @@
         extern void byahoo_initmodule();
         extern void jabber_initmodule();
+        extern void twitter_initmodule();
 
 #ifdef WITH_MSN
@@ -148 +149 @@
 #ifdef WITH_JABBER
         jabber_initmodule();
+#endif
+
+#ifdef WITH_TWITTER
+        twitter_initmodule();
 #endif