diary r41 - in trunk: . data data/icons data/icons/16x16 data/icons/22x22 data/icons/32x32 data/icons/48x48 src

[pwithnall svn gnome org]

Author: pwithnall
Date: Fri Jun 20 17:17:53 2008
New Revision: 41
URL: http://svn.gnome.org/viewvc/diary?rev=41&view=rev

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

	* README:
	* configure.ac:
	* data/Makefile.am:
	* data/icons/16x16/Makefile.am:
	* data/icons/22x22/Makefile.am:
	* data/icons/32x32/Makefile.am:
	* data/icons/48x48/Makefile.am:
	* data/icons/Makefile.am: Added new icon by Jakub Szypulka.
	* src/storage-manager.c: (diary_storage_manager_connect): Clarified
	the error message given when both DB files exist.



Added:
   trunk/data/icons/   (props changed)
   trunk/data/icons/16x16/   (props changed)
   trunk/data/icons/16x16/Makefile.am
   trunk/data/icons/16x16/diary.png   (contents, props changed)
   trunk/data/icons/22x22/   (props changed)
   trunk/data/icons/22x22/Makefile.am
   trunk/data/icons/22x22/diary.png   (contents, props changed)
   trunk/data/icons/32x32/   (props changed)
   trunk/data/icons/32x32/Makefile.am
   trunk/data/icons/32x32/diary.png   (contents, props changed)
   trunk/data/icons/48x48/   (props changed)
   trunk/data/icons/48x48/Makefile.am
   trunk/data/icons/48x48/diary.png   (contents, props changed)
   trunk/data/icons/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/src/storage-manager.c

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Fri Jun 20 17:17:53 2008
@@ -23,6 +23,8 @@
 
 Philip Withnall <philip tecnocode co uk>
 
+Icon by Jakub Szypulka <cube szypulka com>
+
 BUGS
 ====
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jun 20 17:17:53 2008
@@ -107,4 +107,9 @@
 src/Makefile
 po/Makefile.in
 data/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/32x32/Makefile
+data/icons/48x48/Makefile
 ])

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -1,11 +1,24 @@
-# GtkBuilder UI file
+SUBDIRS = icons
 
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating GTK+ icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+# UI file
 uidir = $(datadir)/diary
 ui_DATA = diary.ui
 EXTRA_DIST = $(ui_DATA)
 
 # Desktop file
-
 desktop_in_files = diary.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)

Added: trunk/data/icons/16x16/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/16x16/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA = diary.png
+
+EXTRA_DIST = $(icon_DATA)

Added: trunk/data/icons/16x16/diary.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/22x22/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/22x22/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = diary.png
+
+EXTRA_DIST = $(icon_DATA)

Added: trunk/data/icons/22x22/diary.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/32x32/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/32x32/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = diary.png
+
+EXTRA_DIST = $(icon_DATA)

Added: trunk/data/icons/32x32/diary.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/48x48/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/48x48/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = diary.png
+
+EXTRA_DIST = $(icon_DATA)

Added: trunk/data/icons/48x48/diary.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/icons/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/icons/Makefile.am	Fri Jun 20 17:17:53 2008
@@ -0,0 +1 @@
+SUBDIRS = 16x16 22x22 32x32 48x48

Modified: trunk/src/storage-manager.c
==============================================================================
--- trunk/src/storage-manager.c	(original)
+++ trunk/src/storage-manager.c	Fri Jun 20 17:17:53 2008
@@ -420,7 +420,11 @@
 		/* 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) {
-			diary_interface_error (_("Both an encrypted and plaintext version of the database exist, and one is likely corrupt. Please delete the corrupt one before continuing."), diary->main_window);
+			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."),
+							self->priv->filename, 
+							self->priv->plain_filename);
+			diary_interface_error (error_message, diary->main_window);
+			g_free (error_message);
 			diary_quit ();
 		}