Re: [evolution-patches] Please review my patch for bug #46018

[Jeffrey Stedfast <fejj ximian com>]

committed to cvs

On Fri, 2003-07-11 at 02:58, Antonio Xu wrote:
> Hi Fejj
> Thanks for you reviewing my patch, I have create a new patch according 
> to your advice. Could you review it?
> 
> Thanks
> Anto
> Jeffrey Stedfast wrote:
> 
> >this is wrong. you just need to change the logic so that paste is always
> >accessable in the menus (ie, in folder-browser-ui.c or some such, just
> >make it so that its mask isn't SINGLE_SELECTION or whatever it is)
> >
> >Jeff
> >
> >On Thu, 2003-07-10 at 12:45, Antonio Xu wrote:
> >  
> >
> >>Hello All,
> >>      Could you review my patch for bug #46018? My patch can solve this 
> >>problem, but I don't think it is a good solution.
> >>      Bug Summary:cannot paste cut/copied mail into empty folder
> >>      Bug Link:http://bugzilla.ximian.com/createattachment.cgi?id=46018
> >>
> >>Thanks
> >>Antonio Xu
> >>
> >>
> >>
> >>______________________________________________________________________
> >>Index: mail/folder-browser.c
> >>===================================================================
> >>RCS file: /cvs/gnome/evolution/mail/folder-browser.c,v
> >>retrieving revision 1.347
> >>diff -u -r1.347 folder-browser.c
> >>--- mail/folder-browser.c	23 Jun 2003 16:56:26 -0000	1.347
> >>+++ mail/folder-browser.c	10 Jul 2003 15:46:00 -0000
> >>@@ -119,6 +119,8 @@
> >> 
> >> static GdkAtom clipboard_atom = GDK_NONE;
> >> 
> >>+static gboolean have_copy = FALSE;
> >>+
> >> static GtkTableClass *parent_class = NULL;
> >> 
> >> enum {
> >>@@ -726,6 +728,8 @@
> >> 	g_ptr_array_free (uids, TRUE);
> >> 	
> >> 	fb->clipboard_selection = bytes;
> >>+
> >>+	have_copy = TRUE;
> >> 	
> >> 	gtk_selection_owner_set (fb->invisible, clipboard_atom, GDK_CURRENT_TIME);
> >> }
> >>@@ -933,6 +937,9 @@
> >> {
> >> 	g_return_if_fail (IS_FOLDER_BROWSER (fb));
> >> 	
> >>+	if (have_copy)
> >>+		bonobo_ui_component_set_prop (fb->uicomp, "/commands/EditPaste",
> >>+					      "sensitive", "1", NULL);
> >> 	if (fb->folder) {
> >> 		mail_refresh_folder (fb->folder, NULL, NULL);
> >> 	} else if (fb->uri && fb->get_id == -1) {
> >>    
> >>
> 
> 
> 
> ______________________________________________________________________
> Index: mail/folder-browser-ui.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/folder-browser-ui.c,v
> retrieving revision 1.80
> diff -u -r1.80 folder-browser-ui.c
> --- mail/folder-browser-ui.c	11 Jun 2003 16:19:34 -0000	1.80
> +++ mail/folder-browser-ui.c	11 Jul 2003 05:42:00 -0000
> @@ -284,7 +284,7 @@
>  	
>  	{ "EditCut",                  IS_NMESSAGE },
>  	{ "EditCopy",                 IS_NMESSAGE },
> -	{ "EditPaste",                IS_NMESSAGE },
> +	{ "EditPaste",                IS_0MESSAGE },
>  	{ "EditSelectThread",	      IS_ANY_FOLDER | SELECTION_ANYTHING | IS_THREADED | HAS_FLAGS},
>  
>  	{ "ViewHideSelected",         IS_NMESSAGE },
> Index: mail/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
> retrieving revision 1.2762
> diff -u -r1.2762 ChangeLog
> --- mail/ChangeLog	1 Jul 2003 18:43:21 -0000	1.2762
> +++ mail/ChangeLog	11 Jul 2003 06:03:29 -0000
> @@ -1,3 +1,8 @@
> +2003-07-11  Antonio Xu  <antonio xu sun com>
> +
> +	* folder-browser-ui.c: Change the mask of EditPaste to IS_0MESSAGE
> +	fix bug #46018.
> +
>  2003-06-27  Jeffrey Stedfast  <fejj ximian com>
>  
>  	* message-list.c (filter_date): Use the newer utf8 versions of the
-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com