Changeset 96dd574

Timestamp:

2012-11-25T13:11:19Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

631ec80

Parents:

2cd8540

Message:

s/twitter_msg/twitter_log/ and use it in a few more places.

Location:

protocols/twitter

Files:

• twitter.c (modified) (8 diffs)
• twitter.h (modified) (3 diffs)
• twitter_lib.c (modified) (1 diff)

protocols/twitter/twitter.c

@@ -4 +4 @@
 *  Simple module to facilitate twitter functionality.                       *
 *                                                                           *
-*  Copyright 2009 Geert Mulders <g.c.w.m.mulders@gmail.com>                 *
+*  Copyright 2009-2010 Geert Mulders <g.c.w.m.mulders@gmail.com>            *
 *  Copyright 2010-2012 Wilmer van der Gaast <wilmer@gaast.net>              *
 *                                                                           *
@@ -30 +30 @@
 #include "url.h"
 
-#define twitter_msg( ic, fmt... ) \
-        do {                                            \
-                struct twitter_data *td = ic->proto_data;   \
-                if( td->timeline_gc )                       \
-                        imcb_chat_log( td->timeline_gc, fmt );  \
-                else                                        \
-                        imcb_log( ic, fmt );                    \
-        } while( 0 );
-
 GSList *twitter_connections = NULL;
-
 /**
  * Main loop function
@@ -245 +235 @@
                 return TRUE;
 
-        imcb_error(ic, "Maximum message length exceeded: %d > %d", len, max);
+        twitter_log(ic, "Maximum message length exceeded: %d > %d", len, max);
 
         return FALSE;
@@ -561 +551 @@
                         twitter_status_destroy(ic, id);
                 } else
-                        twitter_msg(ic, "Could not undo last action");
+                        twitter_log(ic, "Could not undo last action");
 
                 g_free(cmds);
@@ -570 +560 @@
                         twitter_favourite_tweet(ic, id);
                 } else {
-                        twitter_msg(ic, "Please provide a message ID or username.");
+                        twitter_log(ic, "Please provide a message ID or username.");
                 }
                 g_free(cmds);
@@ -607 +597 @@
                         twitter_status_retweet(ic, id);
                 else
-                        twitter_msg(ic, "User `%s' does not exist or didn't "
+                        twitter_log(ic, "User `%s' does not exist or didn't "
                                     "post any statuses recently", cmd[1]);
 
@@ -638 +628 @@
 
                 if (!id || !bu) {
-                        twitter_msg(ic, "User `%s' does not exist or didn't "
+                        twitter_log(ic, "User `%s' does not exist or didn't "
                                     "post any statuses recently", cmd[1]);
                         g_free(cmds);
@@ -684 +674 @@
         g_free(cmds);
 }
+
+void twitter_log(struct im_connection *ic, char *format, ... )
+{
+        struct twitter_data *td = ic->proto_data;
+        va_list params;
+        char *text;
+        
+        va_start(params, format);
+        text = g_strdup_vprintf(format, params);
+        va_end(params);
+        
+        if (td->timeline_gc)
+                imcb_chat_log(td->timeline_gc, "%s", text);
+        else
+                imcb_log(ic, "%s", text);
+        
+        g_free(text);
+}
+
 
 void twitter_initmodule()

protocols/twitter/twitter.h

@@ -4 +4 @@
 *  Simple module to facilitate twitter functionality.                       *
 *                                                                           *
-*  Copyright 2009 Geert Mulders <g.c.w.m.mulders@gmail.com>                 *
+*  Copyright 2009-2010 Geert Mulders <g.c.w.m.mulders@gmail.com>            *
+*  Copyright 2010-2012 Wilmer van der Gaast <wilmer@gaast.net>              *
 *                                                                           *
 *  This library is free software; you can redistribute it and/or            *
@@ -35 +36 @@
 typedef enum
 {
-        TWITTER_HAVE_FRIENDS = 1,
+        TWITTER_HAVE_FRIENDS   = 0x00001,
+        TWITTER_MODE_ONE       = 0x00002,
+        TWITTER_MODE_MANY      = 0x00004,
+        TWITTER_MODE_CHAT      = 0x00008,
         TWITTER_DOING_TIMELINE = 0x10000,
-        TWITTER_GOT_TIMELINE = 0x20000,
-        TWITTER_GOT_MENTIONS = 0x40000,
+        TWITTER_GOT_TIMELINE   = 0x20000,
+        TWITTER_GOT_MENTIONS   = 0x40000,
 } twitter_flags_t;
 
@@ -100 +104 @@
 char *twitter_parse_error( struct http_request *req );
 
+void twitter_log(struct im_connection *ic, char *format, ... );
+
 #endif //_TWITTER_H

protocols/twitter/twitter_lib.c

@@ -220 +220 @@
                 // It didn't go well, output the error and return.
                 if (!periodic || logging_in || ++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve %s: %s",
-                                   path, twitter_parse_error(req));
+                        twitter_log(ic, "Error: Could not retrieve %s: %s",
+                                    path, twitter_parse_error(req));
                 
                 if (logging_in)