[Galago-commits] r2932 - in trunk/eds-feed: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-10-16 13:13:29 -0700 (Mon, 16 Oct 2006)
New Revision: 2932

Modified:
   trunk/eds-feed/ChangeLog
   trunk/eds-feed/configure.ac
   trunk/eds-feed/src/main.c
Log:
- Patch by Oystein Gisnas to fix building with evolution-data-server 1.8.x.
- Bump to version 0.5.0.90.


Modified: trunk/eds-feed/ChangeLog
===================================================================
--- trunk/eds-feed/ChangeLog	2006-10-16 09:52:39 UTC (rev 2931)
+++ trunk/eds-feed/ChangeLog	2006-10-16 20:13:29 UTC (rev 2932)
@@ -1,3 +1,11 @@
+Mon Oct 16 13:12:30 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/main.c:
+	* configure.ac:
+	  - Patch by Oystein Gisnas to fix building with
+	    evolution-data-server 1.8.x.
+	  - Bump to version 0.5.0.90.
+
 ==================== 0.5.0 ====================
 
 Thu Apr 20 00:48:27 PDT 2006  Christian Hammond <chipx86 at chipx86.com>

Modified: trunk/eds-feed/configure.ac
===================================================================
--- trunk/eds-feed/configure.ac	2006-10-16 09:52:39 UTC (rev 2931)
+++ trunk/eds-feed/configure.ac	2006-10-16 20:13:29 UTC (rev 2932)
@@ -3,7 +3,7 @@
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT(eds-feed, 0.5.0, chipx86 at gnupdate.org)
+AC_INIT(eds-feed, 0.5.0.90, chipx86 at gnupdate.org)
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(config.h.in)
 AC_COPYRIGHT([Copyright 2004-2006 Christian Hammond])
@@ -14,7 +14,7 @@
 EDS_FEED_MAJOR_VERSION=0
 EDS_FEED_MINOR_VERSION=5
 EDS_FEED_MICRO_VERSION=0
-EDS_FEED_DEVEL_VERSION=0
+EDS_FEED_DEVEL_VERSION=90
 
 EDS_FEED_VERSION=$EDS_FEED_MAJOR_VERSION.$EDS_FEED_MINOR_VERSION.$EDS_FEED_MICRO_VERSION
 

Modified: trunk/eds-feed/src/main.c
===================================================================
--- trunk/eds-feed/src/main.c	2006-10-16 09:52:39 UTC (rev 2931)
+++ trunk/eds-feed/src/main.c	2006-10-16 20:13:29 UTC (rev 2932)
@@ -184,12 +184,12 @@
 		{
 			case E_CONTACT_PHOTO_TYPE_INLINED:
 				photo = galago_image_new_from_data(
-					(guchar *)ephoto->inlined.data, ephoto->inlined.length);
+					(guchar *)ephoto->data.inlined.data, ephoto->data.inlined.length);
 				break;
 
 			case E_CONTACT_PHOTO_TYPE_URI:
-				if (g_str_has_prefix(ephoto->uri, "file://"))
-					photo = galago_image_new_from_file(ephoto->uri + 7);
+				if (g_str_has_prefix(ephoto->data.uri, "file://"))
+					photo = galago_image_new_from_file(ephoto->data.uri + 7);
 				else
 				{
 					/* TODO: use gnome-vfs? */