eog r4899 - in trunk: . bindings/python src

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Dec  8 14:14:43 2008
New Revision: 4899
URL: http://svn.gnome.org/viewvc/eog?rev=4899&view=rev

Log:
2008-10-08  Claudio Saavedra  <csaavedra igalia com>

	* bindings/python/eog.defs:
	* src/eog-jobs.c: (eog_job_load_new), (eog_job_load_run):
	* src/eog-jobs.h:
	* src/eog-window.c: (handle_image_selection_changed_cb):

	Add a EogImageData parameter to eog_job_load_new(), in order
	to let specify particular data to be loaded by the job.



Modified:
   trunk/ChangeLog
   trunk/bindings/python/eog.defs
   trunk/src/eog-jobs.c
   trunk/src/eog-jobs.h
   trunk/src/eog-window.c

Modified: trunk/bindings/python/eog.defs
==============================================================================
--- trunk/bindings/python/eog.defs	(original)
+++ trunk/bindings/python/eog.defs	Mon Dec  8 14:14:43 2008
@@ -576,6 +576,7 @@
   (return-type "EogJob*")
   (parameters
     '("EogImage*" "image")
+    '("EogImageData" "data")
   )
 )
 

Modified: trunk/src/eog-jobs.c
==============================================================================
--- trunk/src/eog-jobs.c	(original)
+++ trunk/src/eog-jobs.c	Mon Dec  8 14:14:43 2008
@@ -266,7 +266,7 @@
 }
 
 EogJob *
-eog_job_load_new (EogImage *image)
+eog_job_load_new (EogImage *image, EogImageData data)
 {
 	EogJobLoad *job;
 
@@ -275,6 +275,7 @@
 	if (image) {
 		job->image = g_object_ref (image);
 	}
+	job->data = data;
 
 	return EOG_JOB (job);
 }
@@ -290,7 +291,7 @@
 	}
 
 	eog_image_load (EOG_IMAGE (job->image),
-			EOG_IMAGE_DATA_ALL,
+			job->data,
 			EOG_JOB (job),
 			&EOG_JOB (job)->error);
 

Modified: trunk/src/eog-jobs.h
==============================================================================
--- trunk/src/eog-jobs.h	(original)
+++ trunk/src/eog-jobs.h	Mon Dec  8 14:14:43 2008
@@ -27,6 +27,7 @@
 
 #include "eog-list-store.h"
 #include "eog-transform.h"
+#include "eog-enums.h"
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -146,8 +147,9 @@
 
 struct _EogJobLoad
 {
-	EogJob    parent;
-	EogImage *image;
+	EogJob        parent;
+	EogImage     *image;
+	EogImageData  data;
 };
 
 struct _EogJobLoadClass
@@ -242,7 +244,8 @@
 
 /* EogJobLoad */
 GType           eog_job_load_get_type      (void) G_GNUC_CONST;
-EogJob 	       *eog_job_load_new 	   (EogImage        *image);
+EogJob 	       *eog_job_load_new 	   (EogImage        *image,
+					    EogImageData     data);
 void		eog_job_load_run 	   (EogJobLoad 	    *load);
 
 /* EogJobModel */

Modified: trunk/src/eog-window.c
==============================================================================
--- trunk/src/eog-window.c	(original)
+++ trunk/src/eog-window.c	Mon Dec  8 14:14:43 2008
@@ -1576,7 +1576,7 @@
 				  window);
 	}
 
-	priv->load_job = eog_job_load_new (image);
+	priv->load_job = eog_job_load_new (image, EOG_IMAGE_DATA_ALL);
 
 	g_signal_connect (priv->load_job,
 			  "finished",