From c88d7c4d1ec2aa50ae91f8b558ccdc6142aa9202 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 2 Dec 2002 03:19:25 +0000 Subject: GNOME_STOCK_*NEXT/PREV -> GTK_STOCK_*GO_BACK/FORWARD. 2002-11-27 Not Zed * e-summary-shown.c (e_summary_shown_init): GNOME_STOCK_*NEXT/PREV -> GTK_STOCK_*GO_BACK/FORWARD. * e-summary.[ch]: ran fix.sh over this. svn path=/trunk/; revision=18975 --- my-evolution/ChangeLog | 7 +++++++ my-evolution/e-summary-shown.c | 4 ++-- my-evolution/e-summary.c | 4 ++-- my-evolution/e-summary.h | 8 ++++---- 4 files changed, 15 insertions(+), 8 deletions(-) (limited to 'my-evolution') diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog index 427a2e2989..b157cc9585 100644 --- a/my-evolution/ChangeLog +++ b/my-evolution/ChangeLog @@ -1,3 +1,10 @@ +2002-11-27 Not Zed + + * e-summary-shown.c (e_summary_shown_init): GNOME_STOCK_*NEXT/PREV -> + GTK_STOCK_*GO_BACK/FORWARD. + + * e-summary.[ch]: ran fix.sh over this. + 2002-11-25 Ettore Perazzoli * component-factory.c (component_destroy): Removed. diff --git a/my-evolution/e-summary-shown.c b/my-evolution/e-summary-shown.c index 049f49fc6e..4bdd06e065 100644 --- a/my-evolution/e-summary-shown.c +++ b/my-evolution/e-summary-shown.c @@ -530,13 +530,13 @@ e_summary_shown_init (ESummaryShown *shown) gtk_box_pack_start (GTK_BOX (shown), align, FALSE, FALSE, 3); /* Fixme: nice GFX version */ - priv->add = construct_pixmap_button (_("Add"), GNOME_STOCK_BUTTON_NEXT); + priv->add = construct_pixmap_button (_("Add"), GTK_STOCK_GO_FORWARD); gtk_widget_set_sensitive (priv->add, FALSE); gtk_box_pack_start (GTK_BOX (vbox), priv->add, TRUE, FALSE, 0); g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked), shown); /* Fixme: Ditto */ - priv->remove = construct_pixmap_button (_("Remove"), GNOME_STOCK_BUTTON_PREV); + priv->remove = construct_pixmap_button (_("Remove"), GTK_STOCK_GO_BACK); gtk_widget_set_sensitive (priv->remove, FALSE); gtk_box_pack_start (GTK_BOX (vbox), priv->remove, TRUE, FALSE, 0); g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked), shown); diff --git a/my-evolution/e-summary.c b/my-evolution/e-summary.c index 274b469cd6..4a47313e3d 100644 --- a/my-evolution/e-summary.c +++ b/my-evolution/e-summary.c @@ -465,7 +465,7 @@ e_summary_class_init (GtkObjectClass *object_class) { object_class->destroy = destroy; - e_summary_parent_class = gtk_type_class (PARENT_TYPE); + e_summary_parent_class = g_type_class_ref(PARENT_TYPE); } static void @@ -622,7 +622,7 @@ do_summary_print (ESummary *summary, int result = gnome_print_master_print (print_master); if (result == -1) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("Printing of Summary failed")); } } diff --git a/my-evolution/e-summary.h b/my-evolution/e-summary.h index f787ca4814..09aea33114 100644 --- a/my-evolution/e-summary.h +++ b/my-evolution/e-summary.h @@ -37,10 +37,10 @@ #include #define E_SUMMARY_TYPE (e_summary_get_type ()) -#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary)) -#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass)) -#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE)) -#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE)) +#define E_SUMMARY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_SUMMARY_TYPE, ESummary)) +#define E_SUMMARY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass)) +#define IS_E_SUMMARY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_SUMMARY_TYPE)) +#define IS_E_SUMMARY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE)) typedef struct _ESummaryPrivate ESummaryPrivate; typedef struct _ESummaryClass ESummaryClass; -- cgit v1.2.3