Changeset eb4ad8d for protocols

Timestamp:

2015-01-17T20:13:19Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e26aa72

Parents:

1065dd4 (diff), 664bac3 (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 random other fixes/cleanups.

Location:

protocols

Files:

• bee_chat.c (modified) (3 diffs)
• jabber/jabber_util.c (modified) (2 diffs)
• msn/ns.c (modified) (1 diff)
• oscar/conn.c (modified) (1 diff)
• twitter/twitter.c (modified) (2 diffs)
• twitter/twitter_lib.c (modified) (9 diffs)
• yahoo/libyahoo2.c (modified) (5 diffs)
• yahoo/yahoo_util.h (modified) (1 diff)

protocols/bee_chat.c

@@ -85 +85 @@
         bee_t *bee = ic->bee;
         bee_user_t *bu;
+        gboolean temp;
         char *s;
         
@@ -92 +93 @@
         
         bu = bee_user_by_handle( bee, ic, who );
+        temp = ( bu == NULL );
+        
+        if( temp )
+                bu = bee_user_new( bee, ic, who, BEE_USER_ONLINE );
         
         s = set_getstr( &ic->bee->set, "strip_html" );
@@ -98 +103 @@
                 strip_html( msg );
         
-        if( bu && bee->ui->chat_msg )
+        if( bee->ui->chat_msg )
                 bee->ui->chat_msg( bee, c, bu, msg, sent_at );
-        else
-                imcb_chat_log( c, "Message from unknown participant %s: %s", who, msg );
+        
+        if( temp )
+                bee_user_free( bee, bu );
 }
 

protocols/jabber/jabber_util.c

@@ -330 +330 @@
 }
 
-/* Returns a new string. Don't leak it! */
+/* The /resource part is case sensitive. This stops once we see a slash.
+   Returns a new string. Don't leak it! */
 char *jabber_normalize( const char *orig )
 {
-        int len, i;
-        char *new;
-        
-        len = strlen( orig );
-        new = g_new( char, len + 1 );
-        
-        /* So it turns out the /resource part is case sensitive. Yeah, and
-           it's Unicode but feck Unicode. :-P So stop once we see a slash. */
-        for( i = 0; i < len && orig[i] != '/' ; i ++ )
-                new[i] = g_ascii_tolower( orig[i] );
-        for( ; orig[i]; i ++ )
-                new[i] = orig[i];
-        
-        new[i] = 0;
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '/' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( orig, (s - orig) );  /* stop in s */
+        new = g_strconcat( lower, s, NULL );
+        g_free( lower );
+        return new;
+}
+
+/* Similar to jabber_normalize, but works with addresses in the form
+ * resource=chatroom@example.com */
+char *jabber_normalize_ext( const char *orig )
+{
+        char *lower, *new, *s;
+
+        if ( ! ( s = strchr( orig, '=' ) ) )
+                return g_utf8_strdown( orig, -1 );
+
+        lower = g_utf8_strdown( s, -1 ); /* start in s */
+
+        *s = 0;
+        new = g_strconcat( orig, lower, NULL );
+        *s = '=';
+
+        g_free( lower );
         return new;
 }
@@ -556 +570 @@
         char *s, *jid;
         
-        jid = jabber_normalize( jid_ );
+        jid = jabber_normalize_ext( jid_ );
         
         if( ( s = strchr( jid, '=' ) ) == NULL )

protocols/msn/ns.c

@@ -881 +881 @@
         struct msn_buddy_data *bd = bu->data;
         struct msn_data *md = bu->ic->proto_data;
-        char handle[strlen(bu->handle)];
+        char handle[strlen(bu->handle) + 1];
         char *domain;
         char l[4];

protocols/oscar/conn.c

@@ -571 +571 @@
 
         if (FD_ISSET(conn->fd, &fds) || FD_ISSET(conn->fd, &wfds)) {
-                unsigned int len = sizeof(error);
+                socklen_t len = sizeof(error);
 
                 if (getsockopt(conn->fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0)

protocols/twitter/twitter.c

@@ -51 +51 @@
         struct twitter_data *td = ic->proto_data;
 
+        char *last_tweet = set_getstr(&ic->acc->set, "_last_tweet");
+        if (last_tweet)
+                td->timeline_id = g_ascii_strtoull(last_tweet, NULL, 0);
+
         /* Create the room now that we "logged in". */
         if (td->flags & TWITTER_MODE_CHAT)
@@ -327 +331 @@
         s = set_add(&acc->set, "strip_newlines", "false", set_eval_bool, acc);
         
+        s = set_add(&acc->set, "_last_tweet", "0", NULL, acc);
+        s->flags |= SET_HIDDEN | SET_NOSAVE;
+
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 s = set_add(&acc->set, "stream", "true", set_eval_bool, acc);

protocols/twitter/twitter_lib.c

@@ -234 +234 @@
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor)
 {
-        // Primitive, but hey! It works...      
+        // Primitive, but hey! It works...
         char *args[2];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
 
@@ -721 +721 @@
 {
         struct twitter_data *td = ic->proto_data;
+        char *last_id_str;
         
         if (status->user == NULL || status->text == NULL)
@@ -738 +739 @@
         // we won't pick up the updates already in the list.
         td->timeline_id = MAX(td->timeline_id, status->rt_id);
+
+        last_id_str = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+        set_setstr(&ic->acc->set, "last_tweet", last_id_str);
+        g_free(last_id_str);
 }
 
@@ -997 +1002 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
@@ -1033 +1038 @@
         char *args[6];
         args[0] = "cursor";
-        args[1] = g_strdup_printf("%lld", (long long) next_cursor);
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
         if (td->timeline_id) {
                 args[4] = "since_id";
-                args[5] = g_strdup_printf("%llu", (long long unsigned int) td->timeline_id);
+                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         } else {
                 args[4] = "count";
@@ -1167 +1172 @@
                 "status", msg,
                 "in_reply_to_status_id",
-                g_strdup_printf("%llu", (unsigned long long) in_reply_to)
+                g_strdup_printf("%" G_GUINT64_FORMAT, in_reply_to)
         };
         twitter_http(ic, TWITTER_STATUS_UPDATE_URL, twitter_http_post, ic, 1,
@@ -1201 +1206 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_DESTROY_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_DESTROY_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1211 +1216 @@
 {
         char *url;
-        url = g_strdup_printf("%s%llu%s", TWITTER_STATUS_RETWEET_URL,
-                              (unsigned long long) id, ".json");
+        url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s",
+                              TWITTER_STATUS_RETWEET_URL, id, ".json");
         twitter_http_f(ic, url, twitter_http_post, ic, 1, NULL, 0,
                        TWITTER_HTTP_USER_ACK);
@@ -1241 +1246 @@
                 NULL,
         };
-        args[1] = g_strdup_printf("%llu", (unsigned long long) id);
+        args[1] = g_strdup_printf("%" G_GUINT64_FORMAT, id);
         twitter_http_f(ic, TWITTER_FAVORITE_CREATE_URL, twitter_http_post,
                        ic, 1, args, 2, TWITTER_HTTP_USER_ACK);

protocols/yahoo/libyahoo2.c

@@ -974 +974 @@
                         msg = pair->value;
 
-                if (pair->key == 13) ;
+                if (pair->key == 13) 
+                        ;
                 if (pair->key == 16)    /* error */
                         msg = pair->value;
@@ -1795 +1796 @@
         switch (code)
         {
-                case 1212: return YAHOO_LOGIN_PASSWD;
-                case 1213: return YAHOO_LOGIN_LOCK;
-                case 1235: return YAHOO_LOGIN_UNAME;
+                case 1212: return (enum yahoo_status) YAHOO_LOGIN_PASSWD;
+                case 1213: return (enum yahoo_status) YAHOO_LOGIN_LOCK;
+                case 1235: return (enum yahoo_status) YAHOO_LOGIN_UNAME;
                 default: return (enum yahoo_status) code;
         }
@@ -3610 +3611 @@
         yd = yid->yd;
 
-        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE,
+        pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, (enum ypacket_status) YAHOO_STATUS_OFFLINE,
                 yd->session_id);
 
@@ -3677 +3678 @@
         if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "2");
                 yahoo_send_packet(yid, pkt, 0);
@@ -3696 +3697 @@
         if (old_status == YAHOO_STATUS_INVISIBLE) {
                 pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE,
-                        YAHOO_STATUS_AVAILABLE, 0);
+                        (enum ypacket_status) YAHOO_STATUS_AVAILABLE, 0);
                 yahoo_packet_hash(pkt, 13, "1");
                 yahoo_send_packet(yid, pkt, 0);

protocols/yahoo/yahoo_util.h

@@ -48 +48 @@
 
 # define snprintf       g_snprintf
+#ifdef vsnprintf
+#undef vsnprintf
+#endif
 # define vsnprintf      g_vsnprintf