evolution-data-server r9294 - in trunk/servers/google: libgdata libgdata-google

[mcrha svn gnome org]

Author: mcrha
Date: Thu Aug  7 09:17:19 2008
New Revision: 9294
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9294&view=rev

Log:
2008-08-07  Milan Crha  <mcrha redhat com>

	** Part of fix for bug #535745

	* servers/google/libgdata/Makefile.am:
	* servers/google/libgdata/libgdata.pc.in: Put public include files to google/libgdata.
	* servers/google/libgdata/gdata-entry.c: (gdata_entry_new_from_xmlptr): When reading custom
	values from the node, and the node doesn't contain text value, then
	try to read its value from 'value' attribute.

	* servers/google/libgdata-google/Makefile.am: Put public include files to google/libgdata-google.
	* servers/google/libgdata-google/libgdata-google.pc.in: Do include also path to libgdata in CFLAGS.



Modified:
   trunk/servers/google/libgdata-google/ChangeLog
   trunk/servers/google/libgdata-google/Makefile.am
   trunk/servers/google/libgdata-google/libgdata-google.pc.in
   trunk/servers/google/libgdata/ChangeLog
   trunk/servers/google/libgdata/Makefile.am
   trunk/servers/google/libgdata/gdata-entry.c
   trunk/servers/google/libgdata/libgdata.pc.in

Modified: trunk/servers/google/libgdata-google/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata-google/Makefile.am	(original)
+++ trunk/servers/google/libgdata-google/Makefile.am	Thu Aug  7 09:17:19 2008
@@ -20,7 +20,7 @@
 libgdata_google_1_2_la_LDFLAGS =	                       \
         -version-info $(LIBGDATA_GOOGLE_CURRENT):$(LIBGDATA_GOOGLE_REVISION):$(LIBGDATA_GOOGLE_AGE) $(NO_UNDEFINED)
 
-libgdata_google_includedir = $(privincludedir)/google/gdata-google
+libgdata_google_includedir = $(privincludedir)/google/libgdata-google
 
 libgdata_google_include_HEADERS =       		        \
 	gdata-google-service.h             	

Modified: trunk/servers/google/libgdata-google/libgdata-google.pc.in
==============================================================================
--- trunk/servers/google/libgdata-google/libgdata-google.pc.in	(original)
+++ trunk/servers/google/libgdata-google/libgdata-google.pc.in	Thu Aug  7 09:17:19 2008
@@ -15,4 +15,4 @@
 Version: @VERSION@
 Requires: libsoup-2.4 >= @LIBSOUP_REQUIRED@ 
 Libs: -L${libdir} -lgdata-google-1.2
-Cflags: -I${privincludedir}/gdata-google
+Cflags: -I${privincludedir}/google/libgdata -I${privincludedir}/google/libgdata-google

Modified: trunk/servers/google/libgdata/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata/Makefile.am	(original)
+++ trunk/servers/google/libgdata/Makefile.am	Thu Aug  7 09:17:19 2008
@@ -22,7 +22,7 @@
 libgdata_1_2_la_LDFLAGS =                       \
         -version-info $(LIBGDATA_CURRENT):$(LIBGDATA_REVISION):$(LIBGDATA_AGE) $(NO_UNDEFINED)
 
-libgdataincludedir = $(privincludedir)/google/gdata
+libgdataincludedir = $(privincludedir)/google/libgdata
 
 libgdatainclude_HEADERS =                  	\
         gdata-feed.h                       	\

Modified: trunk/servers/google/libgdata/gdata-entry.c
==============================================================================
--- trunk/servers/google/libgdata/gdata-entry.c	(original)
+++ trunk/servers/google/libgdata/gdata-entry.c	Thu Aug  7 09:17:19 2008
@@ -974,6 +974,9 @@
 
 		else {
 			value = xmlNodeListGetString(doc, cur->xmlChildrenNode, 1);
+			if (!value)
+				value = xmlGetProp (cur, (xmlChar *)"value");
+
 			g_hash_table_insert(priv->field_table, g_strdup((gchar *)cur->name),
 					g_strdup((gchar *)value));
 			xmlFree(value);

Modified: trunk/servers/google/libgdata/libgdata.pc.in
==============================================================================
--- trunk/servers/google/libgdata/libgdata.pc.in	(original)
+++ trunk/servers/google/libgdata/libgdata.pc.in	Thu Aug  7 09:17:19 2008
@@ -15,4 +15,4 @@
 Version: @VERSION@
 Requires: libsoup-2.4 >= @LIBSOUP_REQUIRED@ 
 Libs: -L${libdir} -lgdata-1.2
-Cflags: -I${privincludedir}/gdata
+Cflags: -I${privincludedir}/google/libgdata