Changes in / [aea22cd:3864c08]

Files:

• Makefile (modified) (1 diff)
• configure (modified) (2 diffs)
• doc/user-guide/misc.xml (modified) (2 diffs)
• doc/user-guide/quickstart.xml (modified) (1 diff)
• ipc.c (modified) (1 diff)
• irc_im.c (modified) (2 diffs)
• irc_send.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/twitter/twitter.h (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (1 diff)

Makefile

@@ -156 +156 @@
 $(OTR_PI): %.so: $(SRCDIR)%.c
         @echo '*' Building plugin $@
-        @$(CC) $(CFLAGS) $(OTRFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@
+        @$(CC) $(CFLAGS) -fPIC -shared $(LDFLAGS) $< -o $@ $(OTRFLAGS)
 
 $(SKYPE_PI): $(SRCDIR)protocols/skype/skype.c

configure

@@ -19 +19 @@
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee.sock'
+ipcsocket=''
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
@@ -67 +67 @@
 --pidfile=...                                           $pidfile
 --config=...                                            $config
---ipcsocket=...                                         $ipcsocket
 
 --msn=0/1       Disable/enable MSN part                 $msn

doc/user-guide/misc.xml

@@ -191 +191 @@
 
 <ircexample>
-        <ircline nick="wilmer">chan set &amp;wlm fill_by account</ircline>
+        <ircline nick="wilmer">chan &amp;wlm set fill_by account</ircline>
         <ircline nick="root">fill_by = `account'</ircline>
-        <ircline nick="wilmer">chan set &amp;wlm account msn</ircline>
+        <ircline nick="wilmer">chan &amp;wlm set account msn</ircline>
         <ircline nick="root">account = `msn'</ircline>
 </ircexample>
@@ -204 +204 @@
 
 <ircexample>
-        <ircline nick="wilmer">chan set &amp;offline show_users offline</ircline>
+        <ircline nick="wilmer">chan &amp;offline set show_users offline</ircline>
         <ircline nick="root">show_users = `offline'</ircline>
 </ircexample>

doc/user-guide/quickstart.xml

@@ -72 +72 @@
 </para>
 
-<para>Finally, if you have multiple users with similar names you may use the <emphasis>rename</emphasis> command to make it easier to remember: <emphasis>rename r2d2_ r2d2_aim</emphasis>
+<para>
+Finally, if you have multiple users with similar names you may use the <emphasis>rename</emphasis> command to make it easier to remember: <emphasis>rename r2d2_ r2d2_aim</emphasis>
+</para>
 
 <para>

ipc.c

@@ -909 +909 @@
         int serversock;
 
+        if (!IPCSOCKET || !*IPCSOCKET)
+                return 1;
+
         /* Clean up old socket files that were hanging around.. */
         if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {

irc_im.c

@@ -193 +193 @@
 }
 
-static void bee_irc_msg_from_user( irc_user_t *iu, const char *msg, time_t sent_at )
-{
-        irc_t *irc = iu->irc;
-        bee_t *bee = irc->b;
+static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at )
+{
+        irc_t *irc = bee->ui_data;
+        irc_user_t *iu = (irc_user_t *) bu->ui_data;
         const char *dst;
         char *prefix = NULL;
         char *wrapped, *ts = NULL;
-
+        char *msg = g_strdup( msg_ );
+        GSList *l;
+        
         if( sent_at > 0 && set_getbool( &irc->b->set, "display_timestamps" ) )
                 ts = irc_format_timestamp( irc, sent_at );
         
-        dst = irc_user_msgdest(iu);
-        if(dst != irc->user->nick) {
+        dst = irc_user_msgdest( iu );
+        if( dst != irc->user->nick )
+        {
                 /* if not messaging directly, call user by name */
                 prefix = g_strdup_printf( "%s%s%s", irc->user->nick, set_getstr( &bee->set, "to_char" ), ts ? : "" );
-        } else {
+        }
+        else
+        {
                 prefix = ts;
-                ts = NULL;      /* don't doulbe-free */
-        }
-
-        wrapped = word_wrap( msg, 425 );
-        irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
-        
-        g_free( wrapped );
-        g_free( prefix );
-        g_free( ts );
-}
-
-static gboolean bee_irc_user_msg( bee_t *bee, bee_user_t *bu, const char *msg_, time_t sent_at )
-{
-        irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        char *msg = g_strdup( msg_ );
-        GSList *l;
+                ts = NULL;      /* don't double-free */
+        }
         
         for( l = irc_plugins; l; l = l->next )
@@ -256 +247 @@
         }
         
-    bee_irc_msg_from_user( iu, msg, sent_at );
-
+        wrapped = word_wrap( msg, 425 );
+        irc_send_msg( iu, "PRIVMSG", dst, wrapped, prefix );
+        
+        g_free( wrapped );
+        g_free( prefix );
         g_free( msg );
+        g_free( ts );
+        
         return TRUE;
 }

irc_send.c

@@ -110 +110 @@
 }
 
+/* Used by some funcs that generate PRIVMSGs to figure out if we're talking to
+   this person in /query or in a control channel. WARNING: callers rely on
+   this returning a pointer at irc->user_nick, not a copy of it. */
 const char *irc_user_msgdest( irc_user_t *iu )
 {

protocols/oscar/oscar.c

@@ -2102 +2102 @@
                                 aim_ssi_addbuddies( sess, fr->conn, OSCAR_GROUP, &list, 1, 1 );
                         }
+                        else if( st == 0x0A )
+                        {
+                                imcb_error( sess->aux_data, "Buddy %s is already in your list", list );
+                        }
                         else
                         {

protocols/twitter/twitter.h

@@ -39 +39 @@
         TWITTER_GOT_TIMELINE = 0x20000,
         TWITTER_GOT_MENTIONS = 0x40000,
+        TWITTER_DOING_TIMELINE_SLOW = 0x80000,
 } twitter_flags_t;
 

protocols/twitter/twitter_lib.c

@@ -727 +727 @@
         gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
 
+        if ((td->flags & 0xf0000) == (TWITTER_DOING_TIMELINE | TWITTER_DOING_TIMELINE_SLOW)) {
+                imcb_log(ic, "Connection seems to have stalled again.\n"
+                             "This is a known bug, if you see this happen a lot "
+                             "please generate some traffic dumps.");
+                td->flags &= ~0xf0000;
+        }
+
         if (td->flags & TWITTER_DOING_TIMELINE) {
+                /* This shouldn't normally happen at all but I'm currently hunting a bug
+                   where it does. Instead of having users suffer under it, have a work-
+                   around with a warning. */
+                td->flags |= TWITTER_DOING_TIMELINE_SLOW;
                 return;
         }