mcabber: mcabber/mcabber/screen.c comparison

comparison mcabber/mcabber/screen.c @ 2292:f181418db215

Replace global variable update_roster with scr_update_roster()

author	franky
date	Tue, 01 Nov 2016 18:00:39 +0100
parents	0d350e979bde
children	fa8365fb6ac2

comparison

equal deleted inserted replaced

-:0d350e979bde
+:f181418db215
 static int    chatstate; /* (0=active, 1=composing, 2=paused) */
 static bool   lock_chatstate;
 static time_t chatstate_timestamp;
 static guint  chatstate_timeout_id = 0;
-int update_roster;
+int _update_roster;
 int utf8_mode;
 gboolean chatstates_disabled;
 gboolean Autoaway;
 #define MAX_KEYSEQ_LENGTH 8
 for (head = rostercolrules; head; head = g_slist_next(head)) {
 free_rostercolrule(head->data);
 }
 g_slist_free(rostercolrules);
 rostercolrules = NULL;
+scr_update_roster();
 }
 // Adds, modifies or removes roster coloring rule
 // color set to "-" removes the rule,
 // otherwise it is modified (if exists) or added
 }
 if (!strcmp(color,"-")) { // Delete the rule
 if (found) {
 free_rostercolrule(found->data);
 rostercolrules = g_slist_delete_link(rostercolrules, found);
+scr_update_roster();
 return TRUE;
 } else {
 scr_LogPrint(LPRINT_NORMAL, "No such color rule, nothing removed");
 return FALSE;
 }
 rc->wildcard = g_strdup(wildcard);
 rc->compiled = g_pattern_spec_new(wildcard);
 rc->color = cl;
 rostercolrules = g_slist_prepend(rostercolrules, rc);
 }
+scr_update_roster();
 return TRUE;
 }
 }
 static void parse_colors(void)
 chatmode = TRUE;
 if (!win_entry->bd->lock)
 roster_msg_setflag(winId, special, FALSE);
 if (!special)
 roster_setflags(winId, ROSTER_FLAG_LOCK, TRUE);
-update_roster = TRUE;
+scr_update_roster();
 // Refresh the window
 scr_update_window(win_entry);
 // Finished :)
 setmsgflg = TRUE;
 }
 if (!special) {
 if (clearmsgflg) {
 roster_msg_setflag(winId, FALSE, FALSE);
-update_roster = TRUE;
+scr_update_roster();
 } else if (setmsgflg) {
 roster_msg_setflag(winId, FALSE, TRUE);
-update_roster = TRUE;
+scr_update_roster();
 }
 }
 }
 static char *attention_sign_guard(const gchar *key, const gchar *new_value)
 {
-update_roster = TRUE;
+scr_update_roster();
 if (g_strcmp0(settings_opt_get(key), new_value)) {
 guint sign;
 char *c;
 if (!new_value || !*new_value)
 return NULL;
 replace_panel(mainstatusPanel, mainstatusWnd);
 replace_panel(inputPanel, inputWnd);
 }
 // We'll need to redraw the roster
-update_roster = TRUE;
+scr_update_roster();
 return;
 }
 static void resize_win_buffer(gpointer key, gpointer value, gpointer data)
 {
 int x_pos;
 int prefix_length;
 char space[2] = " ";
 // We can reset update_roster
-update_roster = FALSE;
+if (_update_roster == FALSE)
+return;
+_update_roster = FALSE;
 buddylist_build();
 getmaxyx(rosterWnd, maxy, maxx);
 maxx--;  // Last char is for vertical border
 top_panel(inputPanel);
 update_panels();
 curs_set(cursor_backup);
 }
+void scr_update_roster(void)
+{
+_update_roster = TRUE;
+}
 //  scr_roster_visibility(status)
 // Set the roster visibility:
 // status=1   Show roster
 // status=0   Hide roster
 // status=-1  Toggle roster status
 if (chatmode) {
 buddy_setflags(BUDDATA(current_buddy), ROSTER_FLAG_LOCK, TRUE);
 // Remove the readmark if it is at the end of the buffer
 scr_buffer_readmark(-1);
 }
-// We should rebuild the buddylist but not everytime
+// We should rebuild the buddylist when the last selected buddy isn't
+// displayed anymore
 if (!(buddylist_get_filter() & 1<<prev_st))
 buddylist_defer_build();
-update_roster = TRUE;
+scr_update_roster();
 }
 //  scr_roster_top()
 // Go to the first buddy in the buddylist
 void scr_roster_top(void)
 for (budstate = 0; budstate < imstatus_size-1; budstate++)
 if (strchr(filter, imstatus2char[budstate]) || show_all)
 status |= 1<<budstate;
 buddylist_set_filter(status);
 buddylist_defer_build();
-update_roster = TRUE;
+scr_update_roster();
 return;
 }
 // Display current filter
 psfilter = strfilter;
 win_entry->bd->cleared = FALSE;
 win_entry->bd->top = NULL;
 }
-update_roster = TRUE;
+scr_update_roster();
 // Refresh the window
 scr_update_buddy_window();
 // Finished :)
 } else {
 current_id = NULL;
 }
 if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked) {
 roster_msg_setflag(bjid, special, TRUE);
-update_roster = TRUE;
+scr_update_roster();
 }
 }
 //  scr_setattentionflag_if_needed(bare_jid, special, value, action)
 // Set the attention flag unless we're already in the jid buffer window
 current_id = NULL;
 }
 if (!chatmode || !current_id || strcmp(bjid, current_id) || iscurrentlocked) {
 roster_setuiprio(bjid, special, value, action);
-update_roster = TRUE;
+scr_update_roster();
 }
 }
 //  scr_set_multimode()
 // Public function to (un)set multimode...

Mercurial > ~mikael > mcabber > hg

comparison mcabber/mcabber/screen.c @ 2292:f181418db215