SOURCES (DEVEL): eog-debug.patch, eog-desktop.patch - updated for ...
freetz
freetz at pld-linux.org
Tue Jan 31 00:24:15 CET 2006
Author: freetz Date: Mon Jan 30 23:24:15 2006 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 2.13.90
---- Files affected:
SOURCES:
eog-debug.patch (1.1 -> 1.1.2.1) , eog-desktop.patch (1.1 -> 1.1.4.1)
---- Diffs:
================================================================
Index: SOURCES/eog-debug.patch
diff -u SOURCES/eog-debug.patch:1.1 SOURCES/eog-debug.patch:1.1.2.1
--- SOURCES/eog-debug.patch:1.1 Thu Oct 13 14:57:04 2005
+++ SOURCES/eog-debug.patch Tue Jan 31 00:24:10 2006
@@ -1,7 +1,7 @@
-diff -aurN eog-2.12.1.orig/libeog/eog-image.c eog-2.12.1/libeog/eog-image.c
---- eog-2.12.1.orig/libeog/eog-image.c 2005-10-03 23:04:28.000000000 +0200
-+++ eog-2.12.1/libeog/eog-image.c 2005-10-13 14:30:56.000000000 +0200
-@@ -906,8 +906,10 @@
+diff -aurN eog-2.13.90.orig/libeog/eog-image.c eog-2.13.90/libeog/eog-image.c
+--- eog-2.13.90.orig/libeog/eog-image.c 2006-01-21 04:32:28.000000000 +0100
++++ eog-2.13.90/libeog/eog-image.c 2006-01-31 00:19:25.380754000 +0100
+@@ -909,8 +909,10 @@
g_return_val_if_fail (EOG_IS_IMAGE (img), FALSE);
priv = EOG_IMAGE (img)->priv;
@@ -13,10 +13,11 @@
if (data2read == 0) {
/* nothing to read */
-@@ -942,8 +944,9 @@
+@@ -944,9 +946,9 @@
+ else {
success = eog_image_real_load (img, data2read, job, error);
}
-
+-
+#ifdef DEBUG
g_print ("load success: %i\n", success);
-
@@ -24,98 +25,73 @@
/* perform required transformation */
if (eog_image_needs_transformation (img)) {
if (job != NULL) {
-diff -aurN eog-2.12.1.orig/libeog/eog-image-list.c eog-2.12.1/libeog/eog-image-list.c
---- eog-2.12.1.orig/libeog/eog-image-list.c 2005-07-10 21:48:35.000000000 +0200
-+++ eog-2.12.1/libeog/eog-image-list.c 2005-10-13 14:32:20.000000000 +0200
-@@ -701,15 +701,19 @@
+diff -aurN eog-2.13.90.orig/libeog/eog-image-list.c eog-2.13.90/libeog/eog-image-list.c
+--- eog-2.13.90.orig/libeog/eog-image-list.c 2006-01-07 05:54:57.000000000 +0100
++++ eog-2.13.90/libeog/eog-image-list.c 2006-01-31 00:20:04.280754000 +0100
+@@ -753,16 +753,17 @@
+ g_return_if_fail (EOG_IS_IMAGE_LIST (list));
priv = list->priv;
-
+-
+#ifdef DEBUG
- g_print ("n_images: %i/%i\n", priv->n_images, g_list_length (priv->store));
+ g_print ("n_images: %i/%u\n", priv->n_images, g_list_length (priv->store));
+#endif
-+
for (it = priv->store; it != NULL; it = it->next) {
gint width, height;
EogImage *img = EOG_IMAGE (it->data);
char *uri_str = eog_image_get_uri_for_display (img);
eog_image_get_size (img, &width, &height);
-
-+
-+#ifdef DEBUG
++#ifdef DEBUG
g_print ("%3i %s (%i/%i)\n", i++, uri_str, width, height);
-
+#endif
g_free (uri_str);
}
}
-diff -aurN eog-2.12.1.orig/libeog/eog-info-view.c eog-2.12.1/libeog/eog-info-view.c
---- eog-2.12.1.orig/libeog/eog-info-view.c 2005-07-15 13:34:07.000000000 +0200
-+++ eog-2.12.1/libeog/eog-info-view.c 2005-10-13 14:33:37.000000000 +0200
-@@ -111,7 +111,9 @@
+diff -aurN eog-2.13.90.orig/libeog/eog-info-view.c eog-2.13.90/libeog/eog-info-view.c
+--- eog-2.13.90.orig/libeog/eog-info-view.c 2006-01-07 05:54:57.000000000 +0100
++++ eog-2.13.90/libeog/eog-info-view.c 2006-01-31 00:20:35.140754000 +0100
+@@ -114,7 +114,9 @@
ExifData *ed;
ed = eog_image_get_exif_information (image);
-+#ifdef DEBUG
++#ifdef DEBUG
g_print ("Show exif data\n");
+#endif
eog_info_view_exif_show_data (EOG_INFO_VIEW_EXIF (view->priv->exif_view), ed);
if (ed != NULL) {
gtk_widget_show_all (gtk_widget_get_parent (GTK_WIDGET (view->priv->exif_view)));
-diff -aurN eog-2.12.1.orig/libeog/eog-job.c eog-2.12.1/libeog/eog-job.c
---- eog-2.12.1.orig/libeog/eog-job.c 2005-06-24 01:15:16.000000000 +0200
-+++ eog-2.12.1/libeog/eog-job.c 2005-10-13 14:49:43.000000000 +0200
-@@ -7,8 +7,9 @@
- #include "eog-job.h"
-
- static guint last_job_id = 0;
-+#ifdef DEBUG
- #define DEBUG_EOG_JOB 1
--
-+#endif
- enum {
- PROP_0,
- PROP_PROGRESS_THRESHOLD,
-@@ -113,7 +114,9 @@
+diff -aurN eog-2.13.90.orig/libeog/eog-job.c eog-2.13.90/libeog/eog-job.c
+--- eog-2.13.90.orig/libeog/eog-job.c 2006-01-07 05:54:57.000000000 +0100
++++ eog-2.13.90/libeog/eog-job.c 2006-01-31 00:21:05.700754000 +0100
+@@ -112,9 +112,9 @@
+ EogJobPrivate *priv;
priv = EOG_JOB (object)->priv;
-
+-
+#ifdef DEBUG
- g_print ("Job %.3i: disposing ...\n", priv->id);
+ g_print ("Job %.3u: disposing ...\n", priv->id);
+-
+#endif
-
if (priv->mutex != NULL) {
g_mutex_lock (priv->mutex);
-@@ -132,8 +135,11 @@
+ if (priv->data != NULL)
+@@ -132,8 +132,9 @@
g_mutex_free (priv->mutex);
priv->mutex = NULL;
}
-
-+
+#ifdef DEBUG
- g_print ("Job %.3i: disposing end\n", priv->id);
+ g_print ("Job %.3u: disposing end\n", priv->id);
+#endif
-+
}
static void
-diff -aurN eog-2.12.1.orig/libeog/eog-job-manager.c eog-2.12.1/libeog/eog-job-manager.c
---- eog-2.12.1.orig/libeog/eog-job-manager.c 2005-08-09 17:20:26.000000000 +0200
-+++ eog-2.12.1/libeog/eog-job-manager.c 2005-10-13 14:50:12.000000000 +0200
-@@ -10,7 +10,9 @@
- } ThreadData;
-
- #define MAX_THREADS 2
-+#ifdef DEBUG
- #define DEBUG_JOB_MANAGER 1
-+#endif
- GMutex *mutex = NULL;
- GCond *cond = NULL;
- GQueue *job_list = NULL;
-diff -aurN eog-2.12.1.orig/shell/eog-window.c eog-2.12.1/shell/eog-window.c
---- eog-2.12.1.orig/shell/eog-window.c 2005-10-03 23:04:33.000000000 +0200
-+++ eog-2.12.1/shell/eog-window.c 2005-10-13 14:36:11.000000000 +0200
-@@ -2727,9 +2727,9 @@
+diff -aurN eog-2.13.90.orig/shell/eog-window.c eog-2.13.90/shell/eog-window.c
+--- eog-2.13.90.orig/shell/eog-window.c 2006-01-16 22:58:33.000000000 +0100
++++ eog-2.13.90/shell/eog-window.c 2006-01-31 00:22:04.470754000 +0100
+@@ -2872,9 +2872,9 @@
/* make sure window is usable */
width = CLAMP (width, 100, screen_width);
height = CLAMP (height, 100, screen_height);
@@ -127,13 +103,3 @@
gtk_window_set_default_size (GTK_WINDOW (window), width, height);
}
#endif
-@@ -2864,7 +2864,9 @@
- XFree (str);
- return profile;
- } else {
-+#ifdef DEBUG
- g_printerr("No profile, not correcting\n");
-+#endif
- return NULL;
- }
- }
================================================================
Index: SOURCES/eog-desktop.patch
diff -u SOURCES/eog-desktop.patch:1.1 SOURCES/eog-desktop.patch:1.1.4.1
--- SOURCES/eog-desktop.patch:1.1 Wed Nov 17 12:02:38 2004
+++ SOURCES/eog-desktop.patch Tue Jan 31 00:24:10 2006
@@ -1,11 +1,11 @@
-diff -urN eog-2.8.1.orig/eog.desktop.in eog-2.8.1/eog.desktop.in
---- eog-2.8.1.orig/eog.desktop.in 2004-11-17 11:56:12.489393728 +0100
-+++ eog-2.8.1/eog.desktop.in 2004-11-17 11:57:02.164841912 +0100
+diff -aurN eog-2.13.90.orig/eog.desktop.in.in eog-2.13.90/eog.desktop.in.in
+--- eog-2.13.90.orig/eog.desktop.in.in 2006-01-26 06:17:59.000000000 +0100
++++ eog-2.13.90/eog.desktop.in.in 2006-01-31 00:04:10.020754000 +0100
@@ -8,7 +8,7 @@
StartupNotify=true
Terminal=false
Type=Application
--Categories=GNOME;Application;Graphics;RasterGraphics;Viewer;
+-Categories=GNOME;GTK;Application;Graphics;RasterGraphics;Viewer;
+Categories=GTK;GNOME;Graphics;Viewer;
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=EOG
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/eog-debug.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/SOURCES/eog-desktop.patch?r1=1.1&r2=1.1.4.1&f=u
More information about the pld-cvs-commit
mailing list