From d158af8cdfa6e4bf85c1e74769e8d61bc469494c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Dec 2008 18:30:29 +0000 Subject: Merge revisions 36811:36865 from trunk. svn path=/branches/kill-bonobo/; revision=36867 --- widgets/misc/ChangeLog | 14 ++++++++++++++ widgets/misc/e-attachment-bar.c | 3 ++- widgets/misc/e-send-options.glade | 4 ++-- widgets/table/ChangeLog | 7 +++++++ widgets/table/e-cell-text.c | 17 ++--------------- 5 files changed, 27 insertions(+), 18 deletions(-) (limited to 'widgets') diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index e7b9460b10..c519df2d47 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,17 @@ +2008-12-10 Milan Crha + + ** Fix for bug #556303 + + * e-attachment-bar.c: (eab_icon_clicked_cb): + Check whether attachment has a body already before accessing it. + +2008-12-09 Milan Crha + + ** Part of fix for bug #563669 + + * e-send-options.glade: + Use zero GtkSpinButton's PageSize, as Gtk+ requires. + 2008-10-29 Sankar P License Changes diff --git a/widgets/misc/e-attachment-bar.c b/widgets/misc/e-attachment-bar.c index 1e41a95338..bdb6852e13 100644 --- a/widgets/misc/e-attachment-bar.c +++ b/widgets/misc/e-attachment-bar.c @@ -1001,7 +1001,8 @@ eab_icon_clicked_cb (EAttachmentBar *bar, GdkEvent *event, gpointer *dummy) if (E_IS_ATTACHMENT_BAR (bar) && event->type == GDK_2BUTTON_PRESS) { p = e_attachment_bar_get_selected (bar); - if (p && p->next == NULL) { + /* check if has body already, remote files can take longer to fetch */ + if (p && p->next == NULL && ((EAttachment *)p->data)->body) { attachment = p->data; /* Check if the file is stored already */ diff --git a/widgets/misc/e-send-options.glade b/widgets/misc/e-send-options.glade index fd509488da..1c1cc486d0 100644 --- a/widgets/misc/e-send-options.glade +++ b/widgets/misc/e-send-options.glade @@ -220,7 +220,7 @@ GTK_UPDATE_ALWAYS False False - 5 0 100 1 10 10 + 5 0 100 1 10 0 1 @@ -450,7 +450,7 @@ GTK_UPDATE_ALWAYS False False - 2 0 100 1 10 10 + 2 0 100 1 10 0 0 diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index dd5598306f..4034fe0a5a 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2008-11-28 Felix Riemann + + ** Part of fix for bug #554464 + + * e-cell-text.c: (build_layout): Let Pango handle the ellipsizing, + which should be faster. + 2008-10-17 Matthew Barnes ** Fixes bug #560882 diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 5beeae625f..ccbc30283c 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -612,21 +612,8 @@ build_layout (ECellTextView *text_view, int row, const char *text, gint width) pango_layout_set_width (layout, width * PANGO_SCALE); pango_layout_set_wrap (layout, PANGO_WRAP_CHAR); - if (pango_layout_get_line_count (layout) > 1) { - PangoLayoutLine *line = pango_layout_get_line (layout, 0); - gchar *line_text = g_strdup (pango_layout_get_text (layout)); - gchar *last_char = g_utf8_find_prev_char (line_text, line_text + line->length - 1); - while (last_char && pango_layout_get_line_count (layout) > 1) { - gchar *new_text; - last_char = g_utf8_find_prev_char (line_text, last_char); - if (last_char) - *last_char = '\0'; - new_text = g_strconcat (line_text, "...", NULL); - pango_layout_set_text (layout, new_text, -1); - g_free (new_text); - } - g_free (line_text); - } + pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); + pango_layout_set_height (layout, 0); switch (ect->justify) { case GTK_JUSTIFY_RIGHT: -- cgit