Massive code cleanup (bug #429422)

svn path=/trunk/; revision=33432

7 files changed, 30 insertions, 9 deletions

diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 1cbcaed5ba..0599190ebe 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -32,7 +32,6 @@
 
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-gtk-utils.h>
 #include <glade/glade.h>
 #include <gtk/gtkbox.h>
 #include <gtk/gtkdialog.h>
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index cfb9a4559b..b3b21093d9 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -27,7 +27,6 @@
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
-#include <e-util/e-gtk-utils.h>
 #include <e-util/e-dialog-utils.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbox.h>
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index bf8304d5b7..603fb87899 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #429422
+
+	* status-track.c (track_status):
+	Use gtk_widget_set_size_request() instead of gtk_widget_set_usize().
+
 2007-03-30  Sankar P  <psankar@novell.com>
 
 	* status-track.c: (format_date), (track_status):
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index f3abf9bc24..e25b63c148 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -229,7 +229,7 @@ track_status (EPopup *ep, EPopupItem *item, void *data)
 	}
 
 	/*set size and display the dialog*/
-	gtk_widget_set_usize (GTK_WIDGET (win), 400, 300);
+	gtk_widget_set_size_request (GTK_WIDGET (win), 400, 300);
 	gtk_widget_show_all (GTK_WIDGET (d));
 	if (gtk_dialog_run (d) == GTK_RESPONSE_OK)
 		gtk_widget_destroy (GTK_WIDGET (d));
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index d74387a828..c91e6b9927 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #429422
+
+	* itip-view.c (set_one_button):
+	e_gtk_button_new_with_icon() is dead; just do it manually.
+
+	* itip-view.c (itip_view_class_init):
+	Use g_cclosure_marshal_VOID__INT instead of gtk_marshal_NONE__INT.
+
 2007-03-29  Matthew Barnes  <mbarnes@redhat.com>
 
 	* itip-formatter.c:
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 0a20ea43d3..63fa11211e 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -43,7 +43,6 @@
 #include <mail/em-format-html.h>
 #include <libedataserver/e-account-list.h>
 #include <e-util/e-icon-factory.h>
-#include <e-util/e-gtk-utils.h>
 #include <e-util/e-util.h>
 #include <calendar/gui/itip-utils.h>
 #include "itip-view.h"
@@ -729,15 +728,23 @@ set_one_button (ItipView *view, char *label, char *stock_id, ItipViewResponse re
 {
 	ItipViewPrivate *priv;
 	GtkWidget *button;
+	GtkWidget *image;
+	gpointer data;
 	
 	priv = view->priv;
 
-	button = e_gtk_button_new_with_icon (label, stock_id);
-	g_object_set_data (G_OBJECT (button), DATA_RESPONSE_KEY, GINT_TO_POINTER (response));
+	button = gtk_button_new_with_mnemonic (label);
+	image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (button, image);
+
+	data = GINT_TO_POINTER (response);
+	g_object_set_data (button, DATA_RESPONSE_KEY, data);
+
 	gtk_widget_show (button);
 	gtk_container_add (GTK_CONTAINER (priv->button_box), button);
 
-	g_signal_connect (button, "clicked", G_CALLBACK (button_clicked_cb), view);
+	g_signal_connect (
+		button, "clicked", G_CALLBACK (button_clicked_cb), view);
 }
 
 static void
@@ -852,7 +859,7 @@ itip_view_class_init (ItipViewClass *klass)
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (ItipViewClass, response),
 			      NULL, NULL,
-			      gtk_marshal_NONE__INT,
+			      g_cclosure_marshal_VOID__INT,
 			      G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index f3cfb2ac39..61739d4def 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -24,7 +24,6 @@
 #include <libgnomeui/libgnomeui.h>
 #include "widgets/e-timezone-dialog/e-timezone-dialog.h"
 #include "e-util/e-icon-factory.h"
-#include "e-util/e-gtk-utils.h"
 #include "e-util/e-error.h"
 #include "e-util/e-import.h"
 #include "shell/es-event.h"