clean up

        * Makefile.am: clean up

        * e-msg-composer.c (autosave_manager_query_load_orphans): #include
        string.h
        (menu_file_send_cb): s/gtk_signal_emit/g_signal_emit/

        * e-msg-composer-attachment.c: #include string.h
        (e_msg_composer_attachment_edit): s/E_GLADEDIR/EVOLUTION_GLADEDIR
        * e-msg-composer-attachment-bar.c: #include string.h
        (pixbuf_for_mime_type): s/ICONSDIR/IMAGESDIR/

        * e-msg-composer-hdrs.c: #include string.h

        * e-msg-composer-select-file.c (run_selector): Remove unused var

        * evolution-composer.c: #include string.h
        (evolution_composer_init): Remove unused var
        * listener.c: #include string.h
        (listener_new): Remove unused var

svn path=/trunk/; revision=19804

1 files changed, 3 insertions, 2 deletions

diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 9a6bfefc79..2be55b1f69 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -23,12 +23,13 @@
 
 
 /* This is the object representing an email attachment.  It is implemented as a
-   GtkObject to make it easier for the application to handle it.  For example,
+   GObject to make it easier for the application to handle it.  For example,
    the "changed" signal is emitted whenever something changes in the
    attachment.  Also, this contains the code to let users edit the
    attachment manually. */
 
 #include <sys/stat.h>
+#include <string.h>
 #include <errno.h>
 
 #include <camel/camel.h>
@@ -423,7 +424,7 @@ e_msg_composer_attachment_edit (EMsgComposerAttachment *attachment, GtkWidget *p
 		return;
 	}
 	
-	editor_gui = glade_xml_new (E_GLADEDIR "/e-msg-composer-attachment.glade",
+	editor_gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-msg-composer-attachment.glade",
 				    NULL, NULL);
 	if (editor_gui == NULL) {
 		g_warning ("Cannot load `e-msg-composer-attachment.glade'");