rpms/eog/devel eog-2.19.4-svgz.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 eog.spec, 1.85, 1.86 sources, 1.47, 1.48 eog-2.19.2-svgz.patch, 1.1, NONE

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Jul 10 14:55:44 UTC 2007


Author: mclasen

Update of /cvs/pkgs/rpms/eog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25611

Modified Files:
	.cvsignore eog.spec sources 
Added Files:
	eog-2.19.4-svgz.patch 
Removed Files:
	eog-2.19.2-svgz.patch 
Log Message:
2.19.4


eog-2.19.4-svgz.patch:

--- NEW FILE eog-2.19.4-svgz.patch ---
diff -up eog-2.19.4/src/eog-image.c.svgz eog-2.19.4/src/eog-image.c
--- eog-2.19.4/src/eog-image.c.svgz	2007-07-09 16:20:10.000000000 -0400
+++ eog-2.19.4/src/eog-image.c	2007-07-10 10:41:07.000000000 -0400
@@ -480,7 +480,7 @@ eog_image_apply_transformations (EogImag
 }
 
 static GnomeVFSFileSize
-eog_image_determine_file_bytes (EogImage *img, GError **error)
+eog_image_determine_file_bytes (EogImage *img, gchar **mime_type, GError **error)
 {
 	GnomeVFSFileInfo *info;
 	GnomeVFSFileSize bytes;
@@ -491,11 +491,14 @@ eog_image_determine_file_bytes (EogImage
 	result = gnome_vfs_get_file_info_uri (img->priv->uri,
 					      info,
 					      GNOME_VFS_FILE_INFO_DEFAULT |
+					      GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
 					      GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
 
 	if ((result != GNOME_VFS_OK) || 
 	    (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) {
 		bytes = 0;
+		if (mime_type)
+			*mime_type = NULL;
 
 		g_set_error (error, 
 			     EOG_IMAGE_ERROR, 
@@ -503,6 +506,8 @@ eog_image_determine_file_bytes (EogImage
 			     gnome_vfs_result_to_string (result));
 	} else {
 		bytes = info->size;
+		if (mime_type)
+			*mime_type = g_strdup (info->mime_type);
 	}
 
 	gnome_vfs_file_info_unref (info);
@@ -834,6 +839,7 @@ eog_image_real_load (EogImage *img, 
 	GnomeVFSResult result;
 	EogMetadataReader *md_reader = NULL;
 	GdkPixbufFormat *format;
+	gchar *mime_type;
 	GdkPixbufLoader *loader = NULL;
 	guchar *buffer;
 	gboolean failed = FALSE;
@@ -852,9 +858,10 @@ eog_image_real_load (EogImage *img, 
 		priv->file_type = NULL;
 	}
 
-	priv->bytes = eog_image_determine_file_bytes (img, error);
+	priv->bytes = eog_image_determine_file_bytes (img, &mime_type, error);
 
 	if (priv->bytes == 0) {
+                g_free (mime_type);
 		return FALSE;
 	}
 
@@ -877,6 +884,7 @@ eog_image_real_load (EogImage *img, 
 	result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ);
 
 	if (result != GNOME_VFS_OK) {
+		g_free (mime_type);
 		g_set_error (error, 
 			     EOG_IMAGE_ERROR, 
 			     EOG_IMAGE_ERROR_VFS,
@@ -886,9 +894,12 @@ eog_image_real_load (EogImage *img, 
 	}
 	
 	buffer = g_new0 (guchar, EOG_IMAGE_READ_BUFFER_SIZE);
+	loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
+	g_free (mime_type);
+	if (loader == NULL)
+		loader = gdk_pixbuf_loader_new (); 
 
 	if (read_image_data || read_only_dimension) {
-		loader = gdk_pixbuf_loader_new ();
 
 		g_signal_connect_object (G_OBJECT (loader), 
 					 "size-prepared", 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore	5 Jun 2007 03:08:55 -0000	1.47
+++ .cvsignore	10 Jul 2007 14:55:11 -0000	1.48
@@ -1 +1 @@
-eog-2.19.3.tar.bz2
+eog-2.19.4.tar.bz2


Index: eog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/eog.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- eog.spec	7 Jul 2007 03:32:15 -0000	1.85
+++ eog.spec	10 Jul 2007 14:55:11 -0000	1.86
@@ -1,24 +1,23 @@
-%define glib2_version 2.2.0
-%define pango_version 1.2.0
-%define gtk2_version 2.7.1
-%define libgnomeui_version 2.5.92
-%define desktop_file_utils_version 0.9
-%define gail_version 1.2.0
-%define eel2_version 2.2.0
-%define gnome_vfs2_version 2.5.91
+%define gtk2_version 2.10.0
+%define glib2_version 2.12.0
+%define gnome_vfs2_version 2.10.0
+%define libgnomeui_version 2.6.0
 %define libglade_version 2.3.6
-%define libexif_version 0.6.12
 %define libart_version 2.3.16
 %define gnome_desktop_version 2.10.0
 %define gnome_icon_theme_version 2.17.1
+%define desktop_file_utils_version 0.9
+%define gail_version 1.2.0
+%define eel2_version 2.2.0
+%define libexif_version 0.6.12
 
 Summary: Eye of GNOME image viewer
 Name:    eog
-Version: 2.19.3
-Release: 2%{?dist}
+Version: 2.19.4
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source: http://download.gnome.org/sources/eog/2.19/%{name}-%{version}.tar.bz2
-Patch0: eog-2.19.2-svgz.patch
+Patch0: eog-2.19.4-svgz.patch
 License: GPL 
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -153,6 +152,9 @@
 %{_libdir}/pkgconfig/eog.pc
 
 %changelog
+* Tue Jul 10 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.4-1
+- Update to 2.19.4
+
 * Fri Jul  6 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.3-2
 - Fix a directory ownership issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eog/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	5 Jun 2007 03:08:55 -0000	1.47
+++ sources	10 Jul 2007 14:55:11 -0000	1.48
@@ -1 +1 @@
-2f27b942c44e91d3b0f6f55f72f5ff5a  eog-2.19.3.tar.bz2
+b87418cd52ad345bc0f513ac696d5250  eog-2.19.4.tar.bz2


--- eog-2.19.2-svgz.patch DELETED ---




More information about the scm-commits mailing list