From f36f2d1fcf5851aa1d00ab8096ca0b362880475b Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 6 Nov 2002 00:42:52 +0000
Subject: #include <string.h>.

* metar.c: #include <string.h>.

* main.c (main): Use gnome_program_init().

* e-summary-tasks.c (e_summary_tasks_protocol): Use
bonobo-activation.

* e-summary-table.c (set_value_at): Use g_signal_emit() instead of
gtk_signal_emit().

* e-summary-shown.c (e_summary_shown_class_init): GObjectified.
(construct_pixmap_button): Use gtk_image_new_from_stock() instead
of gnome_stock_pixmap_new().

* e-summary-preferences.c (e_summary_preferences_restore): Use
EConfigListener.
(add_dialog_clicked_cb): Add some missing consts.
(factory_fn): Pass NULL as the domain arg to glade_xml_new().
(factory_fn): Add id arg.
(e_summary_preferences_register_config_control_factory):

* e-summary-mail.c (e_summary_folder_init_folder_store): Use
bonobo-activation.

* e-summary-factory.c (control_activate): Pass NULL ev arg to
bonobo functions that now need it.
(control_deactivate): Likewise.
(control_activate_cb): Likewise.
(e_summary_factory_new_control): Use g_signal_connect() instead of
gtk_signal_connect().

* e-summary-calendar.c (e_summary_calendar_protocol): Use
bonobo_activation.

* e-summary.c: Update gnome-print #includes.  Added some missing
#includes.
(e_summary_url_clicked): Pass NULL as the error arg to
gnome_url_show().
(do_summary_print): Use GnomePrintConfig instead of GnomePrinter
et al.

* e-cell-tri.h: Removed BEGIN_GNOME_DECLS/END_GNOME_DECLS.

* e-summary.c: Removed #include <libgnome/gnome-defs.h>.  Ported
to e-config-listener.c.

* e-cell-tri.h: Removed #include <libgnome/gnome-defs.h>.

* component-factory.c: #include <gtk/gtkmain.h>.
(create_component): Use g_signal_connect.  Match prototype with
the one required by bonobo_generic_factory().

* Makefile.am: Add @INTLTOOL_SERVER_RULE@.
($(MAIL_GENERATED)): Update with new ORBit rules.

svn path=/trunk/; revision=18574
---
 my-evolution/Makefile.am | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'my-evolution/Makefile.am')

diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index d7169f8d25..8d692a09d5 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -9,6 +9,10 @@ INCLUDES = \
 	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\
+	-DPREFIX=\"$(prefix)\"					\
+	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
+	-DDATADIR=\""$(datadir)"\"	 			\
+	-DLIBDIR=\""$(datadir)"\"	 			\
 	-DG_LOG_DOMAIN=\"evolution-executive-summary\"		\
 	$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
 
@@ -22,7 +26,7 @@ MAIL_GENERATED =						\
 	Mailer-stubs.c
 
 $(MAIL_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(top_srcdir)/mail/Mailer.idl
+	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(top_srcdir)/mail/Mailer.idl
 
 summary_sources =				\
 	$(MAIL_GENERATED)			\
@@ -109,7 +113,7 @@ oaf_DATA = $(oaf_files)
 gladedir = $(datadir)/evolution/glade
 glade_DATA = my-evolution.glade
 
-@XML_I18N_MERGE_OAF_RULE@
+@INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = 				\
 	$(summary_sources)		\
-- 
cgit v1.2.3