diary r55 - in trunk: . src

[pwithnall svn gnome org]

Author: pwithnall
Date: Mon Jun 23 16:36:21 2008
New Revision: 55
URL: http://svn.gnome.org/viewvc/diary?rev=55&view=rev

Log:
2008-06-23  Philip Withnall  <philip tecnocode co uk>

	* src/storage-manager.c: (diary_storage_manager_connect),
	(diary_storage_manager_disconnect): Improve error messages with
	advice on how to fix the problems.



Modified:
   trunk/ChangeLog
   trunk/src/storage-manager.c

Modified: trunk/src/storage-manager.c
==============================================================================
--- trunk/src/storage-manager.c	(original)
+++ trunk/src/storage-manager.c	Mon Jun 23 16:36:21 2008
@@ -422,7 +422,7 @@
 		/* If both files exist, throw an error. We can't be sure which is the corrupt one,
 		 * and attempting to go any further may jeopardise the good one. */
 		if (g_file_test (self->priv->plain_filename, G_FILE_TEST_IS_REGULAR) == TRUE) {
-			gchar *error_message = g_strdup_printf (_("Both an encrypted and plaintext version of the database exist as \"%s\" and \"%s\", and one is likely corrupt. Please delete the corrupt one before continuing."),
+			gchar *error_message = g_strdup_printf (_("Both an encrypted and plaintext version of the database exist as \"%s\" and \"%s\", and one is likely corrupt. Please delete the corrupt one (i.e. one which is 0KiB in size) before continuing. If neither file is 0Kib, the problem will most likely have been caused by Diary being unable to encrypt the database, so you should move the first file."),
 							self->priv->filename, 
 							self->priv->plain_filename);
 			diary_interface_error (error_message, diary->main_window);
@@ -479,7 +479,7 @@
 #ifdef ENABLE_ENCRYPTION
 	encryption_key = get_encryption_key ();
 	if (encryption_key == NULL) {
-		g_warning (_("Error getting encryption key: GConf key \"%s\" invalid or empty."), ENCRYPTION_KEY_GCONF_PATH);
+		g_message (_("Error getting encryption key: GConf key \"%s\" invalid or empty. Your diary will not be encrypted; please install Seahorse and set up a default key, or ignore this message."), ENCRYPTION_KEY_GCONF_PATH);
 		if (diary->quitting == TRUE)
 			diary_quit_real ();
 		return;