changeset
merge of 'b0e9ddccdbb9755cfc87f378934ba1b3b0c46b68'
Fri, 27 Apr 2007 03:46:47 +0000
- author
- Daniel Atallah <datallah@pidgin.im>
- date
- Fri, 27 Apr 2007 03:46:47 +0000
- changeset 16558
- d98a53c5650c
- parent 16557
- b0e9ddccdbb9 (current diff)
- parent 16554
- 63f70c76f8c5 (diff)
- child 16559
- 3a6e1a950818
- child 16560
- 6d1c2bb6ee4c
- child 16753
- 856fb90cb986
merge of 'b0e9ddccdbb9755cfc87f378934ba1b3b0c46b68'
and '63f70c76f8c57b1ab0892145cdc65084e3d93c98'
--- 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));
