[anjal] Make Evolution regression free wrt Anjal.

[Srinivasa Ragavan <sragavan src gnome org>]

commit 198e20973e9b7d59ffbce101d6d32781f5c21b68
Author: Srinivasa Ragavan <sragavan novell com>
Date:   Wed May 6 17:54:23 2009 +0530

    Make Evolution regression free wrt Anjal.
---
 evo-anjal-2-27.patch |   26 ++++++++++++++++++++++----
 evo-anjal.patch      |   26 ++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/evo-anjal-2-27.patch b/evo-anjal-2-27.patch
index 64894f0..cc1d8a0 100644
--- a/evo-anjal-2-27.patch
+++ b/evo-anjal-2-27.patch
@@ -67,7 +67,7 @@ index 74fda9a..f8c6dc6 100644
  
  /* Standard GObject macros */
 diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
-index 461c11e..618adbf 100644
+index 461c11e..4f2c6e1 100644
 --- a/composer/e-composer-header-table.c
 +++ b/composer/e-composer-header-table.c
 @@ -649,7 +649,7 @@ composer_header_table_init (EComposerHeaderTable *table)
@@ -75,7 +75,7 @@ index 461c11e..618adbf 100644
  	table->priv->headers[E_COMPOSER_HEADER_FROM] = header;
  
 -	header = e_composer_text_header_new_label (_("_Reply-To:"));
-+	header = e_composer_text_header_new_label (_("_Reply-To:"), NULL);
++	header = e_composer_text_header_new_label (_("_Reply-To:"), "");
  	composer_header_table_bind_header ("reply-to", "changed", header);
  	table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header;
  
@@ -333,7 +333,7 @@ index 04f7100..92a379b 100644
  						(EComposerNameHeader *header);
  EDestination **	e_composer_name_header_get_destinations
 diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
-index 2945720..bfb3237 100644
+index 2945720..e676ef9 100644
 --- a/composer/e-composer-text-header.c
 +++ b/composer/e-composer-text-header.c
 @@ -1,3 +1,7 @@
@@ -366,7 +366,7 @@ index 2945720..bfb3237 100644
  	return g_object_new (
  		E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
 -		"button", FALSE, NULL);
-+		"button", FALSE, "addaction", action_label != NULL,
++		"button", FALSE, "addaction", action_label && *action_label,
 +		"addaction_text", action_label,
 +		"visible", action_label == NULL, NULL);
  }
@@ -1367,3 +1367,21 @@ index 124c736..b0486ab 100644
  
  libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
  
+diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
+index 56990d7..d980991 100644
+--- a/widgets/misc/e-spinner.c
++++ b/widgets/misc/e-spinner.c
+@@ -888,9 +888,10 @@ e_spinner_dispose (GObject *object)
+ {
+ 	ESpinner *spinner = E_SPINNER (object);
+ 
+-	g_signal_handlers_disconnect_by_func
+-			(spinner->details->icon_theme,
+-		 G_CALLBACK (icon_theme_changed_cb), spinner);
++	if (spinner->details->icon_theme)
++		g_signal_handlers_disconnect_by_func
++				(spinner->details->icon_theme,
++			 G_CALLBACK (icon_theme_changed_cb), spinner);
+ 
+ 	G_OBJECT_CLASS (parent_class)->dispose (object);
+ }
diff --git a/evo-anjal.patch b/evo-anjal.patch
index cded627..7b9edd6 100755
--- a/evo-anjal.patch
+++ b/evo-anjal.patch
@@ -67,7 +67,7 @@ index 74fda9a..f8c6dc6 100644
  
  /* Standard GObject macros */
 diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
-index 461c11e..618adbf 100644
+index 461c11e..4f2c6e1 100644
 --- a/composer/e-composer-header-table.c
 +++ b/composer/e-composer-header-table.c
 @@ -649,7 +649,7 @@ composer_header_table_init (EComposerHeaderTable *table)
@@ -75,7 +75,7 @@ index 461c11e..618adbf 100644
  	table->priv->headers[E_COMPOSER_HEADER_FROM] = header;
  
 -	header = e_composer_text_header_new_label (_("_Reply-To:"));
-+	header = e_composer_text_header_new_label (_("_Reply-To:"), NULL);
++	header = e_composer_text_header_new_label (_("_Reply-To:"), "");
  	composer_header_table_bind_header ("reply-to", "changed", header);
  	table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header;
  
@@ -333,7 +333,7 @@ index 04f7100..92a379b 100644
  						(EComposerNameHeader *header);
  EDestination **	e_composer_name_header_get_destinations
 diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
-index 2945720..bfb3237 100644
+index 2945720..e676ef9 100644
 --- a/composer/e-composer-text-header.c
 +++ b/composer/e-composer-text-header.c
 @@ -1,3 +1,7 @@
@@ -366,7 +366,7 @@ index 2945720..bfb3237 100644
  	return g_object_new (
  		E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
 -		"button", FALSE, NULL);
-+		"button", FALSE, "addaction", action_label != NULL,
++		"button", FALSE, "addaction", action_label && *action_label,
 +		"addaction_text", action_label,
 +		"visible", action_label == NULL, NULL);
  }
@@ -1406,3 +1406,21 @@ index 95acd8b..2d92b1e 100644
  
  libefilterbar_la_LDFLAGS = $(NO_UNDEFINED)
  
+diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
+index 56990d7..7edafea 100644
+--- a/widgets/misc/e-spinner.c
++++ b/widgets/misc/e-spinner.c
+@@ -888,9 +888,10 @@ e_spinner_dispose (GObject *object)
+ {
+ 	ESpinner *spinner = E_SPINNER (object);
+ 
+-	g_signal_handlers_disconnect_by_func
+-			(spinner->details->icon_theme,
+-		 G_CALLBACK (icon_theme_changed_cb), spinner);
++	if (spinner->details->icon_theme) 
++		g_signal_handlers_disconnect_by_func
++				(spinner->details->icon_theme,
++			 G_CALLBACK (icon_theme_changed_cb), spinner);
+ 
+ 	G_OBJECT_CLASS (parent_class)->dispose (object);
+ }