Changes in protocols/jabber/jabber.c [c27a923:fcb2c2e]

File:

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

protocols/jabber/jabber.c

@@ -63 +63 @@
         s = set_add( &acc->set, "oauth", "false", set_eval_oauth, acc );
 
+        s = set_add( &acc->set, "display_name", NULL, NULL, acc );
+        
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
         s = set_add( &acc->set, "port", str, set_eval_int, acc );
@@ -318 +320 @@
         g_free( jd->oauth2_access_token );
         g_free( jd->away_message );
+        g_free( jd->internal_jid );
         g_free( jd->username );
         g_free( jd->me );
@@ -473 +476 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        
+        char *final_nick;
+        
+        /* Ignore the passed nick parameter if we have our own default */
+        if ( !( final_nick = set_getstr( sets, "nick" ) ) &&
+             !( final_nick = set_getstr( &ic->acc->set, "display_name" ) ) ) {
+                /* Well, whatever, actually use the provided default, then */
+                final_nick = (char *) nick;
+        }
+
         if( strchr( room, '@' ) == NULL )
                 imcb_error( ic, "%s is not a valid Jabber room name. Maybe you mean %s@conference.%s?",
@@ -480 +491 @@
                 imcb_error( ic, "Already present in chat `%s'", room );
         else
-                return jabber_chat_join( ic, room, nick, set_getstr( sets, "password" ) );
+                return jabber_chat_join( ic, room, final_nick, set_getstr( sets, "password" ) );
         
         return NULL;
@@ -619 +630 @@
         
         return NULL;
+}
+
+gboolean jabber_handle_is_self( struct im_connection *ic, const char *who ) {
+        struct jabber_data *jd = ic->proto_data;
+        return ( ( g_strcasecmp( who, ic->acc->user ) == 0 ) ||
+                 ( jd->internal_jid &&
+                   g_strcasecmp( who, jd->internal_jid ) == 0 ) );
 }
 
@@ -648 +666 @@
         ret->send_typing = jabber_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->handle_is_self = jabber_handle_is_self;
         ret->transfer_request = jabber_si_transfer_request;
         ret->buddy_action_list = jabber_buddy_action_list;