From 493cbfa6077850d2e134e3ac3dbe4cbf85a36e9b Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 25 Feb 2008 09:11:09 +0000 Subject: [PATCH] Make new strings reuse old ones. 2008-02-25 Alexander Larsson * glocalfile.c: Make new strings reuse old ones. svn path=/trunk/; revision=6581 --- gio/ChangeLog | 5 +++++ gio/glocalfile.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 32231ce..749792e 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,6 +1,11 @@ 2008-02-25 Alexander Larsson * glocalfile.c: + Make new strings reuse old ones. + +2008-02-25 Alexander Larsson + + * glocalfile.c: Implement trashing and filesystem::readonly for win32 (#517235) Patch from Yevgen Muntyan diff --git a/gio/glocalfile.c b/gio/glocalfile.c index 5e8cd75..fd9b931 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -1853,14 +1853,14 @@ g_local_file_trash (GFile *file, g_set_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Unable to trash file: %s"), - _("cancelled")); + _("Operation was cancelled")); success = FALSE; } else if (!success) g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, _("Unable to trash file: %s"), - _("failed")); + _("internal error")); g_free (wfilename); return success; -- 2.7.4