[evolution-patches] fix for bug #44991

[Jeffrey Stedfast <fejj ximian com>]

Use e-iconv rather than relying on the charset menu's string to be the
correct alias.

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

? 44139.patch
? 44991.patch
? composer.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.541
diff -u -r1.541 ChangeLog
--- ChangeLog	11 Jun 2003 00:21:14 -0000	1.541
+++ ChangeLog	17 Jun 2003 18:56:00 -0000
@@ -1,3 +1,18 @@
+2003-06-17  Jeffrey Stedfast  <fejj ximian com>
+
+	* e-msg-composer.c (best_encoding): Use e_iconv_open/close so that
+	we get charset aliasing for free. Fixes bug #44991.
+
+2003-06-16  Jeffrey Stedfast  <fejj ximian com>
+
+	Fixes bug #44139.
+
+	* e-msg-composer-hdrs.c (attach_couple): Set the vertical and
+	horizontal padding to 3 always.
+	(create_from_optionmenu): Change the hbox spacing to 6 pixels.
+	(e_msg_composer_hdrs_new): Set the border width to be HIG
+	compliant.
+
 2003-06-10  Larry Ewing  <lewing ximian com>
 
 	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_and_string_free):
Index: e-msg-composer-hdrs.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-hdrs.c,v
retrieving revision 1.113
diff -u -r1.113 e-msg-composer-hdrs.c
--- e-msg-composer-hdrs.c	11 Jun 2003 00:21:14 -0000	1.113
+++ e-msg-composer-hdrs.c	17 Jun 2003 18:56:01 -0000
@@ -386,7 +386,7 @@
 		g_signal_emit_by_name (first, "activate", hdrs);
 	}
 	
-	hbox = gtk_hbox_new (FALSE, 3);
+	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_box_pack_start_defaults (GTK_BOX (hbox), omenu);
 	gtk_widget_show (omenu);
 	gtk_widget_show (hbox);
@@ -557,22 +557,15 @@
 static void
 attach_couple (EMsgComposerHdrs *hdrs, EMsgComposerHdrPair *pair, int line)
 {
-	int pad;
-	
-	if (GTK_IS_LABEL (pair->label))
-		pad = GNOME_PAD;
-	else
-		pad = 2;
-	
 	gtk_table_attach (GTK_TABLE (hdrs),
 			  pair->label, 0, 1,
 			  line, line + 1,
-			  GTK_FILL, GTK_FILL, pad, pad);
+			  GTK_FILL, GTK_FILL, 3, 3);
 	
 	gtk_table_attach (GTK_TABLE (hdrs),
 			  pair->entry, 1, 2,
 			  line, line + 1,
-			  GTK_FILL | GTK_EXPAND, 0, 2, 2);
+			  GTK_FILL | GTK_EXPAND, 0, 3, 3);
 }
 
 static void
@@ -824,6 +817,7 @@
 	EMsgComposerHdrsPrivate *priv;
 	
 	new = g_object_new (e_msg_composer_hdrs_get_type (), NULL);
+	gtk_container_set_border_width (GTK_CONTAINER (new), 6);
 	priv = new->priv;
 	priv->uic = uic;
 
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.393
diff -u -r1.393 e-msg-composer.c
--- e-msg-composer.c	9 Jun 2003 18:18:33 -0000	1.393
+++ e-msg-composer.c	17 Jun 2003 18:56:05 -0000
@@ -202,7 +202,7 @@
 	if (!charset)
 		return -1;
 	
-	cd = iconv_open (charset, "utf-8");
+	cd = e_iconv_open (charset, "utf-8");
 	if (cd == (iconv_t) -1)
 		return -1;
 	
@@ -216,10 +216,10 @@
 			if ((unsigned char)*ch > 127)
 				count++;
 		}
-	} while (status == -1 && errno == E2BIG);
-	iconv_close (cd);
+	} while (status == (size_t) -1 && errno == E2BIG);
+	e_iconv_close (cd);
 	
-	if (status == -1)
+	if (status == (size_t) -1)
 		return -1;
 	
 	if (count == 0)