Changeset 8076ec0 for protocols/jabber/presence.c

Timestamp:

2007-12-05T01:30:50Z (17 years ago)

Author:

ulim <a.sporto+bee@…>

Branches:

master

Children:

dc0ba9c

Parents:

dce3903 (diff), 793cc25 (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:

merges from upstream/release

ulim 2007-12-04 Follow rename of jabber_chat_by_jid from upstrem

ulim 2007-12-04 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
ulim 2007-12-04 Jabber file transfer now also with sending! You can't use a proxy yet when
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/presence.c (modified) (3 diffs)

protocols/jabber/presence.c

@@ -40 +40 @@
         {
                 *s = 0;
-                if( jabber_chat_by_name( ic, from ) )
+                if( jabber_chat_by_jid( ic, from ) )
                         is_chat = 1;
                 *s = '/';
@@ -164 +164 @@
         else if( strcmp( type, "error" ) == 0 )
         {
+                return jabber_cache_handle_packet( ic, node );
+                
+                /*
                 struct jabber_error *err;
-                
                 if( ( c = xt_find_node( node->children, "error" ) ) )
                 {
@@ -173 +175 @@
                                     err->text ? err->text : "" );
                         jabber_error_free( err );
-                }
-                /* What else to do with it? */
+                } */
         }