gthumb r2199 - in trunk: . data src

[mjc svn gnome org]

Author: mjc
Date: Fri Jan 18 13:10:45 2008
New Revision: 2199
URL: http://svn.gnome.org/viewvc/gthumb?rev=2199&view=rev

Log:
Merged 2197:2198 from gthumb-2-10.


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/data/gthumb.desktop.in
   trunk/src/gth-window-actions-callbacks.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Jan 18 13:10:45 2008
@@ -64,6 +64,7 @@
 --------------
 
 	* Fixed bug #508873 - gthumb cannot scale up images
+	* Fixed bug #510326 - x-content/* support
 
 version 2.10.8
 --------------

Modified: trunk/data/gthumb.desktop.in
==============================================================================
--- trunk/data/gthumb.desktop.in	(original)
+++ trunk/data/gthumb.desktop.in	Fri Jan 18 13:10:45 2008
@@ -6,7 +6,7 @@
 Encoding=UTF-8
 Exec=gthumb %U
 Icon=gthumb
-MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;
+MimeType=image/bmp;image/jpeg;image/gif;image/png;image/tiff;image/x-bmp;image/x-ico;image/x-png;image/x-pcx;image/x-tga;image/xpm;image/svg+xml;x-content/image-dcf;x-content/image-picturecd;
 StartupNotify=true
 Terminal=false
 Type=Application

Modified: trunk/src/gth-window-actions-callbacks.c
==============================================================================
--- trunk/src/gth-window-actions-callbacks.c	(original)
+++ trunk/src/gth-window-actions-callbacks.c	Fri Jan 18 13:10:45 2008
@@ -922,7 +922,7 @@
 
 	gtk_show_about_dialog (GTK_WINDOW (window),
                                "version", VERSION,
-                               "copyright", "Copyright \xc2\xa9 2001-2006 Free Software Foundation, Inc.",
+                               "copyright", "Copyright \xc2\xa9 2001-2008 Free Software Foundation, Inc.",
                                "comments", _("An image viewer and browser for GNOME."),
                                "authors", authors,
                                "documenters", documenters,