talons

commit 545fa6f8eb760010a8d87b79659545e91d1d02ec
parent 93787a6fff7189b19b67e7470ac660a27b44d7e7
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Sat,  3 Nov 2018 19:16:01 +0100

Make NNTP account crosspost color pref use colorlabel_get/set_combobox_colormenu_active().

Diffstat:
M
src/prefs_account.c
 | 
37
++++---------------------------------

1 file changed, 4 insertions(+), 33 deletions(-)
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -4341,48 +4341,19 @@ static void crosspost_color_toggled(void)
 
 static void prefs_account_crosspost_set_data_from_colormenu(PrefParam *pparam)
 {
-	GtkWidget *combobox = advanced_page.crosspost_colormenu;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
 	gint color;
+	GtkWidget *combobox = *pparam->widget;
 
-	if (!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(combobox), &iter))
-		return;
-
-	model = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox));
-
-	gtk_tree_model_get(model, &iter,
-			COLORMENU_COL_ID, &color,
-			-1);
-
-	/* If "None" is selected, "color" will be -1, so "0" will get
-	 * saved in prefs, which is correct. */
-	*((gint *)pparam->data) = color + 1;
+	color = colorlabel_get_combobox_colormenu_active(GTK_COMBO_BOX(combobox));
+	*((gint *)pparam->data) = color;
 }
 
 static void prefs_account_crosspost_set_colormenu(PrefParam *pparam)
 {
 	gint color = *((gint *)pparam->data);
-	gint id;
 	GtkWidget *combobox = *pparam->widget;
-	GtkTreeModel *model;
-	GtkTreeIter iter;
-
-	model = gtk_combo_box_get_model(GTK_COMBO_BOX(combobox));
-
-	if (!gtk_tree_model_get_iter_first(model, &iter))
-		return;
-
-	do {
-		gtk_tree_model_get(model, &iter,
-				COLORMENU_COL_ID, &id,
-				-1);
-
-		if (id == color - 1)
-			break;
-	} while (gtk_tree_model_iter_next(model, &iter));
 
-	gtk_combo_box_set_active_iter(GTK_COMBO_BOX(combobox), &iter);
+	colorlabel_set_combobox_colormenu_active(GTK_COMBO_BOX(combobox), color);
 }
 
 static void pop_bfr_smtp_tm_set_sens(GtkWidget *widget, gpointer data)