[evolution-patches] patch for 41036, 41024, and the rest of 41025

[Anna Marie Dirks <anna ximian com>]

This patch fixes bug #41036 by adding proper padding to the "Delete
Folder" dialog, and fixes 41024 and 41025 by correcting the
capitalization of the "Copy Folder" and "Move Folder" dialogs. 

-Anna


-- 
Anna Marie Dirks <anna ximian com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1243
diff -u -u -r1.1243 ChangeLog
--- ChangeLog	17 Apr 2003 20:55:21 -0000	1.1243
+++ ChangeLog	18 Apr 2003 15:16:37 -0000
@@ -1,3 +1,21 @@
+2003-04-18  Anna Marie Dirks  <anna ximian com>
+
+	* e-shell-folder-commands.c (delete_dialog): Corrected border 
+	with for Delete Folder dialog. Fixes 41036. 
+	(e_shell_command_copy_folder): Corrected capitalization of the "Copy
+	Folder" window title. Partial fix for 41205. 
+	(e_shell_command_move_folder): Corrected the capitalization of the
+	"Move Folder" dialog. Fixes 41024. 
+
+	* e-shortcuts-view.c
+	(destroy_group_cb): Set the border width of the message dialog 
+	to 6. Also corrected the capitalization for "Delete Shortcut 
+	Dialog".
+	(show_new_group_dialog): Fixed the title of "Create New Shortcut
+	Group"
+	(rename_shortcut_cb): Corrected the label capitalization for 
+	Rename dialog. 
+
 2003-04-17  Dan Winship  <danw ximian com>
 
 	* e-shell-folder-creation-dialog.c (add_folder_types): If the
Index: e-shell-folder-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-commands.c,v
retrieving revision 1.55
diff -u -u -r1.55 e-shell-folder-commands.c
--- e-shell-folder-commands.c	25 Mar 2003 15:48:33 -0000	1.55
+++ e-shell-folder-commands.c	18 Apr 2003 15:16:37 -0000
@@ -320,7 +320,7 @@
 				   get_folder_name (shell, folder_path));
 
 	uri = g_strconcat (E_SHELL_URI_PREFIX, folder_path, NULL);
-	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, _("Copy folder"),
+	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, _("Copy Folder"),
 								       caption, uri, NULL, TRUE);
 
 	g_free (caption);
@@ -364,7 +364,7 @@
 				   get_folder_name (shell, folder_path));
 
 	uri = g_strconcat (E_SHELL_URI_PREFIX, folder_path, NULL);
-	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, _("Move folder"),
+	folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, _("Move Folder"),
 								       caption, uri, NULL, TRUE);
 
 	g_free (caption);
@@ -408,6 +408,10 @@
 	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK);
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+	
+	gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); 
+	
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 6);
 
 	title = g_strdup_printf (_("Delete \"%s\""), folder_name);
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
@@ -537,7 +541,7 @@
 		const char *reason;
 
 		new_name = e_request_string (shell_view != NULL ? GTK_WINDOW (shell_view) : NULL,
-					     _("Rename folder"), prompt, old_name);
+					     _("Rename Folder"), prompt, old_name);
 
 		if (new_name == NULL)
 			return;