diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
| commit | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (patch) | |
| tree | e049bafefac361ae66dfa43abdb956f1f3a730e0 /composer | |
| parent | 624f48121f523101fe26c3d3a8b51a4eeda90990 (diff) | |
| parent | 42e75c9162402078ac629740821c3533925ee342 (diff) | |
| download | gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.gz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.bz2 gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.lz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.xz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.zst gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.zip | |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'composer')
| -rw-r--r-- | composer/e-composer-header.c | 11 | ||||
| -rw-r--r-- | composer/e-msg-composer.h | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c index f1524a62e6..713c123b74 100644 --- a/composer/e-composer-header.c +++ b/composer/e-composer-header.c @@ -69,10 +69,6 @@ composer_header_addaction_clicked_cb (GtkButton *button, EComposerHeader *header) { gboolean show = !e_composer_header_get_visible(header); - if (!show) - gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show")); - else - gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide")); e_composer_header_set_visible (header, show); } @@ -105,6 +101,7 @@ composer_header_constructor (GType type, GTK_LABEL (widget), header->input_widget); } + header->priv->action_label = NULL; if (header->priv->addaction) { GtkWidget *box, *tmp; gchar *str; @@ -428,6 +425,12 @@ e_composer_header_set_visible (EComposerHeader *header, header->priv->visible = visible; + if (header->priv->action_label) { + if (!visible) + gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show")); + else + gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide")); + } g_object_notify (G_OBJECT (header), "visible"); } diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index 1a8f4676e7..1d5eb39d80 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -29,7 +29,7 @@ #include <libedataserver/e-account.h> #include <libebook/e-destination.h> #include <gtkhtml-editor.h> -#include <widgets/misc/e-attachment-view.h> +#include <misc/e-attachment-view.h> #include "e-composer-header-table.h" |