diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-08-23 02:37:03 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-08-23 02:37:03 +0800 |
| commit | 6fea277b7a74570243989f30b09ae895bc96ee47 (patch) | |
| tree | 6d00a53ab472461b8c97950509955b7e15a89004 | |
| parent | b20c988f3666eb71dfd934c14d1934a09e24aa84 (diff) | |
| download | gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar.gz gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar.bz2 gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar.lz gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar.xz gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.tar.zst gsoc2013-evolution-6fea277b7a74570243989f30b09ae895bc96ee47.zip | |
When reporting an error, use my_file_name instead of file_name since
2001-08-22 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (save): When reporting an error, use
my_file_name instead of file_name since file_name can be NULL.
svn path=/trunk/; revision=12387
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 0c4fc803d8..9e795ab166 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2001-08-22 Jeffrey Stedfast <fejj@ximian.com> + + * e-msg-composer.c (save): When reporting an error, use + my_file_name instead of file_name since file_name can be NULL. + 2001-08-21 Ettore Perazzoli <ettore@ximian.com> * e-msg-composer.c (autosave_manager_query_load_orphans): diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 740a294124..a0a5c1d6d8 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -871,8 +871,10 @@ save (EMsgComposer *composer, if ((fd = open (my_file_name, O_RDONLY | O_CREAT | O_EXCL)) == -1) { GtkWidget *dialog, *label; - dialog = gnome_dialog_new (_("Warning!"), GNOME_STOCK_BUTTON_YES, - GNOME_STOCK_BUTTON_NO, NULL); + dialog = gnome_dialog_new (_("Warning!"), + GNOME_STOCK_BUTTON_YES, + GNOME_STOCK_BUTTON_NO, + NULL); label = gtk_label_new (_("File exists, overwrite?")); gtk_widget_show (label); gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), label, TRUE, TRUE, 0); @@ -895,7 +897,7 @@ save (EMsgComposer *composer, if (ev._major != CORBA_NO_EXCEPTION) { e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR, - _("Error saving file: %s"), g_basename (file_name)); + _("Error saving file: %s"), g_basename (my_file_name)); } CORBA_exception_free (&ev); @@ -904,8 +906,7 @@ save (EMsgComposer *composer, } static void -load (EMsgComposer *composer, - const char *file_name) +load (EMsgComposer *composer, const char *file_name) { CORBA_Environment ev; |