Re: [evolution-patches] Patch for bug 311063 (mail)

[Not Zed <notzed ximian com>]

This is not a bug, it is correct behaviour.

On Tue, 2005-09-06 at 15:37 -0700, Carsten Guenther wrote:
> Attached bug fixes
>      http://bugzilla.gnome.org/show_bug.cgi?id=311063
> 
> Basically the special-handling for vfolders was moved from
> emfu_popup_new_folder_response() to em_folder_utils_create_folder, thus
> opening the "Add new rule" dialog without going through the folder-tree
> selection dialog.
> 
> Ok to commit to head and gnome-2-12 branch (with changelog of course)?
> 
> Carsten
> 
> 
> text/plain attachment (311063.diff)
> ? 311063.diff
> ? Evolution-Mail-common.c
> ? Evolution-Mail-skels.c
> ? Evolution-Mail-stubs.c
> ? Evolution-Mail.h
> ? evolution-mail-2.4.schemas
> ? mail.error
> ? default/zh_CN/Makefile
> ? default/zh_CN/Makefile.in
> Index: em-folder-utils.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/em-folder-utils.c,v
> retrieving revision 1.6
> diff -u -p -r1.6 em-folder-utils.c
> --- em-folder-utils.c	10 Aug 2005 02:04:31 -0000	1.6
> +++ em-folder-utils.c	6 Sep 2005 22:20:34 -0000
> @@ -700,18 +700,8 @@ emfu_popup_new_folder_response (EMFolder
>  		return;
>  	}
>  
> -	/* HACK: we need to create vfolders using the vfolder editor */
> -	if (CAMEL_IS_VEE_STORE(store)) {
> -		EMVFolderRule *rule;
> -
> -		rule = em_vfolder_rule_new();
> -		filter_rule_set_name((FilterRule *)rule, path);
> -		vfolder_gui_add_rule(rule);
> -		gtk_widget_destroy((GtkWidget *)emfs);
> -	} else {
> -		g_object_ref (emfs);
> -		emfu_create_folder_real (si->store, path, new_folder_created_cb, emfs);
> -	}
> +	g_object_ref (emfs);
> +	emfu_create_folder_real (si->store, path, new_folder_created_cb, emfs);
>  
>  	camel_object_unref (store);
>  	camel_exception_clear (&ex);
> @@ -723,13 +713,19 @@ em_folder_utils_create_folder (CamelFold
>  	EMFolderTree *folder_tree;
>  	EMFolderTreeModel *model;
>  	GtkWidget *dialog;
> +	EMVFolderRule *rule;
>  
> -	model = mail_component_peek_tree_model (mail_component_peek ());
> -	folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
> +	if (g_str_has_prefix (folderinfo->uri, "vfolder:")) {
> +		rule = em_vfolder_rule_new();
> +		vfolder_gui_add_rule(rule);
> +	} else {
> +		model = mail_component_peek_tree_model (mail_component_peek ());
> +		folder_tree = (EMFolderTree *) em_folder_tree_new_with_model (model);
>  	
> -	dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
> -	if (folderinfo != NULL)
> -		em_folder_selector_set_selected ((EMFolderSelector *) dialog, folderinfo->uri);
> -	g_signal_connect (dialog, "response", G_CALLBACK (emfu_popup_new_folder_response), folder_tree);
> -	gtk_widget_show (dialog);
> +		dialog = em_folder_selector_create_new (folder_tree, 0, _("Create folder"), _("Specify where to create the folder:"));
> +		if (folderinfo != NULL)
> +			em_folder_selector_set_selected ((EMFolderSelector *) dialog, folderinfo->uri);
> +		g_signal_connect (dialog, "response", G_CALLBACK (emfu_popup_new_folder_response), folder_tree);
> +		gtk_widget_show (dialog);
> +	}
>  }
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches gnome org
> http://mail.gnome.org/mailman/listinfo/evolution-patches
-- 
adfa(evolution-2.4:20087): gtkhtml-WARNING **: cannot find icon:
'stock_insert-url' in gnome