Changeset 8e9e2b7 for protocols/twitter

Timestamp:

2010-10-03T02:45:26Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

04f0c10

Parents:

88de0c9 (diff), 2af3e23 (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 mainline, which includes a huge msnp13 merge.

Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.

File:

• protocols/twitter/twitter.c (modified) (3 diffs)

protocols/twitter/twitter.c

@@ -29 +29 @@
 #include "url.h"
 
+#define twitter_msg( ic, fmt... ) \
+        do {                                                        \
+                struct twitter_data *td = ic->proto_data;           \
+                if( td->home_timeline_gc )                          \
+                        imcb_chat_log( td->home_timeline_gc, fmt ); \
+                else                                                \
+                        imcb_log( ic, fmt );                        \
+        } while( 0 );
+                
+
 /**
  * Main loop function
@@ -436 +446 @@
                 if( id )
                         twitter_status_destroy( ic, id );
+                else
+                        twitter_msg( ic, "Could not undo last action" );
                 
                 g_free( cmds );
@@ -467 +479 @@
                 if( id )
                         twitter_status_retweet( ic, id );
+                else
+                        twitter_msg( ic, "User `%s' does not exist or didn't "
+                                         "post any statuses recently", cmd[1] );
                 
                 g_free( cmds );