Mercurial > pidgin
changeset 16488:5f57cd067579
merge of '11e5b1fa24c811784613e66b0a9e73aa3b2a82ca'
and 'f051493af8a1173b1310c2e130013cda126fa6ce'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 27 Apr 2007 03:46:47 +0000 |
| parents | b8b2e35ec7c6 (current diff) dec693050305 (diff) |
| children | ce6b4346e56d 15f79c0cd0b9 74daf9fc9cf3 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Fri Apr 27 03:45:56 2007 +0000 +++ b/libpurple/core.c Fri Apr 27 03:46:47 2007 +0000 @@ -310,7 +310,7 @@ gboolean purple_core_migrate(void) { -#error This code wants to migrate your .gaim directory to .purple. It is strongly suggested that you back .gaim up before proceeding. +#error You probably want to back up your .gaim directory right now. This revision is going to destroy it, potentially not in the way we've intended const char *user_dir = purple_user_dir(); char *old_user_dir = g_strconcat(purple_home_dir(), G_DIR_SEPARATOR_S ".gaim", NULL); @@ -597,7 +597,7 @@ return FALSE; } - if (!fwrite(buf, size, 1, new_file)) + if (!fwrite(buf, size, 1, new_file) && ferror(new_file) != 0) { purple_debug_error("core", "Error writing %s: %s\n", new_name, strerror(errno));