pass extra pixbuf param

2002-11-07  JP Rosevear  <jpr@ximian.com>

	* e-categories-config.c (e_categories_config_get_icon_for): pass
	extra pixbuf param

	* e-categories-config.h: use G_*_DECLS

	* e-dialog-utils.c (save_ok): update g_file_test params

	* Makefile.am: Compile some additional files

svn path=/trunk/; revision=18646

5 files changed, 21 insertions, 7 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 2bc98e4550..5dfc05413d 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-07  JP Rosevear  <jpr@ximian.com>
+
+	* e-categories-config.c (e_categories_config_get_icon_for): pass
+	extra pixbuf param
+
+	* e-categories-config.h: use G_*_DECLS
+
+	* e-dialog-utils.c (save_ok): update g_file_test params
+
+	* Makefile.am: Compile some additional files
+
 2002-11-06  Chris Toshok  <toshok@ximian.com>
 
 	* e-config-listener.c (e_config_listener_set_boolean): init err to
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 04ee7ee7b0..69d582522a 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -43,9 +43,11 @@ eutilinclude_HEADERS = 				\
 
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
+	e-categories-config.c			\
 	e-component-listener.c			\
 	e-config-listener.c			\
 	e-corba-utils.c				\
+	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-gtk-utils.c				\
 	e-gui-utils.c				\
@@ -84,7 +86,6 @@ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
 # FIXME TODO
 #	e-categories-config.c
 #	e-categories-master-list-wombat.[ch]
-#	e-dialog-utils.c
 #	e-passwords.c
 #	e-proxy.c
 #       bonobo-factory-util.[ch]
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 9a88373e95..987badebf9 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -26,7 +26,9 @@ initialize_categories_config (void)
 {
 	g_return_if_fail (initialized == FALSE);
 
+#if 0
 	ecmlw = E_CATEGORIES_MASTER_LIST_WOMBAT (e_categories_master_list_wombat_new ());
+#endif
 	icons_table = g_hash_table_new (g_str_hash, g_str_equal);
 	/* FIXME: must free the two objects above when exiting */
 
@@ -103,7 +105,7 @@ e_categories_config_get_icon_for (const char *category, GdkPixmap **pixmap, GdkB
 	/* load the icon in our list */
 	pixbuf = g_hash_table_lookup (icons_table, icon_file);
 	if (!pixbuf) {
-		pixbuf = gdk_pixbuf_new_from_file (icon_file);
+		pixbuf = gdk_pixbuf_new_from_file (icon_file, NULL);
 		if (!pixbuf) {
 			*pixmap = NULL;
 			if (mask != NULL)
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index 2ec8019044..3af14dfc7f 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -15,7 +15,7 @@
 #include <gdk/gdk.h>
 #include <gtk/gtkentry.h>
 
-BEGIN_GNOME_DECLS
+G_BEGIN_DECLS
 
 const char *e_categories_config_get_color_for (const char *category);
 void e_categories_config_set_color_for (const char *category, const char *color);
@@ -29,6 +29,6 @@ void e_categories_config_set_icon_for (const char *category,
 
 void e_categories_config_open_dialog_for_entry (GtkEntry *entry);
 
-END_GNOME_DECLS
+G_END_DECLS
 
 #endif
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 4e77cce646..47b80c87e6 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -26,6 +26,7 @@
 
 #include "widgets/misc/e-bonobo-widget.h"
 
+#include <glib.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkprivate.h>
 #include <gdk/gdk.h>
@@ -34,7 +35,6 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkfilesel.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-dialog-util.h>
@@ -225,13 +225,13 @@ save_ok (GtkWidget *widget, gpointer data)
 {
 	GtkWidget *fs;
 	char **filename = data;
-	char *path;
+	const char *path;
 	int btn = GNOME_YES;
 
 	fs = gtk_widget_get_toplevel (widget);
 	path = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
 
-	if (g_file_test (path, G_FILE_TEST_ISFILE)) {
+	if (g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
 		GtkWidget *dlg;
 
 		dlg = gnome_question_dialog_modal (_("A file by that name already exists.\n"