Changes in / [3709301:4346c3f4]

Files:

• bitlbee.h (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (1 diff)
• lib/http_client.c (modified) (4 diffs)
• lib/http_client.h (modified) (2 diffs)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (4 diffs)
• storage_xml.c (modified) (4 diffs)

bitlbee.h

@@ -35 +35 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "1.2.7"
+#define BITLBEE_VERSION "1.2.8"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(1, 2, 7)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(1, 2, 8)
 
 #define MAX_STRING 511

debian/changelog

@@ -7 +7 @@
 
  -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 05 Jun 2010 15:16:38 +0100
+
+bitlbee (1.2.8-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sat, 10 Jul 2010 13:54:55 +0100
 
 bitlbee (1.2.7-1) unstable; urgency=high

doc/CHANGES

@@ -3 +3 @@
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
+
+Version 1.2.8:
+- Now always using the AIM-style authentication method for OSCAR connections,
+  even when connecting to ICQ. This solves login issues some people were
+  having. (If you have problems, try changing the old_icq_auth setting.)
+- Twitter:
+  * Allow changing the Twitter API base URL so the module can also be used
+    for identi.ca or any other compatible network.
+  * Fetch the full list of Twitter contacts instead of slowly adding all
+    contacts as they post a message.
+  * Fixed message length counting.
+  * Allow following/unfollowing people using the usual add/remove commands.
+  * Better error reporting.
+- Added a user_agent setting to the Jabber module to get around artificial
+  client restrictions.
+- Allow nick changes (although only before register/identify).
+- Some more minor bugfixes/etc.
+
+Finished 4 Jul 2010
 
 Version 1.2.7:

doc/user-guide/commands.xml

@@ -531 +531 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="base_url" type="string" scope="account">
+                <default>http://twitter.com</default>
+
+                <description>
+                        <para>
+                                There are more services that understand the Twitter API than just Twitter.com. BitlBee can connect to all Twitter API implementations.
+                        </para>
+
+                        <para>
+                                For example, set this setting to <emphasis>http://identi.ca/api</emphasis> to use Identi.ca.
+                        </para>
+
+                        <para>
+                                Keep two things in mind: When not using Twitter, you <emphasis>must</emphasis> also disable the <emphasis>oauth</emphasis> setting as it currently only works with Twitter. If you're still having issues, make sure there is <emphasis>no</emphasis> slash at the end of the URL you enter here.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
         <bitlbee-setting name="charset" type="string" scope="global">
                 <default>utf-8</default>

lib/http_client.c

@@ -35 +35 @@
 static gboolean http_ssl_connected( gpointer data, void *source, b_input_condition cond );
 static gboolean http_incoming_data( gpointer data, int source, b_input_condition cond );
-
-
-void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data )
+static void http_free( struct http_request *req );
+
+
+struct http_request *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data )
 {
         struct http_request *req;
@@ -67 +68 @@
         req->request = g_strdup( request );
         req->request_length = strlen( request );
+        req->redir_ttl = 3;
         
         return( req );
 }
 
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
+struct http_request *http_dorequest_url( char *url_string, http_input_function func, gpointer data )
 {
         url_t *url = g_new0( url_t, 1 );
@@ -311 +313 @@
         }
         
-        if( req->status_code == 301 || req->status_code == 302 )
+        if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
         {
                 char *loc, *new_request, *new_host;
@@ -445 +447 @@
 }
 
-void http_free( struct http_request *req )
+static void http_free( struct http_request *req )
 {
         g_free( req->request );

lib/http_client.h

@@ -61 +61 @@
         int finished;           /* Set to non-0 if the request was completed
                                    successfully. */
+        int redir_ttl;          /* You can set it to 0 if you don't want
+                                   http_client to follow them. */
         
         http_input_function func;
@@ -79 +81 @@
    you want to add some extra headers. As you can see, HTTPS connections
    are also supported (using ssl_client). */
-void *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
-void *http_dorequest_url( char *url_string, http_input_function func, gpointer data );
-
-void http_free( struct http_request *req );
+struct http_request *http_dorequest( char *host, int port, int ssl, char *request, http_input_function func, gpointer data );
+struct http_request *http_dorequest_url( char *url_string, http_input_function func, gpointer data );

protocols/oscar/oscar.c

@@ -2531 +2531 @@
         struct groupchat *c;
         
-        chatname = g_strdup_printf("%s%s_%d", isdigit(*ic->acc->user) ? "icq_" : "",
+        chatname = g_strdup_printf("%s%s%d", isdigit(*ic->acc->user) ? "icq" : "",
                                    ic->acc->user, chat_id++);
         

protocols/twitter/twitter_lib.c

@@ -36 +36 @@
 #include <errno.h>
 
+/* GLib < 2.12.0 doesn't have g_ascii_strtoll(), work around using system strtoll(). */
+/* GLib < 2.12.4 can be buggy: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488013 */
+#if !GLIB_CHECK_VERSION(2,12,5)
+#include <stdlib.h>
+#include <limits.h>
+#define g_ascii_strtoll strtoll
+#endif
+
 #define TXL_STATUS 1
 #define TXL_USER 2
@@ -66 +74 @@
 static void txu_free(struct twitter_xml_user *txu)
 {
+        if (txu == NULL)
+                return;
         g_free(txu->name);
         g_free(txu->screen_name);
@@ -89 +99 @@
 {
         GSList *l;
+        if (txl == NULL)
+                return;
         for ( l = txl->list; l ; l = g_slist_next(l) )
                 if (txl->type == TXL_STATUS)
@@ -473 +485 @@
         {
                 status = l->data;
+                if (status->user == NULL || status->text == NULL)
+                        continue;
+
                 twitter_add_buddy(ic, status->user->screen_name, status->user->name);
                 

storage_xml.c

@@ -59 +59 @@
         char *given_pass;
         xml_pass_st pass_st;
+        int unknown_tag;
 };
 
@@ -86 +87 @@
         irc_t *irc = xd->irc;
         
-        if( g_strcasecmp( element_name, "user" ) == 0 )
+        if( xd->unknown_tag > 0 )
+        {
+                xd->unknown_tag ++;
+        }
+        else if( g_strcasecmp( element_name, "user" ) == 0 )
         {
                 char *nick = xml_attr( attr_names, attr_values, "nick" );
@@ -267 +272 @@
         else
         {
+                xd->unknown_tag ++;
+                irc_usermsg( irc, "Warning: Unknown XML tag found in configuration file (%s). "
+                                  "This may happen when downgrading BitlBee versions. "
+                                  "This tag will be skipped and the information will be lost "
+                                  "once you save your settings.", element_name );
+                /*
                 g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
                              "Unkown element: %s", element_name );
+                */
         }
 }
@@ -276 +288 @@
         struct xml_parsedata *xd = data;
         
-        if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
+        if( xd->unknown_tag > 0 )
+        {
+                xd->unknown_tag --;
+        }
+        else if( g_strcasecmp( element_name, "setting" ) == 0 && xd->current_setting )
         {
                 g_free( xd->current_setting );