Fix bonobo object setup.

2002-11-08  Not Zed  <NotZed@Ximian.com>

        * listener.c: Fix bonobo object setup.

        * e-msg-composer-hdrs.c: Remove oaf stuff, fix destroy to be
        multi-call safe.

        * e-msg-composer-attachment.c (e_msg_composer_attachment_new):
        Remove utf8 from locale conversions, & glib api changes.
        (ok_cb): "

        * e-msg-composer-attachment-bar.c (add_from_file): gtk message
        dialog.
        (pixbuf_for_mime_type): glib,gnome-vfs api changes.
        (init): Estimate the icon_height based on the pango font
        description size, this is probably not correct.
        (properties_cb):
        (remove_cb): Changed signature for gnomeui callbacks.
        (popup_icon_context_menu):
        (popup_context_menu): popup_menu api change
        (destroy): Protect from multiple calls.
        (e_msg_composer_attachment_bar_new): Remove push/pop
        visual/colormap stuff.

        * composer-marshal.list: The list of marshallers used by the
        composer.

        * Makefile.am (composer-marshal.h): Added composer marshal builder.

        * evolution-composer.c (class_init): bonobo object epv setup change.
        (factory_fn): Fix changes to factory callback.

        * e-icon-list.c: (icon_get_height): Use bounding box to calc
        height.
        (icon_event): drop gtk_selection_extended.
        (e_icon_list_remove): "
        (select_icon):
        (unselect_icon): "

        * e-msg-composer.c (autosave_save_draft): Dup fd rather than poke
        camel_stream_fd's data.  Also, use camel_stream_close() rather
        than flush.
        (autosave_manager_query_load_orphans): Port to gtk dialog.
        (autosave_query_cb): Removed, redundant.
        (save): Port to gtkdialog.
        (prepare_engine): Fix bonobo-object-client code.
        (get_file_content): gtk dialog
        (do_exit): gtk dialog.
        (setup_signatures_menu): dump gtkutf8 stuff.
        (marshal_NONE__NONE_INT): What WAS jeff thinking?  Removed :)
        (class_init): g object setup.
        (e_msg_composer_get_type): "
        (create_composer): remove bonobo_window_construct, use create
        property instead.  g_signal stuff.  bonobo stuff.
        (is_special_header): Use ascii_strncasecmp
        (e_msg_composer_set_pending_body): gtk->g_object_get/set_data.
        (e_msg_composer_set_body): use ascii_strncasecmp
        (e_msg_composer_add_inline_image_from_mime_part): make cid const.
        (autosave_manager_register):
        (autosave_manager_unregister): Use g_path_get_basename() & account
        for differences.
        (composer_shutdown): rename to finalise/etc.
        (class_init): Use object:finalize instead of shutdown.
        (e_msg_composer_set_body): Use _() rather than U_().
        (build_message): gtk dialog.

2002-11-06  Not Zed  <NotZed@Ximian.com>

        * e-msg-composer-attachment-bar.c (pixbuf_for_mime_type): Add
        error return to gdk_pixbuf_new_from_file().

svn path=/trunk/; revision=18659

1 files changed, 17 insertions, 2 deletions

diff --git a/composer/Makefile.am b/composer/Makefile.am
index 22334d3eeb..0f893f46a8 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -19,13 +19,26 @@ HTML_EDITOR_GENERATED =		\
 selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
 
 $(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl
-	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\
+	$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl $(IDL_INCLUDES) \
 		-I $(selectnamesdir)  $(srcdir)/Composer.idl
 
 Editor-commmon.c: $(GTKHTML_DATADIR)/Editor.idl
 
 $(HTML_EDITOR_GENERATED): $(GTKHTML_DATADIR)/Editor.idl
-	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(GTKHTML_DATADIR)/gtkhtml $(GTKHTML_DATADIR)/Editor.idl
+	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) -I $(GTKHTML_DATADIR)/gtkhtml $(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
 
 ##
 
@@ -63,6 +76,7 @@ INCLUDES =								\
 libcomposer_a_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		\
@@ -83,6 +97,7 @@ libcomposer_a_SOURCES = 			\
 EXTRA_DIST =					\
 	$(glade_DATA)				\
 	$(IDLS)					\
+	composer-marshal.list			\
 	bad-icon.xpm
 
 BUILT_SOURCES = $(IDL_GENERATED) $(HTML_EDITOR_GENERATED)