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

composer/ChangeLog

@@ -1,3 +1,27 @@
+2003-02-06  Dan Winship  <danw@ximian.com>
+
+	* 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
+
 2003-02-05  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-msg-composer.c (e_msg_composer_new_from_url): Split out the

composer/Makefile.am

@@ -44,7 +44,6 @@ $(libcomposer_la_OBJECTS): composer-marshal.h
 
 idl_DATA = $(IDLS)
 
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA =					\
 	e-msg-composer-attachment.glade
 
@@ -63,9 +62,9 @@ INCLUDES =								\
 	-I$(top_builddir)/shell						\
 	-I$(top_srcdir)/shell						\
 	-DEVOLUTION_DATADIR=\"$(datadir)\"				\
-	-DEVOLUTION_ICONSDIR=\"$(iconsdir)\"				\
+	-DEVOLUTION_IMAGESDIR=\"$(imagesdir)\"				\
 	-DEVOLUTION_UIDIR=\"$(evolutionuidir)\"				\
-	-DE_GLADEDIR=\"$(gladedir)\"					\
+	-DEVOLUTION_GLADEDIR=\"$(gladedir)\"				\
 	-DG_LOG_DOMAIN=\"composer\"					\
 	-DG_DISABLE_DEPRECATED						\
 	-DGTK_DISABLE_DEPRECATED					\

composer/e-msg-composer-attachment-bar.c

@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <gconf/gconf.h>
@@ -218,7 +219,7 @@ pixbuf_for_mime_type (const char *mime_type)
 	    || strcmp (mime_type, "message/rfc822") == 0) {
 		char *name;
 		
-		name = g_build_filename (EVOLUTION_ICONSDIR, "mail.png", NULL);
+		name = g_build_filename (EVOLUTION_IMAGESDIR, "mail.png", NULL);
 		pixbuf = gdk_pixbuf_new_from_file (name, NULL);
 		g_free (name);
 		

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'");

composer/e-msg-composer-hdrs.c

@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include <string.h>
+
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
 

composer/e-msg-composer-select-file.c

@@ -43,7 +43,6 @@ run_selector(EMsgComposer *composer, const char *title, int multi, gboolean *sho
 {
 	GtkFileSelection *selection;
 	GtkWidget *showinline = NULL;
-	GPtrArray *list = NULL;
 	char *path;
 
 	selection = (GtkFileSelection *)gtk_file_selection_new(title);

composer/e-msg-composer.c

@@ -1336,7 +1336,6 @@ autosave_is_owned (AutosaveManager *am, const char *file)
 static void
 autosave_manager_query_load_orphans (AutosaveManager *am, EMsgComposer *composer)
 {
-	GtkWidget *dialog;
 	DIR *dir;
 	struct dirent *d;
 	GSList *match = NULL;
@@ -1629,7 +1628,7 @@ menu_file_send_cb (BonoboUIComponent *uic,
 		   void *data,
 		   const char *path)
 {
-	gtk_signal_emit (GTK_OBJECT (data), signals[SEND]);
+	g_signal_emit (GTK_OBJECT (data), signals[SEND], 0);
 }
 
 static void

composer/evolution-composer.c

@@ -25,6 +25,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-item-handler.h>
 #include <bonobo/bonobo-generic-factory.h>
@@ -310,7 +311,6 @@ evolution_composer_class_init (EvolutionComposerClass *klass)
 static void
 evolution_composer_init (EvolutionComposer *composer)
 {
-	BonoboObject *item_handler;
 	EAccount *account;
 	
 	account = mail_config_get_default_account ();

composer/listener.c

@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <bonobo/bonobo-arg.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-stream-client.h>
@@ -261,7 +262,6 @@ EditorListener *
 listener_new (EMsgComposer *composer)
 {
 	EditorListener *listener;
-	GNOME_GtkHTML_Editor_Listener corba_listener;
 
 	listener = g_object_new (EDITOR_LISTENER_TYPE, NULL);
 	listener->composer = composer;