From 0e0185635f94d23443341fe15dd8fef4951e8db6 Mon Sep 17 00:00:00 2001
From: Chris Toshok <toshok@ximian.com>
Date: Sat, 9 Nov 2002 03:55:02 +0000
Subject: oops, missed these casts.

2002-11-08  Chris Toshok  <toshok@ximian.com>

	* gui/widgets/e-addressbook-reflow-adapter.c
	(addressbook_get_property): oops, missed these casts.

	* gui/component/addressbook.c (get_master_list): remove the
	PENDING_PORT_WORK ifdef, just ported ECategoriesMasterList.
	(make_suboptions): same.

	* gui/contact-editor/e-contact-editor.c (categories_clicked):
	same.

svn path=/trunk/; revision=18684
---
 addressbook/gui/contact-editor/e-contact-editor.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'addressbook/gui/contact-editor')

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index f9d541df45..c78715008c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -28,6 +28,7 @@
 #include <gtk/gtkcheckmenuitem.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktextview.h>
+#include <gtk/gtkmessagedialog.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <libgnomeui/gnome-window-icon.h>
 #include <libgnome/gnome-i18n.h>
@@ -849,7 +850,6 @@ full_addr_clicked(GtkWidget *button, EContactEditor *editor)
 static void
 categories_clicked(GtkWidget *button, EContactEditor *editor)
 {
-#ifdef PENDING_PORT_WORK
 	char *categories = NULL;
 	GtkDialog *dialog;
 	int result;
@@ -866,7 +866,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 	if (dialog == NULL) {
 		GtkWidget *uh_oh = gtk_message_dialog_new (NULL,
 							   0, GTK_MESSAGE_ERROR,
-							   GTK_RESPONSE_OK
+							   GTK_RESPONSE_OK,
 							   _("Category editor not available."),
 							   NULL);
 		gtk_widget_show (uh_oh);
@@ -895,7 +895,6 @@ categories_clicked(GtkWidget *button, EContactEditor *editor)
 		g_free(categories);
 	}
 	gtk_widget_destroy(GTK_WIDGET(dialog));
-#endif
 }
 
 static void
-- 
cgit v1.2.3