# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1269385600 -3600
# Node ID 60db836ad98a1ee0e28e07d3998d1535bf51b1d7
# Parent  0628dcecaddfc0cbd6148fd7712c6675a75a9c90
Move some "update_roster" updates to a better place

diff -r 0628dcecaddf -r 60db836ad98a mcabber/mcabber/commands.c
--- a/mcabber/mcabber/commands.c	Tue Mar 23 23:57:57 2010 +0100
+++ b/mcabber/mcabber/commands.c	Wed Mar 24 00:06:40 2010 +0100
@@ -627,7 +627,6 @@
   scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
   scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                  ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-  update_roster = TRUE;
   g_slist_free(notes);
 }
 
@@ -2132,7 +2131,6 @@
       scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
       scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                  ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-      update_roster = TRUE;
     } else
       scr_LogPrint(LPRINT_NORMAL, "No options found.");
     return;
@@ -2242,7 +2240,6 @@
     scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
     scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                    ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-    update_roster = TRUE;
     return;
   }
   if (!assign) {  // This is a query
@@ -2992,7 +2989,6 @@
   scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
   scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                  ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-  update_roster = TRUE;
   g_string_free(sbuf, TRUE);
   g_slist_free(bm);
 }
diff -r 0628dcecaddf -r 60db836ad98a mcabber/mcabber/help.c
--- a/mcabber/mcabber/help.c	Tue Mar 23 23:57:57 2010 +0100
+++ b/mcabber/mcabber/help.c	Wed Mar 24 00:06:40 2010 +0100
@@ -204,7 +204,6 @@
     scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
     scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                    ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-    update_roster = TRUE;
   }
 
   return TRUE;
diff -r 0628dcecaddf -r 60db836ad98a mcabber/mcabber/screen.c
--- a/mcabber/mcabber/screen.c	Tue Mar 23 23:57:57 2010 +0100
+++ b/mcabber/mcabber/screen.c	Wed Mar 24 00:06:40 2010 +0100
@@ -2897,7 +2897,6 @@
   scr_setmsgflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE);
   scr_setattentionflag_if_needed(SPECIAL_BUFFER_STATUS_ID, TRUE,
                                  ROSTER_UI_PRIO_STATUS_WIN_MESSAGE, prio_max);
-  update_roster = TRUE;
 }
 
 //  scr_set_chatmode()
@@ -2945,8 +2944,10 @@
   } else {
     current_id = NULL;
   }
-  if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked)
+  if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked) {
     roster_msg_setflag(bjid, special, TRUE);
+    update_roster = TRUE;
+  }
 }
 
 //  scr_setattentionflag_if_needed(bare_jid, special, value, action)
@@ -2980,8 +2981,10 @@
     current_id = NULL;
   }
 
-  if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked)
+  if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked) {
     roster_setuiprio(bjid, special, value, action);
+    update_roster = TRUE;
+  }
 }
 
 //  scr_set_multimode()