Remove the --enable-file-chooser configure option.

GtkFileChooser has been around since 2004.

svn path=/trunk/; revision=34257

22 files changed, 83 insertions, 280 deletions

diff --git a/ChangeLog b/ChangeLog
index e1ef0d8b56..951fb6cde0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Remove the --enable-file-chooser option.
+	GtkFileChooser has been around since 2004.
+
 2007-09-11  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6bac422bf0..2ddfeaf1b2 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* gui/widgets/eab-gui-util.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-09-07  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #473903
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 8d44cb5fa7..212225b3e5 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2713,11 +2713,7 @@ image_selected (EContactEditor *editor)
 	gchar     *file_name;
 	GtkWidget *image_chooser;
 
-#ifdef USE_GTKFILECHOOSER
 	file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (editor->file_selector));
-#else
-	file_name = (gchar *) gtk_file_selection_get_filename (GTK_FILE_SELECTION (editor->file_selector));
-#endif
 
 	if (!file_name)
 		return;
@@ -2754,8 +2750,6 @@ image_cleared (EContactEditor *editor)
 	object_changed (G_OBJECT (image_chooser), editor);
 }
 
-#ifdef USE_GTKFILECHOOSER
-
 static void
 file_chooser_response (GtkWidget *widget, gint response, EContactEditor *editor)
 {
@@ -2767,8 +2761,6 @@ file_chooser_response (GtkWidget *widget, gint response, EContactEditor *editor)
 	gtk_widget_hide (editor->file_selector);
 }
 
-#endif
-
 static gboolean
 file_selector_deleted (GtkWidget *widget)
 {
@@ -2813,7 +2805,6 @@ image_clicked (GtkWidget *button, EContactEditor *editor)
 	GtkImage *preview;
 
 	if (!editor->file_selector) {
-#ifdef USE_GTKFILECHOOSER
 		editor->file_selector = gtk_file_chooser_dialog_new (title,
 								     GTK_WINDOW (editor->app),
 								     GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -2831,35 +2822,6 @@ image_clicked (GtkWidget *button, EContactEditor *editor)
 
 		g_signal_connect (editor->file_selector, "response",
 				  G_CALLBACK (file_chooser_response), editor);
-#else
-		GtkWidget *clear_button;
-		GtkWidget *dialog;
-
-		/* Create the selector */
-
-		editor->file_selector = gtk_file_selection_new (title);
-
-		dialog = GTK_FILE_SELECTION (editor->file_selector)->fileop_dialog;
-
-		clear_button = gtk_dialog_add_button (GTK_DIALOG (editor->file_selector), no_image, 0);
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->ok_button),
-					  "clicked", G_CALLBACK (image_selected), editor);
-
-		g_signal_connect_swapped (clear_button,
-					  "clicked", G_CALLBACK (image_cleared), editor);
-
-		/* Ensure that the dialog box gets hidden when the user clicks a button */
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->ok_button),
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-
-		g_signal_connect_swapped (GTK_OBJECT (GTK_FILE_SELECTION (editor->file_selector)->cancel_button),
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-
-		g_signal_connect_swapped (clear_button,
-					  "clicked", G_CALLBACK (gtk_widget_hide), editor->file_selector); 
-#endif
 
 		g_signal_connect_after (editor->file_selector,
 					"delete-event", G_CALLBACK (file_selector_deleted),
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 52861a2800..e3c23c0105 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -352,12 +352,8 @@ save_it(GtkWidget *widget, SaveAsInfo *info)
 	gint response = 0;
 	
 
-#ifdef USE_GTKFILECHOOSER
 	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (info->filesel));
 	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (info->filesel));	
-#else
-	filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (info->filesel));
-#endif
 	
 	if (filename && g_file_test (filename, G_FILE_TEST_EXISTS)) {
 		response = file_exists(GTK_WINDOW (info->filesel), filename);
@@ -409,7 +405,6 @@ destroy_it(void *data, GObject *where_the_object_was)
 	g_free (info);
 }
 
-#ifdef USE_GTKFILECHOOSER
 static void
 filechooser_response (GtkWidget *widget, gint response_id, SaveAsInfo *info)
 {
@@ -418,7 +413,6 @@ filechooser_response (GtkWidget *widget, gint response_id, SaveAsInfo *info)
 	else
 		close_it (widget, info);
 }
-#endif
 
 static char *
 make_safe_filename (char *name)
@@ -511,9 +505,7 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
 	GtkWidget *filesel;
 	char *file;
 	char *name;
-#ifndef USE_GTKFILECHOOSER
 	char *full_filename;
-#endif
 	SaveAsInfo *info = g_new(SaveAsInfo, 1);
 
 	name = e_contact_get (contact, E_CONTACT_FILE_AS);
@@ -521,7 +513,6 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
 
 	info->has_multiple_contacts = FALSE;
 
-#ifdef USE_GTKFILECHOOSER
 	filesel = gtk_file_chooser_dialog_new (title,
 					       parent_window,
 					       GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -540,22 +531,6 @@ eab_contact_save (char *title, EContact *contact, GtkWindow *parent_window)
 	g_signal_connect (G_OBJECT (filesel), "response",
 			  G_CALLBACK (filechooser_response), info);
 	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#else
-	filesel = gtk_file_selection_new (title);
-
-	full_filename = g_strdup_printf ("%s/%s", g_get_home_dir (), file);
-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), full_filename);
-	g_free (full_filename);
-	
-	info->filesel = filesel;
-	info->vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
-
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#endif
 
 	if (parent_window) {
 		gtk_window_set_transient_for (GTK_WINDOW (filesel),
@@ -573,11 +548,8 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
 	GtkWidget *filesel;
 	SaveAsInfo *info = g_new(SaveAsInfo, 1);
 	char *file;
-#ifndef USE_GTKFILECHOOSER
 	char *full_filename;
-#endif
 
-#ifdef USE_GTKFILECHOOSER
 	filesel = gtk_file_chooser_dialog_new (title,
 					       parent_window,
 					       GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -586,9 +558,6 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
 					       NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_ACCEPT);
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (filesel), FALSE);
-#else
-	filesel = gtk_file_selection_new(title);
-#endif
 
 	/* Check if the list has more than one contact */
 	if (g_list_next (list))
@@ -608,29 +577,15 @@ eab_contact_list_save (char *title, GList *list, GtkWindow *parent_window)
 		file = make_safe_filename (_("list"));
 	}
 
-#ifdef USE_GTKFILECHOOSER
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filesel), g_get_home_dir ());
 	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (filesel), file);
-#else
-	full_filename = g_strdup_printf ("%s/%s", g_get_home_dir (), file);
-	gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), full_filename);
-	g_free (full_filename);
-#endif
 
 	info->filesel = filesel;
 	info->vcard = eab_contact_list_to_string (list);
 
-#ifdef USE_GTKFILECHOOSER
 	g_signal_connect (G_OBJECT (filesel), "response",
 			  G_CALLBACK (filechooser_response), info);
 	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#else
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button), "clicked",
-			 G_CALLBACK (save_it), info);
-	g_signal_connect(G_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button), "clicked",
-			 G_CALLBACK (close_it), info);
-	g_object_weak_ref (G_OBJECT (filesel), destroy_it, info);
-#endif
 
 	if (parent_window) {
 		gtk_window_set_transient_for (GTK_WINDOW (filesel),
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e8a67407c4..ca76346366 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* gui/dialogs/cal-attachment-select-file.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #476040
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 77f5f92d8a..720abb10ef 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -36,13 +36,9 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkversion.h>
 
-#ifdef USE_GTKFILECHOOSER
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkstock.h>
-#else
-#include <gtk/gtkfilesel.h>
-#endif
 
 #include <libgnomeui/gnome-uidefs.h>
 #include <glib/gi18n.h>
@@ -65,7 +61,6 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 	
 	path = g_object_get_data ((GObject *) editor, "attach_path");
 	
-#ifdef USE_GTKFILECHOOSER
 	if (flags & SELECTOR_MODE_SAVE)
 		selection = gtk_file_chooser_dialog_new (title,
 							 NULL,
@@ -98,26 +93,6 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 		gtk_widget_show (showinline);
 		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
         }
-#else
-	selection = gtk_file_selection_new (title);
-	
-	gtk_file_selection_set_select_multiple ((GtkFileSelection *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path) {
-		path = g_strdup_printf ("%s/", g_get_home_dir ());
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-		g_free (path);
-	} else {
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-	}
-	
-	if (showinline_p) {
-		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
-	}
-#endif
 	
 	gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) editor);
 	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
@@ -134,11 +109,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 		if (showinline_p)
 			*showinline_p = gtk_toggle_button_get_active ((GtkToggleButton *) showinline);
 		
-#ifdef USE_GTKFILECHOOSER
 		path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
-#else
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selection)));
-#endif
 		
 		g_object_set_data_full ((GObject *) editor, "attach_path", g_strdup_printf ("%s/", path), g_free);
 		g_free (path);
@@ -171,11 +142,7 @@ comp_editor_select_file (CompEditor *editor, const char *title, gboolean save_mo
 	
 	selection = run_selector (editor, title, flags, NULL);
 	if (selection) {
-#ifdef USE_GTKFILECHOOSER
 		name = g_strdup (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selection)));
-#else
-		name = g_strdup (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selection)));
-#endif
 		gtk_widget_destroy (selection);
 	}
 
@@ -191,7 +158,6 @@ comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p)
 	selection = run_selector (editor, _("Attach file(s)"), SELECTOR_MODE_MULTI, showinline_p);
 	
 	if (selection) {
-#ifdef USE_GTKFILECHOOSER
 		GSList *l, *n;
 		
 		if ((l = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (selection)))) {
@@ -204,18 +170,6 @@ comp_editor_select_file_attachments (CompEditor *editor, gboolean *showinline_p)
 				l = n;
 			}
 		}
-#else
-		char **files;
-		int i;
-		
-		if ((files = gtk_file_selection_get_selections (GTK_FILE_SELECTION (selection)))) {
-			list = g_ptr_array_new ();
-			for (i = 0; files[i]; i++)
-				g_ptr_array_add (list, files[i]);
-			
-			g_free (files);
-		}
-#endif
 		
 		gtk_widget_destroy (selection);
 	}
diff --git a/composer/ChangeLog b/composer/ChangeLog
index bd4cad3a76..371fd1cd7f 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* e-msg-composer-select-file.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-09-12  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #476040
diff --git a/composer/e-msg-composer-select-file.c b/composer/e-msg-composer-select-file.c
index cf3be43b33..302897d517 100644
--- a/composer/e-msg-composer-select-file.c
+++ b/composer/e-msg-composer-select-file.c
@@ -32,13 +32,9 @@
 #include <gtk/gtksignal.h>
 #include <gtk/gtkversion.h>
 
-#ifdef USE_GTKFILECHOOSER
 #include <gtk/gtkfilechooser.h>
 #include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkstock.h>
-#else
-#include <gtk/gtkfilesel.h>
-#endif
 
 #include <libgnomeui/gnome-uidefs.h>
 #include <glib/gi18n.h>
@@ -66,7 +62,6 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
 	
 	path = g_object_get_data ((GObject *) composer, "attach_path");
 	
-#ifdef USE_GTKFILECHOOSER
 	if (flags & SELECTOR_MODE_SAVE)
 		selection = gtk_file_chooser_dialog_new (title,
 							 NULL,
@@ -100,27 +95,6 @@ get_selector(struct _EMsgComposer *composer, const char *title, guint32 flags)
 		gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (selection), showinline);
 		g_object_set_data((GObject *)selection, "show-inline", showinline);
         }
-#else
-	selection = gtk_file_selection_new (title);
-	
-	gtk_file_selection_set_select_multiple ((GtkFileSelection *) selection, (flags & SELECTOR_MODE_MULTI));
-	
-	/* restore last path used */
-	if (!path) {
-		path = g_strdup_printf ("%s/", g_get_home_dir ());
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-		g_free (path);
-	} else {
-		gtk_file_selection_set_filename (GTK_FILE_SELECTION (selection), path);
-	}
-	
-        if (flags & SELECTOR_SHOW_INLINE) {
-		showinline = gtk_check_button_new_with_mnemonic (_("_Suggest automatic display of attachment"));
-		gtk_widget_show (showinline);
-		gtk_box_pack_end (GTK_BOX (GTK_FILE_SELECTION (selection)->main_vbox), showinline, FALSE, FALSE, 4);
-		g_object_set_data((GObject *)selection, "show-inline", showinline);
-	}
-#endif
 	
 	gtk_window_set_transient_for ((GtkWindow *) selection, (GtkWindow *) composer);
 	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer");
@@ -144,13 +118,8 @@ select_file_response(GtkWidget *selector, guint response, struct _EMsgComposer *
 		char *path;
 		EMsgComposerSelectFileFunc func = g_object_get_data((GObject *)selector, "callback");
 
-#ifdef USE_GTKFILECHOOSER
 		name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector));
 		path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector)));
-#else
-		name = gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector));
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector)));
-#endif
 		g_object_set_data_full ((GObject *) composer, "attach_path", path, g_free);
 
 		func(composer, name);
@@ -195,7 +164,6 @@ select_attach_response(GtkWidget *selector, guint response, struct _EMsgComposer
 		GtkToggleButton *showinline = g_object_get_data((GObject *)selector, "show-inline");
 		char *path = NULL;
 		
-#ifdef USE_GTKFILECHOOSER
 		char *filename = NULL;
 		names = gtk_file_chooser_get_uris (GTK_FILE_CHOOSER (selector));
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (selector));
@@ -203,21 +171,6 @@ select_attach_response(GtkWidget *selector, guint response, struct _EMsgComposer
 			path = g_path_get_dirname (filename);
 			g_free (filename);
 		}
-#else
-		char **files;
-		int i;
-		
-		names = NULL;
-		if ((files = gtk_file_selection_get_selections (GTK_FILE_SELECTION (selector)))) {
-			for (i = 0; files[i]; i++)
-				names = g_slist_prepend(names, files[i]);
-			
-			g_free (files);
-			names = g_slist_reverse(names);
-		}
-
-		path = g_path_get_dirname (gtk_file_selection_get_filename (GTK_FILE_SELECTION (selector)));		
-#endif
 		if (path)
 			g_object_set_data_full ((GObject *) composer, "attach_path", path, g_free);
 
diff --git a/configure.in b/configure.in
index 4a490af24b..d81022fbc9 100644
--- a/configure.in
+++ b/configure.in
@@ -1354,18 +1354,6 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [
 	$1_LIBS="[$]$1_LIBS $4"
 ])
 
-dnl enable USE_GTKFILECHOOSER if gtk version is > 2.4.0
-AC_ARG_ENABLE([file-chooser],
-	      AC_HELP_STRING([--enable-file-chooser],
-			     [Enable the usage of the GtkFileChooser in place of the GtkFileSelection dialog]),
-	      [enable_file_chooser=$enableval],[enable_file_chooser=yes])
-
-if test "x$enable_file_chooser" = "xyes"; then
-  if pkg-config --atleast-version=2.4.0 gtk+-2.0; then
-    AC_DEFINE(USE_GTKFILECHOOSER,1,[Use new GtkFileChooser])
-  fi
-fi
-
 dnl --- Required version numbers
 
 BONOBOUI_REQUIRED=libbonoboui_minimum_version
diff --git a/filter/ChangeLog b/filter/ChangeLog
index ccbe4b0e11..7801937c0c 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* filter-file.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-09-12  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #473514
diff --git a/filter/filter-file.c b/filter/filter-file.c
index 1c7a76a180..ec4c736479 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -274,11 +274,7 @@ filename_changed (GtkWidget *widget, FilterElement *fe)
 	FilterFile *file = (FilterFile *) fe;
 	const char *new;
 	
-#ifdef USE_GTKFILECHOOSER
 	new = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-#else
-	new = gtk_entry_get_text (GTK_ENTRY (widget));
-#endif
 	g_free (file->path);
 	file->path = g_strdup (new);
 }
@@ -288,26 +284,12 @@ get_widget (FilterElement *fe)
 {
 	FilterFile *file = (FilterFile *) fe;
 	GtkWidget *filewidget;
-#ifndef USE_GTKFILECHOOSER
 	GtkWidget *entry;
-#endif
 
-#ifdef USE_GTKFILECHOOSER
 	filewidget = (GtkWidget *) gtk_file_chooser_button_new (_("Choose a file"), GTK_FILE_CHOOSER_ACTION_OPEN);
 	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filewidget), file->path);
 	g_signal_connect (GTK_FILE_CHOOSER_BUTTON (filewidget), "selection-changed", 
 			G_CALLBACK (filename_changed), fe);
-#else
-	filewidget = gnome_file_entry_new (NULL, _("Choose a file"));
-	g_object_set (G_OBJECT (filewidget), "use_filechooser", TRUE, NULL);
-	gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (filewidget), file->path);
-	gnome_file_entry_set_modal (GNOME_FILE_ENTRY (filewidget), TRUE);
-	
-	entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (filewidget));
-	gtk_entry_set_text (GTK_ENTRY (entry), file->path);
-	
-	g_signal_connect (entry, "changed", G_CALLBACK (filename_changed), fe);
-#endif	
 	return filewidget;
 }
 
diff --git a/plugins/face/ChangeLog b/plugins/face/ChangeLog
index 5ba3b6cdbd..a86f11a977 100644
--- a/plugins/face/ChangeLog
+++ b/plugins/face/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* face.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-07-18  Sankar P  <psankar@novell.com>
 
 	* face.c: (org_gnome_composer_face):
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 20277ca08d..9e17fecc43 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -51,7 +51,6 @@ void org_gnome_composer_face (EPlugin * ep, EMMenuTargetWidget * t)
 		const char *image_filename;
 		gsize length;
 
-#ifdef USE_GTKFILECHOOSER
 		GtkFileFilter *filter;
 
 		filesel = gtk_file_chooser_dialog_new (_
@@ -69,16 +68,8 @@ void org_gnome_composer_face (EPlugin * ep, EMMenuTargetWidget * t)
 		gtk_file_filter_add_mime_type (filter, "image/png");
 		gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
 
-#else
-		filesel = gtk_file_selection_new (_("Select a (48*48) png of size < 720bytes"));
-#endif
-
 		if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-#ifdef USE_GTKFILECHOOSER
 			image_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
-#else
-			image_filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
-#endif
 
 			error = NULL;
 			file_contents = NULL;
diff --git a/plugins/ipod-sync/ChangeLog b/plugins/ipod-sync/ChangeLog
index 143d1a3760..fc53b2bc0b 100644
--- a/plugins/ipod-sync/ChangeLog
+++ b/plugins/ipod-sync/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* ical-format.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
 
 	* evolution-ipod-sync.c: (ipod_get_mount):
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 3a27771dcf..e747255124 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -25,12 +25,8 @@
 #endif
 #include <glib.h>
 #include <glib/gi18n.h>
-#ifdef USE_GTKFILECHOOSER
-#  include <gtk/gtkfilechooser.h>
-#  include <gtk/gtkfilechooserdialog.h>
-#else
-#  include <gtk/gtkfilesel.h>
-#endif
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkfilechooserdialog.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
diff --git a/plugins/save-calendar/ChangeLog b/plugins/save-calendar/ChangeLog
index c22b974fc3..9df802f364 100644
--- a/plugins/save-calendar/ChangeLog
+++ b/plugins/save-calendar/ChangeLog
@@ -1,3 +1,14 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* csv-format.c:
+	* ical-format.c:
+	* rdf-format.c:
+	* save-calendar.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-06-07  Gilles Dartiguelongue  <dartigug@esiee.fr>
 
 	* rdf-format.c: (add_nummeric_to_rdf), (add_time_to_rdf),
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 4dfb18917a..8ee52e2641 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -24,12 +24,8 @@
 #endif
 #include <glib.h>
 #include <glib/gi18n.h>
-#ifdef USE_GTKFILECHOOSER
-#  include <gtk/gtkfilechooser.h>
-#  include <gtk/gtkfilechooserdialog.h>
-#else
-#  include <gtk/gtkfilesel.h>
-#endif
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 2d316d248b..46be87e53a 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -25,12 +25,8 @@
 #endif
 #include <glib.h>
 #include <glib/gi18n.h>
-#ifdef USE_GTKFILECHOOSER
-#  include <gtk/gtkfilechooser.h>
-#  include <gtk/gtkfilechooserdialog.h>
-#else
-#  include <gtk/gtkfilesel.h>
-#endif
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkfilechooserdialog.h>
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 43983e0bc0..c3f2dbbefa 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -24,12 +24,8 @@
 #endif
 #include <glib.h>
 #include <glib/gi18n.h>
-#ifdef USE_GTKFILECHOOSER
-#  include <gtk/gtkfilechooser.h>
-#  include <gtk/gtkfilechooserdialog.h>
-#else
-#  include <gtk/gtkfilesel.h>
-#endif
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index d497c981ca..bce7bc3504 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -28,12 +28,8 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#ifdef USE_GTKFILECHOOSER
-#  include <gtk/gtkfilechooser.h>
-#  include <gtk/gtkfilechooserdialog.h>
-#else
-#  include <gtk/gtkfilesel.h>
-#endif
+#include <gtk/gtkfilechooser.h>
+#include <gtk/gtkfilechooserdialog.h>
 #include <gtk/gtkmessagedialog.h>
 #include <gtk/gtkstock.h>
 #include <gtk/gtk.h>
@@ -164,8 +160,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	g_signal_connect (G_OBJECT(combo), "changed", 
 		G_CALLBACK (on_type_combobox_changed), extra_widget);
 
-#ifdef USE_GTKFILECHOOSER
-
 	dialog = gtk_file_chooser_dialog_new (_("Select destination file"),
 					      NULL,
 					      GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -176,10 +170,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), extra_widget);
 	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), FALSE);
-#else
-	dialog = gtk_file_selection_new (_("Select destination file"));
-	gtk_box_pack_start (GTK_BOX (GTK_FILE_SELECTION (dialog)->main_vbox), extra_widget, FALSE, TRUE, 0);
-#endif
 	gtk_widget_show (GTK_WIDGET(combo));
 	gtk_widget_show (extra_widget);
 
@@ -191,13 +181,8 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 		gtk_tree_model_get (model, &iter, 
 			DEST_HANDLER, &handler, -1);
 
-#ifdef USE_GTKFILECHOOSER
 	       dest_uri = gtk_file_chooser_get_uri 
 			(GTK_FILE_CHOOSER (dialog));
-#else
-	       dest_uri = g_strdup (gtk_file_selection_get_filename 
-			(GTK_FILE_SELECTION (dialog)));
-#endif
 
 		tmp = strstr (dest_uri, handler->filename_ext);
 
diff --git a/smime/ChangeLog b/smime/ChangeLog
index a2d00b9dc8..ea1d86266b 100644
--- a/smime/ChangeLog
+++ b/smime/ChangeLog
@@ -1,3 +1,11 @@
+2007-09-14  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #476231
+
+	* gui/certificate-manager.c:
+	Remove non-USE_GTKFILECHOOSER code.
+	GtkFileChooser has been around since 2004.
+
 2007-09-10  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #471791 
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 35cda21044..e417407c42 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -132,7 +132,6 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
 	GtkWidget *filesel;
 	const char *filename;
 
-#ifdef USE_GTKFILECHOOSER
 	GtkFileFilter* filter;
 
 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
@@ -152,16 +151,9 @@ import_your (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_filter_set_name (filter, _("All files"));
 	gtk_file_filter_add_pattern (filter, "*");
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-#else
-	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
-#endif
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-#ifdef USE_GTKFILECHOOSER
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
-#else
-		filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
-#endif
 		
 		if (e_cert_db_import_pkcs12_file (e_cert_db_peek (),
 						  filename, NULL /* XXX */)) {
@@ -383,7 +375,6 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
 	GtkWidget *filesel;
 	const char *filename;
 
-#ifdef USE_GTKFILECHOOSER
 	GtkFileFilter *filter;
 
 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
@@ -403,16 +394,9 @@ import_contact (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_filter_set_name (filter, _("All files"));
 	gtk_file_filter_add_pattern (filter, "*");
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-#else
-	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
-#endif
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-#ifdef USE_GTKFILECHOOSER
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
-#else
-		filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
-#endif
 
 		if (e_cert_db_import_certs_from_file (e_cert_db_peek (),
 						      filename,
@@ -615,7 +599,6 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm)
 	GtkWidget *filesel;
 	const char *filename;
 
-#ifdef USE_GTKFILECHOOSER
 	GtkFileFilter *filter;
 
 	filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
@@ -635,16 +618,9 @@ import_ca (GtkWidget *widget, CertificateManagerData *cfm)
 	gtk_file_filter_set_name (filter, _("All files"));
 	gtk_file_filter_add_pattern (filter, "*");
 	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
-#else
-	filesel = gtk_file_selection_new (_("Select a certificate to import..."));
-#endif
 
 	if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (filesel))) {
-#ifdef USE_GTKFILECHOOSER
 		filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filesel));
-#else
-		filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (filesel));
-#endif
 
 		if (e_cert_db_import_certs_from_file (e_cert_db_peek (),
 						      filename,