Changeset fcb2c2e

Timestamp:

2015-01-26T02:43:34Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

11e7828

Parents:

be1efa3

git-author:

dequis <dx@…> (18-01-15 16:15:40)

git-committer:

dequis <dx@…> (26-01-15 02:43:34)

Message:

jabber: Account-wide display_name setting, for groupchats

This sets the default value of 'nick' for newly created groupchats.
There is no way to set an account-wide nick.

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -888 +888 @@
                 <description>
                         <para>
-                                Currently only available for MSN connections. This setting allows you to read and change your "friendly name" for this connection. Since this is a server-side setting, it can't be changed when the account is off-line.
+                                Currently only available for MSN connections, and for jabber groupchats.
+                        </para>
+                        <para>
+                                For MSN: This setting allows you to read and change your "friendly name" for this connection. Since this is a server-side setting, it can't be changed when the account is off-line.
+                        </para>
+                        <para>
+                                For jabber groupchats: this sets the default value of 'nick' for newly created groupchats. There is no way to set an account-wide nick like MSN.
                         </para>
                 </description>

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 );
@@ -474 +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?",
@@ -481 +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;