aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog9
-rw-r--r--composer/Makefile.am18
-rw-r--r--composer/composer-marshal.list4
3 files changed, 10 insertions, 21 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index e8bf69b7bc..40d0335216 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-23 Dan Winship <danw@ximian.com>
+
+ * bad-icon.xpm: Remove this. It was only used by e-icon-list,
+ which is no longer there.
+
+ * composer-marshal.list: Likewise
+
+ * Makefile.am: Update
+
2003-07-21 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (build_message): Init charset to NULL.
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 1699dbff37..811bbf881f 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -29,19 +29,6 @@ $(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl
##
-composer-marshal.h: composer-marshal.list
- ( @GLIB_GENMARSHAL@ --prefix=e_msg_composer_marshal composer-marshal.list --header > composer-marshal.tmp \
- && mv composer-marshal.tmp composer-marshal.h ) \
- || ( rm -f composer-marshal.tmp && exit 1 )
-composer-marshal.c: composer-marshal.h
- ( @GLIB_GENMARSHAL@ --prefix=e_msg_composer_marshal composer-marshal.list --body > composer-marshal.tmp \
- && mv composer-marshal.tmp composer-marshal.c ) \
- || ( rm -f composer-marshal.tmp && exit 1 )
-
-$(libcomposer_la_OBJECTS): composer-marshal.h
-
-##
-
idl_DATA = $(IDLS)
glade_DATA = \
@@ -73,7 +60,6 @@ INCLUDES = \
libcomposer_la_SOURCES = \
$(IDL_GENERATED) \
$(HTML_EDITOR_GENERATED) \
- composer-marshal.c \
e-msg-composer-attachment-bar.c \
e-msg-composer-attachment-bar.h \
e-msg-composer-attachment.c \
@@ -92,9 +78,7 @@ libcomposer_la_SOURCES = \
EXTRA_DIST = \
$(glade_DATA) \
$(IDLS) \
- ChangeLog.pre-1-4 \
- composer-marshal.list \
- bad-icon.xpm
+ ChangeLog.pre-1-4
BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/composer/composer-marshal.list b/composer/composer-marshal.list
deleted file mode 100644
index a449f32486..0000000000
--- a/composer/composer-marshal.list
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# for e-icon-list
-VOID:INT,BOXED
-BOOLEAN:INT,POINTER