aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-06-18 03:47:53 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-06-18 03:47:53 +0800
commit35fea294345bd6c04ef81282fec3ecb052d12619 (patch)
tree05938da956b9ba636d48e2cef2fdd0959cd58b40 /composer
parent93da15659a14ed3f5c6d3295b80960698be095ac (diff)
downloadgsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar.gz
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar.bz2
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar.lz
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar.xz
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.tar.zst
gsoc2013-evolution-35fea294345bd6c04ef81282fec3ecb052d12619.zip
Fixes bug #44139.
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
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog12
-rw-r--r--composer/e-msg-composer-hdrs.c13
-rw-r--r--composer/e-msg-composer.c6
3 files changed, 19 insertions, 12 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 9cfe2665c3..baff4a25b2 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -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):
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index dedb8abb4f..9810fa63b4 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -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
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 0a72e2aad1..18cf3382e0 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -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);