Set GTK_RESPONSE_OK as the default response.

* e-shell-importer.c (choose_importer_from_list): Set
GTK_RESPONSE_OK as the default response.

* Makefile.am (INCLUDES): Add -DGNOME_DISABLE_DEPRECATED,
-DBONOBO_DISABLE_DEPRECATED.

* e-shortcuts.c (update_shortcut_and_emit_signal): Use
g_signal_emit() instead of gtk_signal_emit().

* e-shortcuts-view.c (destroy_group_cb): Port from GnomeMessageBox
to GtkMessageDialog.

* e-shell.c (get_icon_path_for_component_info): Use
gnome_program_locate_file() instead of gnome_pixmap_file().
(impl_finalize): Use bonobo_activation_unregister_active_server()
instead of bonobo_activation_active_server_register().
(e_shell_construct): Use
bonobo_activation_register_active_server() instead of
bonobo_activation_active_server_register().

* e-shell-view-menu.c (command_submit_bug): Use e_notice().
(launch_pilot_settings): Use g_find_program_in_path() instead of
gnome_is_program_in_path().
(command_submit_bug): Likewise.

* e-shell-utils.c (get_icon_path): Use g_file_test() instead of
g_file_exists().

* e-shell-startup-wizard.c (prepare_importer_page): Port from
GnomeMessageBox to GtkMessageDialog.

* e-shell-shared-folder-picker-dialog.c (show_dialog): Update for
GtkDialog.
(progress_dialog_close_callback): Removed.
(progress_dialog_clicked_callback): Removed.
(progress_dialog_response_callback): New.
(create_progress_dialog): Ported to GnomeDialog.

* e-shell-offline-sync.c: Add member parent_window to struct
SyncData.
(e_shell_offline_sync_all_folders): Set it from the parent_window
arg.
(progress_dialog_close_callback): Removed.
(progress_dialog_clicked_callback): Removed.
(progress_dialog_response_callback): New.
(setup_dialog): Create a GtkDialog instead of a GnomeDialog.
(sync_folder): Updated for GtkDialog.

* e-shell-offline-handler.c (dialog_handle_ok): Make it get a
GtkDialog instead of a GnomeDialog.
(dialog_handle_cancel): Likewise.
(dialog_clicked_cb): Removed.
(dialog_response_cb): New.
(pop_up_confirmation_dialog): Connect the new dialog_response_cb()
instead of the old dialog_clicked_cb().  Removed
gnome_dialog_set_default() call.

* e-shell-folder-creation-dialog.c (dialog_response_cb): Make
first arg a GtkDialog, not a GnomeDialog.

* e-shell-folder-commands.c (e_shell_command_delete_folder):
Expect delete_dialog() to return a GtkResponseType.
(delete_dialog): Ported to GtkMessageDialog; Return a
GtkResponseType.

* e-shell-config-default-folders.c
(e_shell_config_default_folders_create_widget): Removed unused
variable.

* e-setup.c (check_evolution_directory): Remove Evolution
directory installation message.
(e_setup): Remove check for the Executive-Summary directory.

* e-local-storage.c (create_folder_directory): Use g_file_test()
instead of g_file_exists().

* evolution-shell-component-utils.c (e_pixmaps_update): Use
g_build_filename() of g_concat_dir_and_file().
* e-folder-dnd-bridge.c (handle_data_received_path): Likewise.
* e-local-folder.c (construct_loading_metadata): Likewise.
(save_metadata): Likewise.
* e-local-storage.c (remove_folder_directory): Likewise.
(append_xfer_item_list): Likewise.
* e-setup.c (check_dir_recur): Likewise.
(e_shell_rm_dir): Likewise.
(setup_bonobo_conf_private_directory): Likewise.
* e-shell-folder-commands.c
(folder_selection_dialog_folder_selected_callback): Likewise.
(e_shell_command_rename_folder): Likewise.
* e-shell-folder-creation-dialog.c (dialog_response_cb): Likewise.
* e-shell-settings-dialog.c (load_pages): Likewise.
* e-shell-utils.c (get_icon_path): Likewise.
* e-shell.c (setup_local_storage): Likewise.
(get_icon_path_for_component_info): Likewise.
(e_shell_construct): Likewise.
* main.c (main): Likewise.

svn path=/trunk/; revision=19658

23 files changed, 227 insertions, 189 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5477cae383..da1f129789 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,104 @@
 2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
 
+	* e-shell-importer.c (choose_importer_from_list): Set
+	GTK_RESPONSE_OK as the default response.
+
+	* Makefile.am (INCLUDES): Add -DGNOME_DISABLE_DEPRECATED,
+	-DBONOBO_DISABLE_DEPRECATED.
+
+	* e-shortcuts.c (update_shortcut_and_emit_signal): Use
+	g_signal_emit() instead of gtk_signal_emit().
+
+	* e-shortcuts-view.c (destroy_group_cb): Port from GnomeMessageBox
+	to GtkMessageDialog.
+
+	* e-shell.c (get_icon_path_for_component_info): Use
+	gnome_program_locate_file() instead of gnome_pixmap_file().
+	(impl_finalize): Use bonobo_activation_unregister_active_server()
+	instead of bonobo_activation_active_server_register().
+	(e_shell_construct): Use
+	bonobo_activation_register_active_server() instead of
+	bonobo_activation_active_server_register().
+
+	* e-shell-view-menu.c (command_submit_bug): Use e_notice().
+	(launch_pilot_settings): Use g_find_program_in_path() instead of
+	gnome_is_program_in_path().
+	(command_submit_bug): Likewise.
+
+	* e-shell-utils.c (get_icon_path): Use g_file_test() instead of
+	g_file_exists().
+
+	* e-shell-startup-wizard.c (prepare_importer_page): Port from
+	GnomeMessageBox to GtkMessageDialog.
+
+	* e-shell-shared-folder-picker-dialog.c (show_dialog): Update for
+	GtkDialog.
+	(progress_dialog_close_callback): Removed.
+	(progress_dialog_clicked_callback): Removed.
+	(progress_dialog_response_callback): New.
+	(create_progress_dialog): Ported to GnomeDialog.
+
+	* e-shell-offline-sync.c: Add member parent_window to struct
+	SyncData.
+	(e_shell_offline_sync_all_folders): Set it from the parent_window
+	arg.
+	(progress_dialog_close_callback): Removed.
+	(progress_dialog_clicked_callback): Removed.
+	(progress_dialog_response_callback): New.
+	(setup_dialog): Create a GtkDialog instead of a GnomeDialog.
+	(sync_folder): Updated for GtkDialog.
+
+	* e-shell-offline-handler.c (dialog_handle_ok): Make it get a
+	GtkDialog instead of a GnomeDialog.
+	(dialog_handle_cancel): Likewise.
+	(dialog_clicked_cb): Removed.
+	(dialog_response_cb): New.
+	(pop_up_confirmation_dialog): Connect the new dialog_response_cb()
+	instead of the old dialog_clicked_cb().  Removed
+	gnome_dialog_set_default() call.
+
+	* e-shell-folder-creation-dialog.c (dialog_response_cb): Make
+	first arg a GtkDialog, not a GnomeDialog.
+
+	* e-shell-folder-commands.c (e_shell_command_delete_folder):
+	Expect delete_dialog() to return a GtkResponseType.
+	(delete_dialog): Ported to GtkMessageDialog; Return a
+	GtkResponseType.
+
+	* e-shell-config-default-folders.c
+	(e_shell_config_default_folders_create_widget): Removed unused
+	variable.
+
+	* e-setup.c (check_evolution_directory): Remove Evolution
+	directory installation message.
+	(e_setup): Remove check for the Executive-Summary directory.
+
+	* e-local-storage.c (create_folder_directory): Use g_file_test()
+	instead of g_file_exists().
+
+	* evolution-shell-component-utils.c (e_pixmaps_update): Use
+	g_build_filename() of g_concat_dir_and_file().
+	* e-folder-dnd-bridge.c (handle_data_received_path): Likewise.
+	* e-local-folder.c (construct_loading_metadata): Likewise.
+	(save_metadata): Likewise.
+	* e-local-storage.c (remove_folder_directory): Likewise.
+	(append_xfer_item_list): Likewise.
+	* e-setup.c (check_dir_recur): Likewise.
+	(e_shell_rm_dir): Likewise.
+	(setup_bonobo_conf_private_directory): Likewise.
+	* e-shell-folder-commands.c
+	(folder_selection_dialog_folder_selected_callback): Likewise.
+	(e_shell_command_rename_folder): Likewise.
+	* e-shell-folder-creation-dialog.c (dialog_response_cb): Likewise.
+	* e-shell-settings-dialog.c (load_pages): Likewise.
+	* e-shell-utils.c (get_icon_path): Likewise.
+	* e-shell.c (setup_local_storage): Likewise.
+	(get_icon_path_for_component_info): Likewise.
+	(e_shell_construct): Likewise.
+	* main.c (main): Likewise.
+
+2003-01-27  Ettore Perazzoli  <ettore@ximian.com>
+
 	* e-shell-about-box.c (timeout_callback): Pass a the context's
 	language to pango_context_get_metrics() instead of NULL, so the
 	heights are computed correctly.
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 14538d0557..4a28535f37 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -2,6 +2,7 @@ SUBDIRS = glade importer
 
 INCLUDES =									\
 	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED				\
+	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED			\
 	-I$(top_srcdir)/widgets							\
 	-I$(top_srcdir)/widgets/misc						\
 	-I$(top_srcdir)/libical/src/libical					\
diff --git a/shell/e-folder-dnd-bridge.c b/shell/e-folder-dnd-bridge.c
index 9ee9441c9d..bc45a2e03e 100644
--- a/shell/e-folder-dnd-bridge.c
+++ b/shell/e-folder-dnd-bridge.c
@@ -362,7 +362,7 @@ handle_data_received_path (GdkDragContext *context,
 		return FALSE;
 
 	base_name = g_path_get_basename (source_path);
-	destination_path = g_concat_dir_and_file (path, base_name);
+	destination_path = g_build_filename (path, base_name, NULL);
 	g_free (base_name);
 
 	switch (context->action) {
diff --git a/shell/e-local-folder.c b/shell/e-local-folder.c
index 924c252453..1df96734f9 100644
--- a/shell/e-local-folder.c
+++ b/shell/e-local-folder.c
@@ -275,7 +275,7 @@ construct_loading_metadata (ELocalFolder *local_folder,
 
 	folder = E_FOLDER (local_folder);
 
-	metadata_path = g_concat_dir_and_file (path, E_LOCAL_FOLDER_METADATA_FILE_NAME);
+	metadata_path = g_build_filename (path, E_LOCAL_FOLDER_METADATA_FILE_NAME, NULL);
 
 	doc = xmlParseFile (metadata_path);
 	if (doc == NULL) {
@@ -338,7 +338,7 @@ save_metadata (ELocalFolder *local_folder)
 				 (xmlChar *) e_folder_get_description (folder));
 
 	physical_directory = e_folder_get_physical_uri (folder) + URI_PREFIX_LEN - 1;
-	physical_path = g_concat_dir_and_file (physical_directory, E_LOCAL_FOLDER_METADATA_FILE_NAME);
+	physical_path = g_build_filename (physical_directory, E_LOCAL_FOLDER_METADATA_FILE_NAME, NULL);
 
 	if (xmlSaveFile (physical_path, doc) < 0) {
 		unlink (physical_path);
diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c
index 191d356306..4de766b09e 100644
--- a/shell/e-local-storage.c
+++ b/shell/e-local-storage.c
@@ -363,7 +363,7 @@ create_folder_directory (ELocalStorage *local_storage,
 		subfolders_directory_physical_path = e_path_to_physical (priv->base_path, parent_path);
 		g_free (parent_path);
 
-		if (! g_file_exists (subfolders_directory_physical_path)) {
+		if (! g_file_test (subfolders_directory_physical_path, G_FILE_TEST_EXISTS)) {
 			if (mkdir (subfolders_directory_physical_path, 0700) == -1) {
 				g_free (subfolders_directory_physical_path);
 				return errno_to_storage_result ();
@@ -484,7 +484,7 @@ remove_folder_directory (ELocalStorage *local_storage,
 
 	/* Delete the metadata file associated with this folder.  */
 	physical_path = e_path_to_physical (priv->base_path, path);
-	file_name = g_concat_dir_and_file (physical_path, E_LOCAL_FOLDER_METADATA_FILE_NAME);
+	file_name = g_build_filename (physical_path, E_LOCAL_FOLDER_METADATA_FILE_NAME, NULL);
 	unlink (file_name);
 	g_free (file_name);
 
@@ -804,7 +804,7 @@ append_xfer_item_list (EStorage *storage,
 
 		source_subpath = g_strdup ((const char *) p->data);
 		base_name = g_path_get_basename (source_subpath);
-		destination_subpath = g_concat_dir_and_file (destination_path, base_name);
+		destination_subpath = g_build_filename (destination_path, base_name, NULL);
 		append_xfer_item_list (storage, source_subpath, destination_subpath, list);
 		g_free (base_name);
 	}
diff --git a/shell/e-setup.c b/shell/e-setup.c
index ecd0ab5b0e..a3895f7e3d 100644
--- a/shell/e-setup.c
+++ b/shell/e-setup.c
@@ -41,7 +41,6 @@
 
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-messagebox.h>
 
 #include <errno.h>
 #include <sys/stat.h>
@@ -84,10 +83,8 @@ check_dir_recur (const char *evolution_directory,
 			continue;
 		}
 
-		fullname = g_concat_dir_and_file (evolution_directory,
-						  current->d_name);
-		fulldefaultname = g_concat_dir_and_file (current_directory,
-							 current->d_name);
+		fullname = g_build_filename (evolution_directory, current->d_name, NULL);
+		fulldefaultname = g_build_filename (current_directory, current->d_name, NULL);
 
 		if (stat (fullname, &buf) == -1) {
 			char *name;
@@ -114,11 +111,8 @@ check_dir_recur (const char *evolution_directory,
 static gboolean
 check_evolution_directory (const char *evolution_directory)
 {
-	GtkWidget *dialog;
-	GtkWidget *label1, *label2;
 	gboolean retval;
 	GList *newfiles, *l;
-	int result;
 
 	newfiles = g_list_concat (NULL, check_dir_recur (evolution_directory, DEFAULT_USER_PATH));
 
@@ -127,28 +121,6 @@ check_evolution_directory (const char *evolution_directory)
 		goto out;
 	}
 
-	dialog = gnome_dialog_new (_("Evolution installation"),
-				   GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL,
-				   NULL);
-
-	label1 = gtk_label_new (_("This new version of Evolution needs to install additional files\ninto your personal Evolution directory"));
-	label2 = gtk_label_new (_("Please click \"OK\" to install the files, or \"Cancel\" to exit."));
-
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label1, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label2, TRUE, TRUE, 0);
-
-	gtk_widget_show (label1);
-	gtk_widget_show (label2);
-
-	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
-	result = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-
-	if (result != 0) {
-		retval = FALSE;
-		goto out;
-	}
-
 	retval = TRUE;
 	for (l = newfiles; l; l = l->next) {
 		char *command;
@@ -245,7 +217,7 @@ e_shell_rm_dir (const char *path)
 				continue;
 			}
 
-			fullpath = g_concat_dir_and_file (path, contents->d_name);
+			fullpath = g_build_filename (path, contents->d_name, NULL);
 			e_shell_rm_dir (fullpath);
 			g_free (fullpath);
 
@@ -265,7 +237,7 @@ setup_bonobo_conf_private_directory (const char *evolution_directory)
 	char *name;
 	struct stat buf;
 
-	name = g_concat_dir_and_file (evolution_directory, "private");
+	name = g_build_filename (evolution_directory, "private", NULL);
 	if (stat (name, &buf) == -1) {
 		if (mkdir (name, 0700) != 0) {
 			e_notice (NULL, GTK_MESSAGE_ERROR,
@@ -322,36 +294,6 @@ e_setup (const char *evolution_directory)
 		return FALSE;
 	}
 
-	/* Make sure this is really our directory, not an Evolution
-	 * build tree or something like that.
-	 */
-	file = g_strdup_printf ("%s/local/Executive-Summary", evolution_directory);
-	if (stat (file, &statinfo) == 0) {
-		if (S_ISDIR (statinfo.st_mode)) {
-			GtkWidget *dialog;
-
-			dialog = gnome_message_box_new (_("Evolution has detected an old\n"
-							  "Executive-Summary directory.\n"
-							  "This needs to be removed before\n"
-							  "Evolution will run.\n"
-							  "Do you want me to remove this directory?"),
-							GNOME_MESSAGE_BOX_INFO,
-							GNOME_STOCK_BUTTON_YES,
-							GNOME_STOCK_BUTTON_NO,
-							NULL);
-			switch (gnome_dialog_run_and_close (GNOME_DIALOG (dialog))) {
-			case 0:
-				e_shell_rm_dir (file);
-				break;
-
-			default:
-				return FALSE;
-			}
-		}
-	}
-
-	g_free (file);
-
 	file = g_strdup_printf ("%s/searches.xml", evolution_directory);
 	if (stat (file, &statinfo) != 0) {
 		e_notice (NULL, GTK_MESSAGE_ERROR,
diff --git a/shell/e-shell-config-default-folders.c b/shell/e-shell-config-default-folders.c
index 6dc06e4915..8c60682068 100644
--- a/shell/e-shell-config-default-folders.c
+++ b/shell/e-shell-config-default-folders.c
@@ -162,7 +162,6 @@ setup_folder_selector (EvolutionDefaultFolderConfig *dfc,
 GtkWidget*
 e_shell_config_default_folders_create_widget (EShell *shell, EvolutionConfigControl *config_control)
 {
-	CORBA_Environment ev;
 	EvolutionDefaultFolderConfig *dfc;
 	GtkWidget *widget;
 
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 5e71bbfa8b..a8db04915b 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -37,12 +37,12 @@
 
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-messagebox.h>
 
+#include <gtk/gtkentry.h>
 #include <gtk/gtklabel.h>
+#include <gtk/gtkmessagedialog.h>
 #include <gtk/gtksignal.h>
-#include <gtk/gtkentry.h>
+#include <gtk/gtkstock.h>
 
 #include <string.h>
 
@@ -166,7 +166,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f
 	folder_command_data = (FolderCommandData *) data;
 
 	base_name = g_path_get_basename (folder_command_data->source_path);
-	folder_command_data->destination_path = g_concat_dir_and_file (path, base_name);
+	folder_command_data->destination_path = g_build_filename (path, base_name, NULL);
 	g_free (base_name);
 
 	switch (folder_command_data->command) {
@@ -392,29 +392,32 @@ delete_cb (EStorageSet *storage_set,
 			  _("Cannot delete folder:\n%s"), e_storage_result_to_string (result));
 }
 
-static int
+static GtkResponseType
 delete_dialog (EShellView *shell_view, const char *folder_name)
 {
 	GtkWidget *dialog;
+	GtkResponseType response;
 	char *title;
-	char *question;
 
-	title = g_strdup_printf (_("Delete \"%s\""), folder_name);
-	question = g_strdup_printf (_("Really delete folder \"%s\"?"), folder_name);
+	dialog = gtk_message_dialog_new (GTK_WINDOW (shell_view),
+					 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR,
+					 GTK_MESSAGE_QUESTION,
+					 GTK_BUTTONS_NONE,
+					 _("Really delete folder \"%s\"?"), folder_name);
 
-	dialog = gnome_message_box_new (question,
-					GNOME_MESSAGE_BOX_QUESTION,
-					_("Delete"),
-					GNOME_STOCK_BUTTON_CANCEL,
-					NULL);
-	gtk_window_set_title (GTK_WINDOW (dialog), title);
-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (shell_view));
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK);
 
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
+	title = g_strdup_printf (_("Delete \"%s\""), folder_name);
+	gtk_window_set_title (GTK_WINDOW (dialog), title);
 	g_free (title);
-	g_free (question);
 
-	return gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
+
+	return response;
 }
 
 void
@@ -435,7 +438,7 @@ e_shell_command_delete_folder (EShell *shell,
 	if (folder_path == NULL)
 		folder_path = e_shell_view_get_current_path (shell_view);
 
-	if (delete_dialog (shell_view, get_folder_name (shell, folder_path)) == 0)
+	if (delete_dialog (shell_view, get_folder_name (shell, folder_path)) == GTK_RESPONSE_OK)
 		e_storage_set_async_remove_folder (storage_set, folder_path, delete_cb, shell_view);
 }
 
@@ -555,7 +558,7 @@ e_shell_command_rename_folder (EShell *shell,
 	}
 
 	old_base_path = g_path_get_dirname (folder_path);
-	new_path = g_concat_dir_and_file (old_base_path, new_name);
+	new_path = g_build_filename (old_base_path, new_name, NULL);
 
 	callback_data = rename_callback_data_new (shell_view, new_path);
 	e_storage_set_async_xfer_folder (storage_set, folder_path, new_path, TRUE, rename_cb, callback_data);
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 7c7aacc991..0ba0dfe2be 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -27,7 +27,6 @@
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
-#include <libgnomeui/gnome-dialog.h>
 
 #include <gtk/gtkentry.h>
 #include <gtk/gtkdialog.h>
@@ -138,7 +137,7 @@ async_create_cb (EStorageSet *storage_set,
 /* Dialog signal callbacks.  */
 
 static void
-dialog_response_cb (GnomeDialog *dialog,
+dialog_response_cb (GtkDialog *dialog,
 		    int response_id,
 		    void *data)
 {
@@ -183,7 +182,7 @@ dialog_response_cb (GnomeDialog *dialog,
 		return;
 	}
 
-	path = g_concat_dir_and_file (parent_path, folder_name);
+	path = g_build_filename (parent_path, folder_name, NULL);
 
 	storage_set = e_shell_get_storage_set (dialog_data->shell);
 
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 7a2dd3f5a9..f035161ace 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -353,6 +353,8 @@ choose_importer_from_list (GList *importer_list)
 					     GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					     GTK_STOCK_OK, GTK_RESPONSE_OK,
 					     NULL);
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+
 	clist = gtk_clist_new (1);
 	for (p = importer_list; p; p = p->next) {
 		struct _IIDInfo *iid;
diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c
index 28616ffa01..e1bcc3d66d 100644
--- a/shell/e-shell-offline-handler.c
+++ b/shell/e-shell-offline-handler.c
@@ -34,6 +34,7 @@
 #include "e-shell-marshal.h"
 
 #include <gtk/gtkclist.h>
+#include <gtk/gtkdialog.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktypeutils.h>
@@ -41,7 +42,6 @@
 
 #include <gal/util/e-util.h>
 
-#include <libgnomeui/gnome-dialog.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <glade/glade-xml.h>
@@ -569,7 +569,7 @@ update_dialog_clist (EShellOfflineHandler *offline_handler)
 }
 
 static void
-dialog_handle_ok (GnomeDialog *dialog,
+dialog_handle_ok (GtkDialog *dialog,
 		  EShellOfflineHandler *offline_handler)
 {
 	EShellOfflineHandlerPrivate *priv;
@@ -577,7 +577,7 @@ dialog_handle_ok (GnomeDialog *dialog,
 
 	priv = offline_handler->priv;
 
-	gnome_dialog_set_sensitive (dialog, 0, FALSE);
+	gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
 
 	instruction_label = glade_xml_get_widget (priv->dialog_gui, "instruction_label");
 	g_assert (instruction_label != NULL);
@@ -591,7 +591,7 @@ dialog_handle_ok (GnomeDialog *dialog,
 }
 
 static void
-dialog_handle_cancel (GnomeDialog *dialog,
+dialog_handle_cancel (GtkDialog *dialog,
 		      EShellOfflineHandler *offline_handler)
 {
 	EShellOfflineHandlerPrivate *priv;
@@ -607,20 +607,20 @@ dialog_handle_cancel (GnomeDialog *dialog,
 }
 
 static void
-dialog_clicked_cb (GnomeDialog *dialog,
-		   int button_number,
-		   void *data)
+dialog_response_cb (GtkDialog *dialog,
+		    int response_id,
+		    void *data)
 {
 	EShellOfflineHandler *offline_handler;
 
 	offline_handler = E_SHELL_OFFLINE_HANDLER (data);
 
-	switch (button_number) {
-	case 0:			/* OK */
+	switch (response_id) {
+	case GTK_RESPONSE_OK:
 		dialog_handle_ok (dialog, offline_handler);
 		break;
 
-	case 1:			/* Cancel */
+	case GTK_RESPONSE_CANCEL:
 		dialog_handle_cancel (dialog, offline_handler);
 		break;
 
@@ -653,12 +653,9 @@ pop_up_confirmation_dialog (EShellOfflineHandler *offline_handler)
 	/* gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->parent_shell_view)); */
 	/* gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); */
 
-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 1);
-
 	update_dialog_clist (offline_handler);
 
-	g_signal_connect (dialog, "clicked",
-			  G_CALLBACK (dialog_clicked_cb), offline_handler);
+	g_signal_connect (dialog, "response", G_CALLBACK (dialog_response_cb), offline_handler);
 
 	gtk_widget_show (dialog);
 }
diff --git a/shell/e-shell-offline-sync.c b/shell/e-shell-offline-sync.c
index 309a104494..a828fb5b57 100644
--- a/shell/e-shell-offline-sync.c
+++ b/shell/e-shell-offline-sync.c
@@ -39,8 +39,8 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtkstock.h>
 
-#include <libgnomeui/gnome-dialog.h>
 #include <libgnome/gnome-i18n.h>
 
 #include <bonobo/bonobo-main.h>
@@ -59,6 +59,9 @@ struct _SyncData {
 	/* The shell.  */
 	EShell *shell;
 
+	/* Parent view.  */
+	GtkWindow *parent_window;
+
 	/* The progress dialog.  */
 	GtkWidget *dialog;
 
@@ -212,19 +215,10 @@ setup_progress_listener (SyncData *sync_data)
 
 /* Setting up the progress dialog.  */
 
-static int
-progress_dialog_close_callback (GnomeDialog *dialog,
-				void *data)
-{
-	/* Don't allow the dialog to be closed through the window manager close
-	   command.  */
-	return TRUE;
-}
-
 static void
-progress_dialog_clicked_callback (GnomeDialog *dialog,
-				  int button_num,
-				  void *data)
+progress_dialog_response_callback (GtkDialog *dialog,
+				   int response_id,
+				   void *data)
 {
 	SyncData *sync_data;
 
@@ -235,21 +229,23 @@ progress_dialog_clicked_callback (GnomeDialog *dialog,
 static void
 setup_dialog (SyncData *sync_data)
 {
-	sync_data->dialog = gnome_dialog_new (_("Syncing Folder"), GNOME_STOCK_BUTTON_CANCEL, NULL);
+	sync_data->dialog = gtk_dialog_new_with_buttons (_("Syncing Folder"),
+							 sync_data->parent_window,
+							 0,
+							 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+							 NULL);
 	gtk_widget_set_size_request (sync_data->dialog, 300, -1);
 	gtk_window_set_resizable (GTK_WINDOW (sync_data->dialog), FALSE);
 
-	g_signal_connect (sync_data->dialog, "close",
-			  G_CALLBACK (progress_dialog_close_callback), sync_data);
-	g_signal_connect (sync_data->dialog, "clicked",
-			  G_CALLBACK (progress_dialog_clicked_callback), sync_data);
+	g_signal_connect (sync_data->dialog, "response",
+			  G_CALLBACK (progress_dialog_response_callback), sync_data);
 
 	sync_data->label = gtk_label_new ("");
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sync_data->dialog)->vbox),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (sync_data->dialog)->vbox),
 			    sync_data->label, FALSE, TRUE, 0);
 
 	sync_data->progress_bar = gtk_progress_bar_new ();
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sync_data->dialog)->vbox),
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (sync_data->dialog)->vbox),
 			    sync_data->progress_bar, FALSE, TRUE, 0);
 
 	gtk_widget_show_all (sync_data->dialog);
@@ -346,7 +342,8 @@ sync_folder (SyncData *sync_data,
 
 		/* Check if the user clicked the Cancel button.  */
 		if (sync_data->cancel) {
-			gnome_dialog_set_sensitive (GNOME_DIALOG (sync_data->dialog), 0, FALSE);
+			gtk_dialog_set_response_sensitive (GTK_DIALOG (sync_data->dialog),
+							   GTK_RESPONSE_CANCEL, FALSE);
 
 			GNOME_Evolution_Offline_cancelSyncFolder (offline_interface, corba_folder, &ev);
 
@@ -403,6 +400,7 @@ e_shell_offline_sync_all_folders (EShell *shell,
 
 	sync_data = g_new0 (SyncData, 1);
 	sync_data->shell = shell;
+	sync_data->parent_window = parent_window;
 
 	/* Initialize everything, then go ahead and sync.  */
 
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index fab3acf684..a8abfb2ce2 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -207,7 +207,7 @@ load_pages (EShellSettingsDialog *dialog)
 			} else {
 				char *real_icon_path;
 
-				real_icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES, icon_path);
+				real_icon_path = g_build_filename (EVOLUTION_IMAGES, icon_path, NULL);
 				icon = gdk_pixbuf_new_from_file (real_icon_path, NULL);
 				g_free (real_icon_path);
 			}
diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index 6904d5e289..24cd0757d1 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -35,7 +35,6 @@
 
 #include <gal/widgets/e-gui-utils.h>
 
-#include <libgnomeui/gnome-dialog.h>
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 
@@ -219,7 +218,7 @@ show_dialog (EShell *shell,
 	GtkWidget *dialog;
 	GtkWidget *name_selector_widget;
 	GtkWidget *folder_name_entry;
-	int button_num;
+	int response;
 
 	glade_xml = glade_xml_new (EVOLUTION_GLADEDIR "/e-shell-shared-folder-picker-dialog.glade",
 				   NULL, NULL);
@@ -235,10 +234,8 @@ show_dialog (EShell *shell,
 	dialog = glade_xml_get_widget (glade_xml, "dialog");
 	g_assert (dialog != NULL);
 
-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);
-
-	button_num = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	if (button_num == 1) {	/* Cancel */
+	response = gtk_dialog_run (GTK_DIALOG (dialog));
+	if (response == GTK_RESPONSE_CANCEL) {
 		g_free (*storage_name_return);
 		*storage_name_return = NULL;
 		gtk_widget_destroy (dialog);
@@ -301,19 +298,10 @@ progress_bar_weak_notify (void *data,
 	g_source_remove (timeout_id);
 }
 
-static int
-progress_dialog_close_callback (GnomeDialog *dialog,
-				void *data)
-{
-	/* Don't allow the dialog to be closed through the window manager close
-	   command.  */
-	return TRUE;
-}
-
 /* This is invoked if the "Cancel" button is clicked.  */
 static void
-progress_dialog_clicked_callback (GnomeDialog *dialog,
-				  int button_number,
+progress_dialog_clicked_callback (GtkDialog *dialog,
+				  int response,
 				  void *data)
 {
 	DiscoveryData *discovery_data;
@@ -349,25 +337,24 @@ create_progress_dialog (EShell *shell,
 	int timeout_id;
 	char *text;
 
-	dialog = gnome_dialog_new (_("Opening Folder"), GNOME_STOCK_BUTTON_CANCEL, NULL);
+	dialog = gtk_dialog_new_with_buttons (_("Opening Folder"), NULL, 0,
+					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					      NULL);
 	gtk_widget_set_size_request (dialog, 300, -1);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-	g_signal_connect (dialog, "close",
-			  G_CALLBACK (progress_dialog_close_callback), NULL);
-
 	text = g_strdup_printf (_("Opening Folder \"%s\""), folder_name);
 	label = gtk_label_new (text);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
 	g_free (text);
 
 	text = g_strdup_printf (_("in \"%s\" ..."), e_storage_get_name (storage));
 	label = gtk_label_new (text);
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label, FALSE, TRUE, 0);
 	g_free (text);
 
 	progress_bar = gtk_progress_bar_new ();
-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), progress_bar, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), progress_bar, FALSE, TRUE, 0);
 
 	timeout_id = g_timeout_add (50, progress_bar_timeout_callback, progress_bar);
 	g_object_weak_ref (G_OBJECT (progress_bar), progress_bar_weak_notify, GINT_TO_POINTER (timeout_id));
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 6076ce46e5..ead8c2d1eb 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -639,10 +639,12 @@ prepare_importer_page (GnomeDruidPage *page,
 
 	data->import_page->prepared = TRUE;
 
-	dialog = gnome_message_box_new (_("Please wait...\nScanning for existing setups"), GNOME_MESSAGE_BOX_INFO, NULL);
+	dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
+					 GTK_BUTTONS_NONE,
+					 _("Please wait...\nScanning for existing setups"));
 	e_make_widget_backing_stored (dialog);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import"));
 	gtk_widget_show_all (dialog);
 	gtk_widget_show_now (dialog);
 
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index c1728dfde8..a983a7b768 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -43,9 +43,9 @@ get_icon_path (const char *icon_name)
 	if (g_path_is_absolute (icon_name))
 		icon_path = g_strdup (icon_name);
 	else
-		icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES, icon_name);
+		icon_path = g_build_filename (EVOLUTION_IMAGES, icon_name, NULL);
 
-	if (g_file_exists (icon_path)) {
+	if (g_file_test (icon_path, G_FILE_TEST_EXISTS)) {
 		return icon_path;
 	} else {
 		g_free (icon_path);
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 8bc89b88f0..4c2593641b 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -55,8 +55,6 @@
 #include <libgnome/gnome-url.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-about.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-dialog-util.h>
 
 #include <gal/widgets/e-gui-utils.h>
 
@@ -85,7 +83,7 @@ launch_pilot_settings (const char *extra_arg)
         };
         int pid;
 
-        args[0] = gnome_is_program_in_path ("gpilotd-control-applet");
+        args[0] = g_find_program_in_path ("gpilotd-control-applet");
         if (!args[0]) {
 		e_notice (NULL, GTK_MESSAGE_ERROR,
 			  _("The GNOME Pilot tools do not appear to be installed on this system."));
@@ -190,9 +188,9 @@ command_submit_bug (BonoboUIComponent *uih,
                 NULL
         };
 
-        args[0] = gnome_is_program_in_path ("bug-buddy");
+        args[0] = g_find_program_in_path ("bug-buddy");
         if (!args[0]) {
-                gnome_error_dialog (_("Bug buddy was not found in your $PATH."));
+                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy is not installed."));
 		return;
         }
 
@@ -200,7 +198,7 @@ command_submit_bug (BonoboUIComponent *uih,
         g_free (args[0]);
 
         if (pid == -1)
-                gnome_error_dialog (_("Bug buddy could not be run."));
+                e_notice (NULL, GTK_MESSAGE_ERROR, _("Bug buddy could not be run."));
 }
 
 static int
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a57ef10579..0710189fc3 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -55,6 +55,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
 
 #include <glib.h>
 
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 0124cd6af5..f78ba744af 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -78,6 +78,8 @@
 
 #include <gconf/gconf-client.h>
 
+#include <string.h>
+
 #include "Evolution.h"
 
 
@@ -748,7 +750,7 @@ setup_local_storage (EShell *shell)
 	g_assert (priv->folder_type_registry != NULL);
 	g_assert (priv->local_storage == NULL);
 
-	local_storage_path = g_concat_dir_and_file (priv->local_directory, LOCAL_STORAGE_DIRECTORY);
+	local_storage_path = g_build_filename (priv->local_directory, LOCAL_STORAGE_DIRECTORY, NULL);
 	local_storage = e_local_storage_open (priv->folder_type_registry, local_storage_path);
 	if (local_storage == NULL) {
 		g_warning (_("Cannot set up local storage -- %s"), local_storage_path);
@@ -783,7 +785,8 @@ get_icon_path_for_component_info (const Bonobo_ServerInfo *info)
 						 "evolution:shell_component_icon");
 
 	if (property == NULL || property->v._d != Bonobo_ACTIVATION_P_STRING)
-		return gnome_pixmap_file ("gnome-question.png");
+		return gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-question.png",
+						  TRUE, NULL);
 
 	shell_component_icon_value = property->v._u.value_string;
 
@@ -791,7 +794,7 @@ get_icon_path_for_component_info (const Bonobo_ServerInfo *info)
 		return g_strdup (shell_component_icon_value);
 
 	else
-		return g_concat_dir_and_file (EVOLUTION_IMAGES, shell_component_icon_value);
+		return g_build_filename (EVOLUTION_IMAGES, shell_component_icon_value, NULL);
 }
 
 static void
@@ -1146,7 +1149,8 @@ impl_finalize (GObject *object)
 	priv = shell->priv;
 
 	if (priv->iid != NULL)
-		bonobo_activation_active_server_unregister (priv->iid, bonobo_object_corba_objref (BONOBO_OBJECT (shell)));
+		bonobo_activation_unregister_active_server (priv->iid,
+							    bonobo_object_corba_objref (BONOBO_OBJECT (shell)));
 
 	g_free (priv->local_directory);
 
@@ -1315,7 +1319,7 @@ e_shell_construct (EShell *shell,
 	
 	/* FIXME: Multi-display stuff.  */
 	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (shell));
-	if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS)
+	if (bonobo_activation_register_active_server (iid, corba_object, NULL) != Bonobo_ACTIVATION_REG_SUCCESS)
 		return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER;
 
 	if (! show_splash) {
@@ -1339,7 +1343,7 @@ e_shell_construct (EShell *shell,
 	
 	/* Set up the shortcuts.  */
 	
-	shortcut_path = g_concat_dir_and_file (local_directory, "shortcuts.xml");
+	shortcut_path = g_build_filename (local_directory, "shortcuts.xml", NULL);
 	priv->shortcuts = e_shortcuts_new_from_file (shell, shortcut_path);
 	g_assert (priv->shortcuts != NULL);
 	
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index aa46fcfb64..13fa72d088 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.c
@@ -42,11 +42,12 @@
 
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-messagebox.h>
 #include <libgnomeui/gnome-popup-menu.h>
 #include <libgnomeui/gnome-uidefs.h>
 
+#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtkstock.h>
+
 #include <gal/util/e-util.h>
 
 #include <string.h>
@@ -163,7 +164,8 @@ destroy_group_cb (GtkWidget *widget,
 	EShortcuts *shortcuts;
 	EShortcutsView *shortcuts_view;
 	EShortcutsViewPrivate *priv;
-	GtkWidget *message_box;
+	GtkWidget *message_dialog;
+	GtkResponseType response;
 	char *question;
 
 	menu_data = (RightClickMenuData *) data;
@@ -171,20 +173,25 @@ destroy_group_cb (GtkWidget *widget,
 	priv = shortcuts_view->priv;
 	shortcuts = priv->shortcuts;
 
-	question = g_strdup_printf (_("Do you really want to remove group\n"
-	                              "`%s' from the shortcut bar?"),
-				    e_shortcuts_get_group_title (shortcuts, menu_data->group_num));
-
-	message_box = gnome_message_box_new (question, GNOME_MESSAGE_BOX_QUESTION,
-					     _("Remove"), _("Don't remove"), NULL);
-	gnome_dialog_set_parent (GNOME_DIALOG (message_box),
-				 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (shortcuts_view))));
-	g_free (question);
-
-	if (gnome_dialog_run_and_close (GNOME_DIALOG (message_box)) != 0)
-		return;
-
-	e_shortcuts_remove_group (shortcuts, menu_data->group_num);
+	message_dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (menu_data->shortcuts_view))),
+						 GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_QUESTION,
+						 GTK_BUTTONS_NONE,
+						 _("Do you really want to remove group "
+						   "\"%s\" from the shortcut bar?"),
+						 e_shortcuts_get_group_title (shortcuts, menu_data->group_num));
+
+	gtk_dialog_add_buttons (GTK_DIALOG (message_dialog),
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_DELETE, GTK_RESPONSE_OK,
+				NULL);
+	gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK);
+
+	response = gtk_dialog_run (GTK_DIALOG (message_dialog));
+	gtk_widget_destroy (message_dialog);
+
+	if (response == GTK_RESPONSE_OK)
+		e_shortcuts_remove_group (shortcuts, menu_data->group_num);
 }
 
 static void
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index 5f43f8c315..6ac47bf66b 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -242,7 +242,7 @@ update_shortcut_and_emit_signal (EShortcuts *shortcuts,
 
 	shortcut_changed = shortcut_item_update (shortcut_item, uri, name, unread_count, type, custom_icon_name);
 	if (shortcut_changed) {
-		gtk_signal_emit (GTK_OBJECT (shortcuts), signals[UPDATE_SHORTCUT], group_num, num);
+		g_signal_emit (shortcuts, signals[UPDATE_SHORTCUT], 0, group_num, num);
 		return TRUE;
 	}
 
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index c9e9edf960..8c468d2100 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -54,8 +54,7 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache)
 			char *path;
 			GdkPixbuf *pixbuf;
 
-			path = g_concat_dir_and_file (EVOLUTION_IMAGES,
-						      pixcache [i].fname);
+			path = g_build_filename (EVOLUTION_IMAGES, pixcache [i].fname, NULL);
 
 			pixbuf = gdk_pixbuf_new_from_file (path, NULL);
 			if (pixbuf == NULL) {
diff --git a/shell/main.c b/shell/main.c
index de11af7b8b..c2f39bf164 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -499,7 +499,7 @@ main (int argc, char **argv)
 	gnome_window_icon_set_default_from_file (EVOLUTION_IMAGES "/evolution-inbox.png");
 
 	/* FIXME */
-	evolution_directory = g_concat_dir_and_file (g_get_home_dir (), "evolution");
+	evolution_directory = g_build_filename (g_get_home_dir (), "evolution", NULL);
 
 	if (! e_setup (evolution_directory))
 		exit (1);