From cb46b4039bff5dce4748800950d43d1b1957dbce Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Tue, 25 Mar 2003 15:48:09 +0000
Subject: #include gtkarrow.h Likewise

	* e-calendar.c: #include gtkarrow.h
	* e-combo-button.c: Likewise

	* e-charset-picker.c: Update for e_notice move

svn path=/trunk/; revision=20499
---
 widgets/misc/ChangeLog          | 7 +++++++
 widgets/misc/e-calendar.c       | 1 +
 widgets/misc/e-charset-picker.c | 4 ++--
 widgets/misc/e-combo-button.c   | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'widgets/misc')

diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 97671defa3..45c2e10737 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-25  Dan Winship  <danw@ximian.com>
+
+	* e-calendar.c: #include gtkarrow.h
+	* e-combo-button.c: Likewise
+
+	* e-charset-picker.c: Update for e_notice move
+
 2003-03-19  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* e-filter-bar.c: Updated to use GtkDialog instead of
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 0275679f1f..64bffa02d9 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -34,6 +34,7 @@
 #include "e-calendar.h"
 
 #include <glib.h>
+#include <gtk/gtkarrow.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtkpixmap.h>
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index dcc3589367..bc0513b248 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -23,7 +23,7 @@
 #endif
 
 #include "e-charset-picker.h"
-#include <gal/widgets/e-gui-utils.h>
+#include "e-util/e-dialog-utils.h"
 
 #include <string.h>
 #include <iconv.h>
@@ -181,7 +181,7 @@ add_other_charset (GtkWidget *menu, GtkWidget *other, char *new_charset)
 	ic = iconv_open ("UTF-8", new_charset);
 	if (ic == (iconv_t)-1) {
 		GtkWidget *window = gtk_widget_get_ancestor (other, GTK_TYPE_WINDOW);
-		e_notice (GTK_WINDOW (window), GTK_MESSAGE_ERROR,
+		e_notice (window, GTK_MESSAGE_ERROR,
 			  _("Unknown character set: %s"), new_charset);
 		return FALSE;
 	}
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index 09a8aba46f..33b89d9943 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -26,6 +26,7 @@
 
 #include "e-combo-button.h"
 
+#include <gtk/gtkarrow.h>
 #include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkmain.h>
-- 
cgit v1.2.3