From: Paweł Pękala <c0rn@gazeta.pl>
Date: Fri, 22 Jan 2010 21:36:56 +0000 (+0000)
Subject: 2010-01-22 [pawel]	3.7.4cvs8
X-Git-Tag: rel_3_7_5~3
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=62c3c0c0aa14e900776639444c2c4082064b5d96

2010-01-22 [pawel]	3.7.4cvs8

	* src/prefs_account.c
	* src/prefs_filtering.c
	* src/prefs_send.c
	* src/gtk/colorlabel.c
		Add some separators in combos
---

diff --git a/ChangeLog b/ChangeLog
index 06f41d100..d5331e418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-22 [pawel]	3.7.4cvs8
+
+	* src/prefs_account.c
+	* src/prefs_filtering.c
+	* src/prefs_send.c
+	* src/gtk/colorlabel.c
+		Add some separators in combos
+
 2010-01-22 [pawel]	3.7.4cvs7
 
 	* autogen.sh
diff --git a/PATCHSETS b/PATCHSETS
index d1537aa06..d794304b4 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3938,3 +3938,4 @@
 ( cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/gtk/authors.h;  ) > 3.7.4cvs5.patchset
 ( cvs diff -u -r 1.213.2.195 -r 1.213.2.196 src/folder.c;  cvs diff -u -r 1.87.2.60 -r 1.87.2.61 src/folder.h;  ) > 3.7.4cvs6.patchset
 ( cvs diff -u -r 1.4.2.9 -r 1.4.2.10 autogen.sh;  cvs diff -u -r 1.654.2.4008 -r 1.654.2.4009 configure.ac;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/wizard.c;  ) > 3.7.4cvs7.patchset
+( cvs diff -u -r 1.105.2.156 -r 1.105.2.157 src/prefs_account.c;  cvs diff -u -r 1.59.2.80 -r 1.59.2.81 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_send.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/gtk/colorlabel.c;  ) > 3.7.4cvs8.patchset
diff --git a/configure.ac b/configure.ac
index eaab41a9f..930522742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/colorlabel.c b/src/gtk/colorlabel.c
index 29da93479..6b32c5298 100644
--- a/src/gtk/colorlabel.c
+++ b/src/gtk/colorlabel.c
@@ -381,6 +381,10 @@ GtkWidget *colorlabel_create_color_menu(void)
 	g_object_set_data(G_OBJECT(item), "color", GUINT_TO_POINTER(0));
 	gtk_widget_show(item);
 
+	item = gtk_separator_menu_item_new();
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	gtk_widget_show(item);
+
 	/* and the color items */
 	for (i = 0; i < LABEL_COLORS_ELEMS; i++) {
 		GtkWidget *hbox; 
diff --git a/src/prefs_account.c b/src/prefs_account.c
index 091ee17bd..a8437ea26 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1534,6 +1534,7 @@ static void receive_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start (GTK_BOX (hbox1), optmenu, FALSE, FALSE, 0);
 
 	COMBOBOX_ADD (menu, _("Automatic"), 0);
+	COMBOBOX_ADD (menu, NULL, 0);
 	COMBOBOX_ADD (menu, "LOGIN", IMAP_AUTH_LOGIN);
 	COMBOBOX_ADD (menu, "CRAM-MD5", IMAP_AUTH_CRAM_MD5);
 	COMBOBOX_ADD (menu, "ANONYMOUS", IMAP_AUTH_ANON);
@@ -1723,6 +1724,7 @@ static void send_create_widget_func(PrefsPage * _page,
 	gtk_box_pack_start (GTK_BOX (hbox), optmenu, FALSE, FALSE, 0);
 
 	COMBOBOX_ADD (menu, _("Automatic"), 0);
+	COMBOBOX_ADD (menu, NULL, 0);
 	COMBOBOX_ADD (menu, "PLAIN", SMTPAUTH_PLAIN);
 	COMBOBOX_ADD (menu, "LOGIN", SMTPAUTH_LOGIN);
 	COMBOBOX_ADD (menu, "CRAM-MD5", SMTPAUTH_CRAM_MD5);
diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 66d1fd94d..106360602 100644
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -259,6 +259,7 @@ static void prefs_filtering_account_option_menu_populate(void)
 	cm_return_if_fail(accounts != NULL);
 
 	COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
+	COMBOBOX_ADD(filtering.account_combobox_list, NULL, 0);
 	for (; accounts != NULL; accounts = accounts->next) {
 		PrefsAccount *ac = (PrefsAccount *)accounts->data;
 
diff --git a/src/prefs_send.c b/src/prefs_send.c
index 7ddbc2d6a..3171bbf3e 100644
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -283,6 +283,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
 				GTK_COMBO_BOX(combobox_encoding)));
 
 	COMBOBOX_ADD(optmenu, _("Automatic"),	 CTE_AUTO);
+	COMBOBOX_ADD(optmenu, NULL, 0);
 	COMBOBOX_ADD(optmenu, "base64",		 CTE_BASE64);
 	COMBOBOX_ADD(optmenu, "quoted-printable", CTE_QUOTED_PRINTABLE);
 	COMBOBOX_ADD(optmenu, "8bit",		 CTE_8BIT);