If one of the allowed types is "type/*", allow anything starting with

	* e-shell-folder-selection-dialog.c (check_folder_type_valid):
	If one of the allowed types is "type/*", allow anything starting
	with "type/".
	(impl_clicked): If the first allowed type is "type/*", pass "type"
	to e_shell_show_folder_creation_dialog.

	* evolution-folder-selector-button.c
	(evolution_folder_selector_button_set_uri): Handle "type/*" as an
	allowed type.

	* e-shell-settings-dialog.c (e_shell_settings_dialog_show_type):
	If there are no pages for the current folder type, try the parent
	type (eg, "mail" for "mail/public").

	* e-shell-config-autocompletion.c
	(e_shell_config_autocompletion_create_widget): Use "contacts/*" as
	the allowed folder type.

svn path=/trunk/; revision=18220

1 files changed, 8 insertions, 0 deletions

diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c
index a3593b9693..35e24e7d82 100644
--- a/shell/evolution-folder-selector-button.c
+++ b/shell/evolution-folder-selector-button.c
@@ -358,6 +358,7 @@ evolution_folder_selector_button_set_uri (EvolutionFolderSelectorButton *folder_
 {
 	EvolutionFolderSelectorButtonPrivate *priv;
 	GNOME_Evolution_Folder *folder;
+	char *slash;
 	int i;
 
 	g_return_val_if_fail (EVOLUTION_IS_FOLDER_SELECTOR_BUTTON (folder_selector_button), FALSE);
@@ -379,6 +380,13 @@ evolution_folder_selector_button_set_uri (EvolutionFolderSelectorButton *folder_
 			set_folder (folder_selector_button, folder);
 			return TRUE;
 		}
+		slash = strchr (priv->possible_types[i], '/');
+		if (slash && slash[1] == '*' &&
+		    !strncmp (folder->type, priv->possible_types[i],
+			      slash - priv->possible_types[i])) {
+			set_folder (folder_selector_button, folder);
+			return TRUE;
+		}
 	}
 
 	CORBA_free (folder);