# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1267361206 -3600
# Node ID 98917ddcbaabd999ab04bd63fd6dbff45aaab860
# Parent  318c64ceb494abfe1265f14eba096db4cc99b21a
Do not move a contact before the server's ACK
(The server could deny the request... Cf. Facebook chat.)

diff -r 318c64ceb494 -r 98917ddcbaab mcabber/mcabber/commands.c
--- a/mcabber/mcabber/commands.c	Sun Feb 28 13:31:57 2010 +0100
+++ b/mcabber/mcabber/commands.c	Sun Feb 28 13:46:46 2010 +0100
@@ -2088,11 +2088,14 @@
 
   group_utf8 = to_utf8(newgroupname);
   if (strcmp(oldgroupname, group_utf8)) {
-    guint msgflag;
+    /* guint msgflag; */
 
     xmpp_updatebuddy(bjid, name, *group_utf8 ? group_utf8 : NULL);
     scr_RosterUpDown(-1, 1);
 
+    /* We do not move the buddy right now because the server could reject
+     * the request.  Let's wait for the server answer.
+
     // If the buddy has a pending message flag,
     // we remove it temporarily in order to reset the global group
     // flag.  We set it back once the buddy is in the new group,
@@ -2103,6 +2106,7 @@
     buddy_setgroup(bud, group_utf8);
     if (msgflag)
       roster_msg_setflag(bjid, FALSE, TRUE);
+    */
   }
 
   g_free(group_utf8);