From 9d77b85ae36094fd1a0b07be4ebb69e047c9cec1 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 2 Dec 2002 03:23:57 +0000 Subject: changed to use a gtkdialog instead of a gnome one. 2002-11-27 Not Zed * main.c (show_development_warning): changed to use a gtkdialog instead of a gnome one. (warning_dialog_response_callback): clicked->response. * e-shell-folder-selection-dialog.c: Include gtk/gtkstock.h * e-shell-folder-creation-dialog.c: include gnome-dialog.h (dialog_response_cb): gtk_entry_get_text now returns const. Dont free result. * e-setup.c: include gnome-messagebox.h * *.c: (re)run fix.sh over all, for e_notice changes & pick up some deprecated functions. * e-shell-shared-folder-picker-dialog.c (shared_folder_discovery_callback): reformat e_notice call for script. * e-shell-offline-sync.c (impl_SyncFolderProgressListener_reportFailure): Fix e_notice call, we weren't passing type in. * e-shell-folder-commands.c (xfer_result_callback): changed around slightly to save some processing & allow a script to run. (e_shell_command_rename_folder): reformat e_notice call to help script. Include gnome-messagebox.h svn path=/trunk/; revision=18977 --- shell/e-shell-folder-creation-dialog.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'shell/e-shell-folder-creation-dialog.c') diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c index 09bd3d725d..442d01f579 100644 --- a/shell/e-shell-folder-creation-dialog.c +++ b/shell/e-shell-folder-creation-dialog.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include @@ -122,7 +123,7 @@ async_create_cb (EStorageSet *storage_set, dialog_data->folder_path, dialog_data->result_callback_data); - e_notice (GTK_WINDOW (dialog_data->dialog), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (dialog_data->dialog), GTK_MESSAGE_ERROR, _("Cannot create the specified folder:\n%s"), e_storage_result_to_string (result)); @@ -147,7 +148,7 @@ dialog_response_cb (GnomeDialog *dialog, const char *folder_type; const char *parent_path; const char *reason; - char *folder_name; + const char *folder_name; char *path; dialog_data = (DialogData *) data; @@ -162,10 +163,10 @@ dialog_response_cb (GnomeDialog *dialog, return; } - folder_name = e_utf8_gtk_entry_get_text (GTK_ENTRY (dialog_data->folder_name_entry)); + folder_name = gtk_entry_get_text(GTK_ENTRY (dialog_data->folder_name_entry)); if (! e_shell_folder_name_is_valid (folder_name, &reason)) { - e_notice (GTK_WINDOW (dialog), GNOME_MESSAGE_BOX_ERROR, + e_notice (GTK_WINDOW (dialog), GTK_MESSAGE_ERROR, _("The specified folder name is not valid: %s"), reason); return; } @@ -183,7 +184,6 @@ dialog_response_cb (GnomeDialog *dialog, } path = g_concat_dir_and_file (parent_path, folder_name); - g_free (folder_name); storage_set = e_shell_get_storage_set (dialog_data->shell); @@ -424,7 +424,7 @@ add_folder_types (GtkWidget *dialog, menu_item = gtk_menu_item_new_with_label (type->display_name); gtk_widget_show (menu_item); - gtk_menu_append (GTK_MENU (menu), menu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); g_object_set_data_full (G_OBJECT (menu_item), "folder_type", g_strdup (type->type), g_free); -- cgit v1.2.3