From 8cf2b9384717c53e7509a20dd19130c2fe5db0a1 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 27 Jan 2003 21:09:56 +0000 Subject: 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 --- shell/e-shell-folder-commands.c | 43 ++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 20 deletions(-) (limited to 'shell/e-shell-folder-commands.c') 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 #include -#include -#include +#include #include +#include #include -#include +#include #include @@ -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); -- cgit v1.2.3