#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, 9 insertions, 6 deletions

diff --git a/my-evolution/component-factory.c b/my-evolution/component-factory.c
index eddc7ad82c..bb58f29c65 100644
--- a/my-evolution/component-factory.c
+++ b/my-evolution/component-factory.c
@@ -34,6 +34,8 @@
 
 #include <gal/widgets/e-gui-utils.h>
 
+#include <gtk/gtkmain.h>
+
 #include "e-summary-factory.h"
 #include "e-summary-offline-handler.h"
 #include "e-summary.h"
@@ -127,6 +129,7 @@ component_destroy (BonoboObject *factory,
 
 static BonoboObject *
 create_component (BonoboGenericFactory *factory,
+		  const char *id,
 		  void *data)
 {
 	EvolutionShellComponent *shell_component;
@@ -145,12 +148,10 @@ create_component (BonoboGenericFactory *factory,
 							 NULL, NULL,
 							 NULL, NULL,
 							 NULL, NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",
-			    GTK_SIGNAL_FUNC (component_destroy), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",
-			    GTK_SIGNAL_FUNC (owner_set_cb), NULL);
-	gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",
-			    GTK_SIGNAL_FUNC (owner_unset_cb), NULL);
+
+	g_signal_connect (shell_component, "destroy", G_CALLBACK (component_destroy), NULL);
+	g_signal_connect (shell_component, "owner_set", G_CALLBACK (owner_set_cb), NULL);
+	g_signal_connect (shell_component, "owner_unset", G_CALLBACK (owner_unset_cb), NULL);
 
 	offline_handler = e_summary_offline_handler_new ();
 	gtk_object_set_data (GTK_OBJECT (shell_component), "offline-handler",
@@ -174,5 +175,7 @@ component_factory_init (void)
 		g_error ("Cannot register Evolution Summary component factory.");
 }
 
+#if 0
 /* Factory for the shlib case.  */
 BONOBO_OAF_SHLIB_FACTORY (COMPONENT_FACTORY_ID, "Evolution Summary component", create_component, NULL)
+#endif