Changes in protocols/jabber/jabber.c [eded1f7:2ff2076]

File:

• protocols/jabber/jabber.c (modified) (5 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 );
 }
 
@@ -270 +272 @@
                 return jabber_write( ic, message, strlen( message ) );
         
-        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_jid( ic, s + 1 ) )
+        if( ( s = strchr( who, '=' ) ) && jabber_chat_by_name( ic, s + 1 ) )
                 bud = jabber_buddy_by_ext_jid( ic, who, 0 );
         else
@@ -397 +399 @@
         if( strchr( room, '@' ) == NULL )
                 imcb_error( ic, "Invalid room name: %s", room );
-        else if( jabber_chat_by_jid( ic, room ) )
+        else if( jabber_chat_by_name( ic, room ) )
                 imcb_error( ic, "Already present in chat `%s'", room );
         else
@@ -421 +423 @@
         if( c )
                 jabber_chat_leave( c, NULL );
-}
-
-static void jabber_chat_invite_( struct groupchat *c, char *who, char *msg )
-{
-        struct jabber_chat *jc = c->data;
-        gchar *msg_alt = NULL;
-
-        if( msg == NULL )
-                msg_alt = g_strdup_printf( "%s invited you to %s", c->ic->acc->user, jc->name );
-        
-        if( c && who )
-                jabber_chat_invite( c, who, msg ? msg : msg_alt );
-        
-        g_free( msg_alt );
 }
 
@@ -508 +496 @@
         ret->chat_msg = jabber_chat_msg_;
         ret->chat_topic = jabber_chat_topic_;
-        ret->chat_invite = jabber_chat_invite_;
+//      ret->chat_invite = jabber_chat_invite;
         ret->chat_leave = jabber_chat_leave_;
         ret->chat_join = jabber_chat_join_;