From 235e390e773ffc7aa68c0c2d00df1988453de89e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fridrich.strba@bluewin.ch>
Date: Fri, 19 Jun 2009 11:42:58 +0200
Subject: Fix properly include paths, since this is one of our public headers

---
 composer/e-msg-composer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'composer')

diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 7664a8355b..e1713352ea 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -27,8 +27,8 @@
 #include <camel/camel-mime-message.h>
 #include <libedataserver/e-account.h>
 #include <libebook/e-destination.h>
-#include <gtkhtml-editor.h>
-#include <widgets/misc/e-attachment-view.h>
+#include <editor/gtkhtml-editor.h>
+#include <misc/e-attachment-view.h>
 
 #include "e-composer-header-table.h"
 
-- 
cgit v1.2.3


From ace3390de64eb4adb4cc28af39b0bc34ef078a79 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fridrich.strba@bluewin.ch>
Date: Fri, 19 Jun 2009 11:54:34 +0200
Subject: I was a bit over-keen in changing includes, revert this part.

---
 composer/e-msg-composer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'composer')

diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index e1713352ea..434f330e9a 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -27,7 +27,7 @@
 #include <camel/camel-mime-message.h>
 #include <libedataserver/e-account.h>
 #include <libebook/e-destination.h>
-#include <editor/gtkhtml-editor.h>
+#include <gtkhtml-editor.h>
 #include <misc/e-attachment-view.h>
 
 #include "e-composer-header-table.h"
-- 
cgit v1.2.3


From 741307a9309d389d3246285c985c2a68c741d6d7 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Wed, 24 Jun 2009 21:15:29 +0530
Subject: Fix show CC/BCC text for Anjal depending on the visibility of the
 widget.

---
 composer/e-composer-header.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'composer')

diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index e2942ca201..980e11c338 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;
@@ -431,6 +428,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");
 }
 
-- 
cgit v1.2.3


From 42e75c9162402078ac629740821c3533925ee342 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 30 Jun 2009 17:18:36 -0400
Subject: Use AM_CPPFLAGS instead of INCLUDE in all Makefile.am.

---
 composer/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'composer')

diff --git a/composer/Makefile.am b/composer/Makefile.am
index 97debe59d0..97af16bec5 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -19,7 +19,7 @@ libcomposerinclude_HEADERS = 			\
 	e-composer-autosave.h			\
 	e-msg-composer.h
 
-INCLUDES =								\
+AM_CPPFLAGS =								\
 	-I$(top_srcdir)							\
 	-I$(top_builddir)						\
 	-I$(top_builddir)/composer					\
-- 
cgit v1.2.3