Changeset 07874be for protocols

Timestamp:

2010-08-14T13:44:35Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e5854a8

Parents:

5848675 (diff), 136c2bb (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:

Merge mainline stuff.

Location:

protocols

Files:

• jabber/jabber.c (modified) (3 diffs)
• twitter/twitter.c (modified) (1 diff)
• twitter/twitter_lib.c (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -96 +96 @@
         struct im_connection *ic = imcb_new( acc );
         struct jabber_data *jd = g_new0( struct jabber_data, 1 );
-        struct ns_srv_reply *srv = NULL;
+        struct ns_srv_reply **srvl = NULL, *srv = NULL;
         char *connect_to, *s;
         int i;
@@ -196 +196 @@
         if( acc->server && *acc->server )
                 connect_to = acc->server;
-        else if( ( srv = srv_lookup( "xmpp-client", "tcp", jd->server ) ) ||
-                 ( srv = srv_lookup( "jabber-client", "tcp", jd->server ) ) )
+        else if( ( srvl = srv_lookup( "xmpp-client", "tcp", jd->server ) ) ||
+                 ( srvl = srv_lookup( "jabber-client", "tcp", jd->server ) ) )
+        {
+                /* Find the lowest-priority one. These usually come
+                   back in random/shuffled order. Not looking at
+                   weights etc for now. */
+                srv = *srvl;
+                for( i = 1; srvl[i]; i ++ )
+                        if( srvl[i]->prio < srv->prio )
+                                srv = srvl[i];
+                
                 connect_to = srv->name;
+        }
         else
                 connect_to = jd->server;
@@ -227 +237 @@
                 jd->fd = proxy_connect( connect_to, srv ? srv->port : set_getint( &acc->set, "port" ), jabber_connected_plain, ic );
         }
-        g_free( srv );
+        srv_free( srvl );
         
         if( jd->fd == -1 )

protocols/twitter/twitter.c

@@ -257 +257 @@
         
         // Set the status to logged out.
-        ic->flags = 0;
+        ic->flags &= ~ OPT_LOGGED_IN;
 
         // Remove the main_loop function from the function queue.

protocols/twitter/twitter_lib.c

@@ -357 +357 @@
 }
 
+#ifdef __GLIBC__
+#define TWITTER_TIME_FORMAT "%a %b %d %H:%M:%S %z %Y"
+#else
+#define TWITTER_TIME_FORMAT "%a %b %d %H:%M:%S +0000 %Y"
+#endif
 
 /**
@@ -393 +398 @@
                            this field. :-( Also assumes the timezone used
                            is UTC since C time handling functions suck. */
-                        if( strptime( child->text, "%a %b %d %H:%M:%S %z %Y", &parsed ) != NULL )
+                        if( strptime( child->text, TWITTER_TIME_FORMAT, &parsed ) != NULL )
                                 txs->created_at = mktime_utc( &parsed );
                 }