Changeset 08135df for protocols/jabber/jabber.c

Timestamp:

2007-12-04T01:08:43Z (16 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

793cc25

Parents:

fa30fa5 (diff), aaf92a9 (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:

Merged in current devel

Wilmer van der Gaast 2007-12-02 Imported setuid() patch from Simo Leone <simo@archlinux...> with some

Wilmer van der Gaast 2007-12-02 Forgot to return something in jabber_chat_join_failed().
Wilmer van der Gaast 2007-12-02 Merging a change I should've pulled before committing three other changes.
Wilmer van der Gaast 2007-12-02 Added charset checks on incoming msgs (from the IRC side) to prevent possible
Wilmer van der Gaast 2007-12-02 Handling of presence-error packets (only useful for groupchats now), moved
Wilmer van der Gaast 2007-12-02 Defining DEBUG via CFLAGS so that it'll always be there, even when a file
Wilmer van der Gaast 2007-12-02 Removed retarded printf() (ARGH) and moved the event handling handling of
Wilmer van der Gaast 2007-11-29 printf() in daemons considered harmful.
Wilmer van der Gaast 2007-11-28 Fixed the epoll+ForkDaemon combination. The libevent event handling

File:

• protocols/jabber/jabber.c (modified) (3 diffs)

protocols/jabber/jabber.c

@@ -226 +226 @@
         jd->cached_id_prefix = g_strdup_printf( "%s%s", JABBER_CACHED_ID, s );
         g_free( s );
-        
-        printf( "%s\n", jd->cached_id_prefix );
 }
 
@@ -272 +270 @@
                 return jabber_write( ic, message, strlen( message ) );
         
-        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_name( ic, s + 1 ) )
+        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
@@ -399 +397 @@
         if( strchr( room, '@' ) == NULL )
                 imcb_error( ic, "Invalid room name: %s", room );
-        else if( jabber_chat_by_name( ic, room ) )
+        else if( jabber_chat_by_jid( ic, room ) )
                 imcb_error( ic, "Already present in chat `%s'", room );
         else