soylent r303 - in trunk: . libsoylent

[treitter svn gnome org]

Author: treitter
Date: Sun Oct 12 20:02:47 2008
New Revision: 303
URL: http://svn.gnome.org/viewvc/soylent?rev=303&view=rev

Log:
Fix build issues with strict compiler flags (Gilles Dartiguelongue). Fixes Gnome bug #548412


Modified:
   trunk/Makefile.am
   trunk/libsoylent/sl-attributes.c
   trunk/libsoylent/sl-book.c
   trunk/libsoylent/sl-entity-eds.c
   trunk/libsoylent/sl-priv-util.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Oct 12 20:02:47 2008
@@ -9,6 +9,9 @@
 
 EXTRA_DIST =
 
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc
+
 # Generate Changelog, copied from dbus-glib
 #
 

Modified: trunk/libsoylent/sl-attributes.c
==============================================================================
--- trunk/libsoylent/sl-attributes.c	(original)
+++ trunk/libsoylent/sl-attributes.c	Sun Oct 12 20:02:47 2008
@@ -274,7 +274,7 @@
 sl_attribute_reader_bytes (const gchar *attrname, gchar *string)
 {
   GByteArray *bytes = g_byte_array_new ();
-  bytes->data = g_base64_decode (string, &bytes->len);
+  bytes->data = g_base64_decode (string, (gsize *) &bytes->len);
   return bytes;
 }
 
@@ -432,7 +432,8 @@
 sl_attribute_bytes_to_string (const gchar *attrname, GByteArray *bytes)
 {
   GString *gstr = g_string_new (NULL);
-  g_string_printf (gstr, "GByteArray [&0x%.8x, length: %db]", (guint) bytes->data, bytes->len);
+  g_string_printf (gstr, "GByteArray [&0x%.8x, length: %db]",
+                   GPOINTER_TO_UINT (bytes->data), (guint) (bytes->len));
   gchar *str = gstr->str;
   g_string_free (gstr, FALSE);
   return str;

Modified: trunk/libsoylent/sl-book.c
==============================================================================
--- trunk/libsoylent/sl-book.c	(original)
+++ trunk/libsoylent/sl-book.c	Sun Oct 12 20:02:47 2008
@@ -39,6 +39,7 @@
 #include "soylent.h"
 
 #include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-utils.h>
 #include <dbus/dbus-glib.h>
 

Modified: trunk/libsoylent/sl-entity-eds.c
==============================================================================
--- trunk/libsoylent/sl-entity-eds.c	(original)
+++ trunk/libsoylent/sl-entity-eds.c	Sun Oct 12 20:02:47 2008
@@ -39,6 +39,7 @@
 #include "soylent.h"
 
 #include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-contact-list.h>
 
 /* private structs and fields */
 

Modified: trunk/libsoylent/sl-priv-util.c
==============================================================================
--- trunk/libsoylent/sl-priv-util.c	(original)
+++ trunk/libsoylent/sl-priv-util.c	Sun Oct 12 20:02:47 2008
@@ -166,7 +166,7 @@
   g_print ("%s:\n", title);
   while (g_hash_table_iter_next (&iter, &key, &value))
     {
-      g_print (" * %s : %.8x\n", (gchar *) key, (guint) value);
+      g_print (" * %s : %.8x\n", (gchar *) key, GPOINTER_TO_UINT (value));
     }
 }