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

1 files changed, 24 insertions, 17 deletions

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