Index: servers/google/libgdata-google/ChangeLog
===================================================================
--- servers/google/libgdata-google/ChangeLog	(revision 9176)
+++ servers/google/libgdata-google/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-07-24  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #535745
+
+	* Makefile.am: Put public include files to google/libgdata-google.
+	* libgdata-google.pc.in: Do include also path to libgdata in CFLAGS.
+
 2008-06-13  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #521921 (Patch by Sebastian Keller)
Index: servers/google/libgdata-google/libgdata-google.pc.in
===================================================================
--- servers/google/libgdata-google/libgdata-google.pc.in	(revision 9176)
+++ servers/google/libgdata-google/libgdata-google.pc.in	(working copy)
@@ -15,4 +15,4 @@ Description: Client library for accessin
 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
Index: servers/google/libgdata-google/Makefile.am
===================================================================
--- servers/google/libgdata-google/Makefile.am	(revision 9176)
+++ servers/google/libgdata-google/Makefile.am	(working copy)
@@ -20,7 +20,7 @@ libgdata_google_1_2_la_LIBADD =					\
 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             	
Index: servers/google/libgdata/gdata-entry.c
===================================================================
--- servers/google/libgdata/gdata-entry.c	(revision 9176)
+++ servers/google/libgdata/gdata-entry.c	(working copy)
@@ -974,6 +974,9 @@ gdata_entry_new_from_xmlptr (xmlDocPtr d
 
 		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);
Index: servers/google/libgdata/ChangeLog
===================================================================
--- servers/google/libgdata/ChangeLog	(revision 9176)
+++ servers/google/libgdata/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2008-07-24  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #535745
+
+	* Makefile.am:
+	* libgdata.pc.in: Put public include files to 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.
+
 2008-06-13  Wang Xin  <jedy.wang@sun.com>
 
 	** Fix for bug #527544.
Index: servers/google/libgdata/Makefile.am
===================================================================
--- servers/google/libgdata/Makefile.am	(revision 9176)
+++ servers/google/libgdata/Makefile.am	(working copy)
@@ -22,7 +22,7 @@ libgdata_1_2_la_LIBADD =			\
 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                       	\
Index: servers/google/libgdata/libgdata.pc.in
===================================================================
--- servers/google/libgdata/libgdata.pc.in	(revision 9176)
+++ servers/google/libgdata/libgdata.pc.in	(working copy)
@@ -15,4 +15,4 @@ Description: Client library for accessin
 Version: @VERSION@
 Requires: libsoup-2.4 >= @LIBSOUP_REQUIRED@ 
 Libs: -L${libdir} -lgdata-1.2
-Cflags: -I${privincludedir}/gdata
+Cflags: -I${privincludedir}/google/libgdata
