Re: [evolution-patches] Re: patch for #49696

[Charles Zhang <Charles Zhang Sun Com>]

Then you have commited the right file now?


Jeffrey Stedfast wrote:

> sorry, thought I had committed that file but I hadn't
>
> Jeff
>
> On Wed, 2003-10-15 at 13:10, Charles Zhang wrote:
>  
>
> > Hi, Jeffrey.
> >
> > You have mentioned in the patch for bug 48759, that the file 
> > e-msg-composer-select-file.c should be altered to let File->Save bring 
> > up proper dialog, but not the dialog whose title is always "Attach ..." 
> > when composing a mail.
> >
> > But I can only find these words in the ChangeLog, and nothing changed 
> > with the file e-msg-composer-select-file.c.
> > Have you ever fixed it or you have forgotten that?
> >
> > I have given a patch to the very bug, please see if it works.
> > Thank you.
> >
> > Best Regards
> > Charles Zhang
> >
> >
> > ______________________________________________________________________
> > Index: composer/ChangeLog
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
> > retrieving revision 1.544.2.16
> > diff -u -p -r1.544.2.16 ChangeLog
> > --- composer/ChangeLog	6 Oct 2003 17:07:16 -0000	1.544.2.16
> > +++ composer/ChangeLog	15 Oct 2003 16:51:35 -0000
> > @@ -0,0 +0,13 @@
> > +2003-10-14  Charles Zhang  <charles zhang sun com>
> > +
> > +	* e-msg-composer.c (save): save to single file
> > +	(menu_file_save_cb): open multi file
> > +
> > +	* e-msg-composer-select-file.c (e_msg_composer_select_file): Correct
> > +	the title of dialog from forever "Attach ..." to proper words "open"
> > +	or "save".
> > +
> > +	* e-msg-composer-select-file.h (e_msg_composer_select_file): alter
> > +	function's declaration, caller should specify if multi file can be
> > +	selected. [49696]
> > +
> > Index: composer/e-msg-composer-select-file.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.c,v
> > retrieving revision 1.25
> > diff -u -p -r1.25 e-msg-composer-select-file.c
> > --- composer/e-msg-composer-select-file.c	2 Apr 2003 18:51:01 -0000	1.25
> > +++ composer/e-msg-composer-select-file.c	15 Oct 2003 16:51:39 -0000
> > @@ -39,7 +39,7 @@
> > #include "e-msg-composer-select-file.h"
> >
> > static GtkFileSelection *
> > -run_selector(EMsgComposer *composer, const char *title, int multi, gboolean *showinline_p)
> > +run_selector(EMsgComposer *composer, const char *title, gboolean multi, gboolean *showinline_p)
> > {
> > 	GtkFileSelection *selection;
> > 	GtkWidget *showinline = NULL;
> > @@ -94,12 +94,12 @@ run_selector(EMsgComposer *composer, con
> >  * cancelled.
> >  **/
> > char *
> > -e_msg_composer_select_file (EMsgComposer *composer, const char *title)
> > +e_msg_composer_select_file (EMsgComposer *composer, const char *title, gboolean multi)
> > {
> > 	GtkFileSelection *selection;
> > 	char *name = NULL;
> >
> > -	selection = run_selector(composer, _("Attach file(s)"), TRUE, NULL);
> > +	selection = run_selector(composer, title, multi, NULL);
> > 	if (selection) {
> > 		name = g_strdup(gtk_file_selection_get_filename(selection));
> > 		gtk_widget_destroy((GtkWidget *)selection);
> > Index: composer/e-msg-composer-select-file.h
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/e-msg-composer-select-file.h,v
> > retrieving revision 1.5
> > diff -u -p -r1.5 e-msg-composer-select-file.h
> > --- composer/e-msg-composer-select-file.h	11 Dec 2001 01:01:05 -0000	1.5
> > +++ composer/e-msg-composer-select-file.h	15 Oct 2003 16:51:39 -0000
> > @@ -27,7 +27,7 @@
> > #include "e-msg-composer.h"
> >
> > char *e_msg_composer_select_file (EMsgComposer *composer,
> > -				  const char *title);
> > +				  const char *title, gboolean multi);
> >
> > GPtrArray *e_msg_composer_select_file_attachments (EMsgComposer *composer,
> > 						   gboolean *inline_p);
> > Index: composer/e-msg-composer.c
> > ===================================================================
> > RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
> > retrieving revision 1.395.2.8
> > diff -u -p -r1.395.2.8 e-msg-composer.c
> > --- composer/e-msg-composer.c	6 Oct 2003 17:07:16 -0000	1.395.2.8
> > +++ composer/e-msg-composer.c	15 Oct 2003 16:52:08 -0000
> > @@ -1174,7 +1174,7 @@ save (EMsgComposer *composer, const char
> > 	if (default_filename != NULL)
> > 		filename = g_strdup (default_filename);
> > 	else
> > -		filename = e_msg_composer_select_file (composer, _("Save as..."));
> > +		filename = e_msg_composer_select_file (composer, _("Save as..."), FALSE);
> > 	
> > 	if (filename == NULL)
> > 		return;
> > @@ -1618,7 +1618,7 @@ menu_file_open_cb (BonoboUIComponent *ui
> > 	
> > 	composer = E_MSG_COMPOSER (data);
> > 	
> > -	file_name = e_msg_composer_select_file (composer, _("Open file"));
> > +	file_name = e_msg_composer_select_file (composer, _("Open file"), TRUE);
> > 	if (file_name == NULL)
> > 		return;
> > 	
> >