#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

1 files changed, 7 insertions, 22 deletions

diff --git a/my-evolution/main.c b/my-evolution/main.c
index 6932bce4f4..7ac3337ea1 100644
--- a/my-evolution/main.c
+++ b/my-evolution/main.c
@@ -32,12 +32,10 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkrgb.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
+#include <libgnomeui/gnome-ui-init.h>
 
 #include <bonobo/bonobo-main.h>
-#include <liboaf/liboaf.h>
 
 #include <e-util/e-proxy.h>
 
@@ -54,32 +52,19 @@ int
 main (int argc,
       char **argv)
 {
-	CORBA_ORB orb;
+	/* Make ElectricFence work.  */
+	free (malloc (10));
 
 	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
 	textdomain (PACKAGE);
 
-	gnome_init_with_popt_table ("Evolution Executive Summary", VERSION,
-				    argc, argv, oaf_popt_options, 0, NULL);
-	orb = oaf_init (argc, argv);
-
-	gdk_rgb_init ();
-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
-		g_error (_("Executive summary component could not initialize Bonobo.\n"));
-		exit (1);
-	}
-
-	gconf_init (argc, argv, NULL);
-
-	glade_gnome_init ();
+	gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+			    GNOME_PROGRAM_STANDARD_PROPERTIES,
+			    GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution Summary"),
+			    NULL);
 
 	e_cursors_init ();
 
-	e_proxy_init ();
-	
-	gtk_widget_push_visual (gdk_rgb_get_visual ());
-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());
-
 	/* Start our component */
 	component_factory_init ();