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.c (create_composer): Set the border width around
	the composer's vbox to HIG specification and make the box_spacing
	6 pixels as well.

svn path=/trunk/; revision=21460
This commit is contained in:
Jeffrey Stedfast
2003-06-17 19:47:53 +00:00
committed by Jeffrey Stedfast
parent 93da15659a
commit 35fea29434
3 changed files with 19 additions and 12 deletions

View File

@ -1,3 +1,15 @@
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.c (create_composer): Set the border width around
the composer's vbox to HIG specification and make the box_spacing
6 pixels as well.
2003-06-10 Larry Ewing <lewing@ximian.com>
* e-msg-composer-hdrs.c (e_msg_composer_hdrs_and_string_free):

View File

@ -386,7 +386,7 @@ create_from_optionmenu (EMsgComposerHdrs *hdrs)
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 @@ create_headers (EMsgComposerHdrs *hdrs)
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

View File

@ -216,10 +216,10 @@ best_encoding (GByteArray *buf, const char *charset)
if ((unsigned char)*ch > 127)
count++;
}
} while (status == -1 && errno == E2BIG);
} while (status == (size_t) -1 && errno == E2BIG);
iconv_close (cd);
if (status == -1)
if (status == (size_t) -1)
return -1;
if (count == 0)
@ -2939,6 +2939,8 @@ create_composer (int visible_mask)
return NULL;
}
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
gtk_box_set_spacing (GTK_BOX (vbox), 6);
gtk_box_pack_start (GTK_BOX (vbox), composer->hdrs, FALSE, FALSE, 0);
g_signal_connect (composer->hdrs, "subject_changed",
G_CALLBACK (subject_changed_cb), composer);