This commit was manufactured by cvs2svn to create tagEVOLUTION_2_4_1

'EVOLUTION_2_4_1'.

svn path=/tags/EVOLUTION_2_4_1/; revision=30482

5 files changed, 17 insertions, 48 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index ed4f77c765..4047e8d8e0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,25 +1,8 @@
 2005-09-29  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
 	** See bug 317284
-	
-	* em-mailer-prefs.c: (emmp_header_add_header):
-	Check if its a valid header and only then add it
-	
-2005-09-28  Tor Lillqvist  <tml@novell.com>
-
-	* em-composer-utils.c (reply_get_composer, get_reply_list,
-	post_reply_to_message)
-	* em-folder-view.c (emfv_format_link_clicked)
-	* importers/netscape-importer.c (netscape_get_boolean): Use
-	g_ascii_str(n)casecmp() instead of str(n)casecmp(). We are
-	comparing to literal ASCII strings in these cases, so just
-	casefolding ASCII is enough. Also better for portability.
-
-	* em-format-html-display.c
-	* message-list.c: Define localtime_r() for Win32 using localtime()
-	(which is thread-safe in Microsoft's C library).
-
-	* mail-tools.c (mail_tool_do_movemail): Not implemented on Win32.
+	* em-mailer-prefs.c:(emmp_header_add_header):
+	Make sure that the header text is not empty
 
 2005-09-28  Parthasarathi Susarla <sparthasarathi@novell.com>
 	
@@ -27,14 +10,12 @@
 	* em-vfolder-rule.c: (em_vfolder_rule_add_source):
 	Do not add a NULL uri.
 
-2005-09-26  S.Antony Vincent Pandian <santony@gmail.com>
-
-	Fixes #208647
-
-	* em-folder-tree.c : Have added a menu item Empty 
-	Trash in the folder tree's context menu and also
-	added its callback.
+2005-09-27  Sankar P  <psankar@novell.com>
 
+	* em-account-editor.c (emae_check_complete) :
+	Removed a few wrong commits that accidentally went in 
+	while committing the patch for 315506.
+	
 2005-09-22  Carsten Guenther <carsten.guenther@scalix.com>
 
 	Fixes #316983
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 04ae1d2502..b211535710 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2421,8 +2421,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 
 	/* We use the page-check of various pages to 'prepare' or
 	   pre-load their values, only in the druid */
-	if (pageid
-	    && ((EConfig *)emae->priv->config)->type == E_CONFIG_DRUID) {
+	if (pageid && ((EConfig *)emae->priv->config)->type == E_CONFIG_DRUID) {
 		if (!strcmp(pageid, "00.identity")) {
 			if (!emae->priv->identity_set) {
 				char *uname;
@@ -2449,7 +2448,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 			}
 		} else if (!strcmp(pageid, "20.receive_options")) {
 			if (emae->priv->source.provider
-			    && emae->priv->extra_provider != emae->priv->source.provider) {
+					&& emae->priv->extra_provider != emae->priv->source.provider) {
 				emae->priv->extra_provider = emae->priv->source.provider;
 				emae_auto_detect(emae);
 			}
@@ -2478,8 +2477,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 			&& (tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS))
 			&& is_email(tmp)
 			&& ((tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_REPLY_TO)) == NULL
-			    || tmp[0] == 0
-			    || is_email(tmp));
+					|| tmp[0] == 0
+					|| is_email(tmp));
 		if (!ok)
 			d(printf("identity incomplete\n"));
 	}
@@ -2500,7 +2499,7 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 		ok = (tmp = e_account_get_string(emae->account, E_ACCOUNT_NAME))
 			&& tmp[0]
 			&& ((ea = mail_config_get_account_by_name(tmp)) == NULL
-			    || ea == emae->original);
+					|| ea == emae->original);
 		if (!ok)
 			d(printf("management page incomplete\n"));
 	}
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 90bb3f155c..452cad9bca 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1368,7 +1368,7 @@ reply_get_composer (CamelMimeMessage *message, EAccount *account,
 
 	/* Set the subject of the new message. */
 	if ((subject = (char *) camel_mime_message_get_subject (message))) {
-		if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0)
+		if (strncasecmp (subject, "Re: ", 4) != 0)
 			subject = g_strdup_printf ("Re: %s", subject);
 		else
 			subject = g_strdup (subject);
@@ -1522,7 +1522,7 @@ get_reply_list (CamelMimeMessage *message, CamelInternetAddress *to)
 		header++;
 	
 	/* check for NO */
-	if (!g_ascii_strncasecmp (header, "NO", 2))
+	if (!strncasecmp (header, "NO", 2))
 		return FALSE;
 	
 	/* Search for the first mailto angle-bracket enclosed URL.
@@ -1998,7 +1998,7 @@ post_reply_to_message (CamelFolder *folder, const char *uid, CamelMimeMessage *m
 	
 	/* Set the subject of the new message. */
 	if ((subject = (char *) camel_mime_message_get_subject (message))) {
-		if (g_ascii_strncasecmp (subject, "Re: ", 4) != 0)
+		if (strncasecmp (subject, "Re: ", 4) != 0)
 			subject = g_strdup_printf ("Re: %s", subject);
 		else
 			subject = g_strdup (subject);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 0fdd1a65bf..29142c596a 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2013,12 +2013,6 @@ emft_popup_rename_folder (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static void
-emft_popup_empty_trash (EPopup *ep, EPopupItem *pitem, void *data)
-{
-	em_utils_empty_trash (data);
-}
-
-static void
 emft_popup_properties (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	EMFolderTree *emft = data;
@@ -2057,7 +2051,6 @@ static EPopupItem emft_popup_items[] = {
 	{ E_POPUP_BAR, "80.emc" },
 	{ E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
 };
-static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT};
 
 static void
 emft_popup_free(EPopup *ep, GSList *items, void *data)
@@ -2077,7 +2070,6 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	GSList *menus = NULL;
 	guint32 info_flags = 0;
 	guint32 flags = 0;
-	guint32 folder_type_flags = 0;
 	gboolean isstore;
 	char *uri, *full_name;
 	GtkMenu *menu;
@@ -2096,7 +2088,7 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	
 	gtk_tree_model_get (model, &iter, COL_POINTER_CAMEL_STORE, &store,
 			    COL_STRING_URI, &uri, COL_STRING_FULL_NAME, &full_name,
-			    COL_BOOL_IS_STORE, &isstore, COL_UINT_FLAGS, &folder_type_flags, -1);
+			    COL_BOOL_IS_STORE, &isstore, -1);
 
 	/* Stores have full_name == NULL, otherwise its just a placeholder */
 	/* NB: This is kind of messy */
@@ -2137,9 +2129,6 @@ emft_popup (EMFolderTree *emft, GdkEvent *event)
 	for (i = 0; i < sizeof (emft_popup_items) / sizeof (emft_popup_items[0]); i++)
 		menus = g_slist_prepend (menus, &emft_popup_items[i]);
 	
-	if ((folder_type_flags & CAMEL_FOLDER_TYPE_MASK) == CAMEL_FOLDER_TYPE_TRASH)
-		menus = g_slist_prepend (menus, &trash_popup_item);
-
 	e_popup_add_items ((EPopup *)emp, menus, NULL, emft_popup_free, emft);
 
 	menu = e_popup_create_menu_once ((EPopup *)emp, (EPopupTarget *)target, 0);
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 4fe3cbfa68..00988514ee 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -385,7 +385,7 @@ emmp_header_add_header (GtkWidget *widget, EMMailerPrefs *prefs)
 	GtkTreeModel *model = GTK_TREE_MODEL (prefs->header_list_store);
 	GtkTreeIter iter;
 	const gchar *text = gtk_entry_get_text (prefs->entry_header);
-	
+
 	g_strstrip (text);
 
 	if (text && (strlen (text)>0)) {