Changeset 6e9ae72 for protocols/purple/purple.c

Timestamp:

2011-12-17T13:50:01Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

18c6d36

Parents:

87dddee (diff), 17f057d (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:

Mainline merge.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -181 +181 @@
                         /** No way to talk to the user right now, invent one when
                         this becomes important.
-                        irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
+                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
                                      name, purple_account_option_get_type( o ) );
                         */
@@ -750 +750 @@
                 if( bud->server_alias )
                         imcb_rename_buddy( ic, bud->name, bud->server_alias );
+                else if( bud->alias )
+                        imcb_rename_buddy( ic, bud->name, bud->alias );
                 
                 if( group )