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-shared-folder-picker-dialog.c | 35 +++++++++-------------------- 1 file changed, 11 insertions(+), 24 deletions(-) (limited to 'shell/e-shell-shared-folder-picker-dialog.c') 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 -#include #include #include @@ -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)); -- cgit