#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, 8 insertions, 12 deletions

diff --git a/my-evolution/e-summary-factory.c b/my-evolution/e-summary-factory.c
index 2a181aba74..a7a0018833 100644
--- a/my-evolution/e-summary-factory.c
+++ b/my-evolution/e-summary-factory.c
@@ -57,15 +57,14 @@ control_activate (BonoboControl *control,
 {
 	Bonobo_UIContainer container;
 
-	container = bonobo_control_get_remote_ui_container (control);
-	bonobo_ui_component_set_container (ui_component, container);
+	container = bonobo_control_get_remote_ui_container (control, NULL);
+	bonobo_ui_component_set_container (ui_component, container, NULL);
 	bonobo_object_release_unref (container, NULL);
 
 	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, summary);
 	bonobo_ui_component_freeze (ui_component, NULL);
 
-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,
-			       "my-evolution.xml", "my-evolution");
+	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR, "my-evolution.xml", "my-evolution", NULL);
   	e_pixmaps_update (ui_component, pixmaps); 
 
 	bonobo_ui_component_thaw (ui_component, NULL);
@@ -76,7 +75,7 @@ control_deactivate (BonoboControl *control,
 		    BonoboUIComponent *ui_component,
 		    ESummary *summary)
 {
-	bonobo_ui_component_unset_container (ui_component);
+	bonobo_ui_component_unset_container (ui_component, NULL);
 }
 
 static void
@@ -92,10 +91,9 @@ control_activate_cb (BonoboControl *control,
 		Bonobo_ControlFrame control_frame;
 		CORBA_Environment ev;
 
-		control_frame = bonobo_control_get_control_frame (control);
-		if (control_frame == NULL) {
+		control_frame = bonobo_control_get_control_frame (control, NULL);
+		if (control_frame == NULL)
 			goto out;
-		}
 
 		CORBA_exception_init (&ev);
 		summary->shell_view_interface = Bonobo_Unknown_queryInterface (control_frame, "IDL:GNOME/Evolution/ShellView:1.0", &ev);
@@ -145,10 +143,8 @@ e_summary_factory_new_control (const char *uri,
 		return NULL;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (control), "activate",
-			    control_activate_cb, summary);
-	gtk_signal_connect (GTK_OBJECT (control), "destroy",
-			    control_destroy_cb, summary);
+	g_signal_connect (control, "activate", G_CALLBACK (control_activate_cb), summary);
+	g_signal_connect (control, "destroy", G_CALLBACK (control_destroy_cb), summary);
 
 	/* FIXME: We register the factory here as it needs the summary object.
 	   Sigh, this is really wrong.  */