[evolution-patches] Cleanups for evolution/composer

[Kjartan Maraas <kmaraas broadpark no>]

Same as before, also removes some duplicated header includes.

Cheers
Kjartan

? mail-composer.error
Index: e-msg-composer-hdrs.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-hdrs.c,v
retrieving revision 1.153
diff -u -p -r1.153 e-msg-composer-hdrs.c
--- e-msg-composer-hdrs.c	21 Jul 2006 05:41:16 -0000	1.153
+++ e-msg-composer-hdrs.c	29 Aug 2006 18:52:07 -0000
@@ -42,9 +42,6 @@
 
 #include "Composer.h"
 
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtktooltips.h>
 #include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkhbox.h>
@@ -589,7 +586,6 @@ static EMsgComposerHdrPair 
 header_new_recipient (EMsgComposerHdrs *hdrs, const char *name, const char *tip)
 {
 	EMsgComposerHdrPair ret;
-	GtkWidget *pixmap;
 
 	ret.label = gtk_button_new_with_mnemonic (name);
 	GTK_OBJECT_UNSET_FLAGS (ret.label, GTK_CAN_FOCUS);
Index: e-msg-composer-select-file.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.c,v
retrieving revision 1.42
diff -u -p -r1.42 e-msg-composer-select-file.c
--- e-msg-composer-select-file.c	25 May 2006 18:09:36 -0000	1.42
+++ e-msg-composer-select-file.c	29 Aug 2006 18:52:07 -0000
@@ -83,7 +83,7 @@ get_selector(struct _EMsgComposer *compo
 							 NULL);
 	
 	gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
-	gtk_file_chooser_set_local_only (selection, FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE);
 	
 	if ((flags & SELECTOR_MODE_SAVE) == 0)
 		gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.540
diff -u -p -r1.540 e-msg-composer.c
--- e-msg-composer.c	6 Aug 2006 13:59:04 -0000	1.540
+++ e-msg-composer.c	29 Aug 2006 18:52:08 -0000
@@ -63,6 +63,7 @@
 
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-i18n.h>
+#include <libgnome/gnome-help.h>
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomeui/gnome-window-icon.h>
 
@@ -2851,7 +2852,6 @@ static void
 e_msg_composer_show_help (EMsgComposer *composer)
 {
 	GError *error = NULL;
-	EMsgComposerPrivate *p = composer->priv;
 
 	gnome_help_display_desktop (NULL,
 				    "evolution-" BASE_VERSION,
@@ -2953,7 +2953,6 @@ drop_action(EMsgComposer *composer, GdkD
 	char *content_type;
 	int i, success = FALSE, delete = FALSE;
 	EMsgComposerPrivate *p = composer->priv;
-	gboolean is_image;
 	
 	switch (info) {
 	case DND_TYPE_MESSAGE_RFC822:
Index: e-msg-composer.h
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.h,v
retrieving revision 1.96
diff -u -p -r1.96 e-msg-composer.h
--- e-msg-composer.h	7 Dec 2005 08:29:51 -0000	1.96
+++ e-msg-composer.h	29 Aug 2006 18:52:08 -0000
@@ -66,9 +66,8 @@ EMsgComposer            *e_msg_composer_
 									  const char        *resent_from);
 void			e_msg_composer_show_attachments_ui		 (EMsgComposer *composer);
 
-/*
 void                     e_msg_composer_show_attachments                 (EMsgComposer      *composer,
-									  gboolean           show);*/
+									  gboolean           show);
 
 void                     e_msg_composer_set_alternative                  (EMsgComposer      *composer,
 									  gboolean           alt);