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

diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c
index 340488f2da..4896083198 100644
--- a/my-evolution/e-summary-shown.c
+++ b/my-evolution/e-summary-shown.c
@@ -27,9 +27,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <gtk/gtkhbox.h>
+#include <gtk/gtkalignment.h>
+#include <gtk/gtkbutton.h>
 #include <gtk/gtkenums.h>
+#include <gtk/gtkhbox.h>
+#include <gtk/gtkimage.h>
+#include <gtk/gtklabel.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtkstock.h>
+#include <gtk/gtkvbox.h>
 
 #include <gal/util/e-util.h>
 #include <gal/widgets/e-gui-utils.h>
@@ -48,8 +54,6 @@
 #include <gal/e-table/e-tree-table-adapter.h>
 
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-init.h>
-#include <libgnomeui/gnome-stock.h>
 
 #include "e-summary-shown.h"
 
@@ -204,18 +208,17 @@ e_summary_shown_class_init (GtkObjectClass *object_class)
 
 	shown_signals[ITEM_CHANGED] = gtk_signal_new ("item-changed",
 						      GTK_RUN_LAST,
-						      object_class->type,
+						      GTK_CLASS_TYPE (object_class),
 						      GTK_SIGNAL_OFFSET (ESummaryShownClass, item_changed),
 						      gtk_marshal_NONE__NONE,
 						      GTK_TYPE_NONE, 0);
 	shown_signals[SELECTION_CHANGED] = gtk_signal_new ("selection-changed",
 							   GTK_RUN_LAST,
-							   object_class->type,
+							   GTK_CLASS_TYPE (object_class),
 							   GTK_SIGNAL_OFFSET (ESummaryShownClass, selection_changed),
 							   gtk_marshal_NONE__POINTER,
 							   GTK_TYPE_NONE, 1,
 							   GTK_TYPE_POINTER);
-	gtk_object_class_add_signals (object_class, shown_signals, LAST_SIGNAL);
 }
 
 static gboolean
@@ -483,12 +486,12 @@ static GtkWidget *
 construct_pixmap_button (const char *text,
 			 const char *image)
 {
-	GtkWidget *box, *button, *pixmap, *label;
+	GtkWidget *box, *button, *image_widget, *label;
 
 	box = gtk_hbox_new (FALSE, 1);
 
-	pixmap = gnome_stock_pixmap_widget (NULL, image);
-	gtk_box_pack_start (GTK_BOX (box), pixmap, FALSE, FALSE, 0);
+	image_widget = gtk_image_new_from_stock (image, 48);
+	gtk_box_pack_start (GTK_BOX (box), image_widget, FALSE, FALSE, 0);
 	
 	label = gtk_label_new (text);
 	gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
@@ -683,5 +686,3 @@ e_summary_shown_get_selection (ESummaryShown *shown,
 
 	return list;
 }
-	
-