Changeset 06eef80

Timestamp:

2013-02-21T14:03:15Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a5c6ebd

Parents:

12f500f

Message:

For the lazy among us: When adding a Jabber/MSN contact within the same
domain like you, you can omit the domain name.

Files:

• protocols/account.h (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/msn/msn.c (modified) (1 diff)
• root_commands.c (modified) (3 diffs)

protocols/account.h

@@ -70 +70 @@
         ACC_FLAG_AWAY_MESSAGE = 0x01,   /* Supports away messages instead of just states. */
         ACC_FLAG_STATUS_MESSAGE = 0x02, /* Supports status messages (without being away). */
+        ACC_FLAG_HANDLE_DOMAINS = 0x04, /* Contact handles need a domain portion. */
 } account_flag_t;
 

protocols/jabber/jabber.c

@@ -96 +96 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
         
-        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
+                      ACC_FLAG_HANDLE_DOMAINS;
 }
 

protocols/jabber/jabber.h

@@ -196 +196 @@
 };
 
-#define JABBER_XMLCONSOLE_HANDLE "xmlconsole"
+#define JABBER_XMLCONSOLE_HANDLE "_xmlconsole"
 #define JABBER_OAUTH_HANDLE "jabber_oauth"
 

protocols/msn/msn.c

@@ -44 +44 @@
         set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
         
-        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
+        acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
+                      ACC_FLAG_HANDLE_DOMAINS;
 }
 

root_commands.c

@@ -680 +680 @@
         account_t *a;
         int add_on_server = 1;
+        char *handle = NULL, *s;
         
         if( g_strcasecmp( cmd[1], "-tmp" ) == 0 )
@@ -715 +716 @@
                         nick_set_raw( a, cmd[2], cmd[3] );
                 }
+        }
+        
+        if( ( a->flags & ACC_FLAG_HANDLE_DOMAINS ) && cmd[2][0] != '_' &&
+            ( !( s = strchr( cmd[2], '@' ) ) || s[1] == '\0' ) )
+        {
+                /* If there's no @ or it's the last char, append the user's
+                   domain name now. Exclude handles starting with a _ so
+                   adding _xmlconsole will keep working. */
+                if( s )
+                        *s = '\0';
+                if( ( s = strchr( a->user, '@' ) ) )
+                        cmd[2] = handle = g_strconcat( cmd[2], s, NULL );
         }
         
@@ -746 +759 @@
         }
         
+        g_free( handle );
 }