[maemo-commits] [maemo-commits] r16280 - in projects/haf/trunk/sapwood: . engine tests

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-09-29 19:19:32 +0300 (Mon, 29 Sep 2008)
New Revision: 16280

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/engine/sapwood-client.c
   projects/haf/trunk/sapwood/engine/sapwood-client.h
   projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
   projects/haf/trunk/sapwood/engine/sapwood-pixmap.h
   projects/haf/trunk/sapwood/tests/double-free.c
Log:
2008-09-29  Sven Herzberg  <sven at imendio.com>

	Moved the error quark into libsapwood-client.la

	* engine/sapwood-client.c (sapwood_pixmap_error_get_quark),
	* engine/sapwood-client.h: added the error quark
	* engine/sapwood-pixmap.c,
	* engine/sapwood-pixmap.h: delegate the error quark to the client
	library
	* tests/double-free.c: drop the error quark hack; use the quark from
	the client library


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:32 UTC (rev 16280)
@@ -1,5 +1,17 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Moved the error quark into libsapwood-client.la
+
+	* engine/sapwood-client.c (sapwood_pixmap_error_get_quark),
+	* engine/sapwood-client.h: added the error quark
+	* engine/sapwood-pixmap.c,
+	* engine/sapwood-pixmap.h: delegate the error quark to the client
+	library
+	* tests/double-free.c: drop the error quark hack; use the quark from
+	the client library
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Create libsapwood-client.la to be shared between the engine and the
 	test cases
 

Modified: projects/haf/trunk/sapwood/engine/sapwood-client.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-client.c	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/engine/sapwood-client.c	2008-09-29 16:19:32 UTC (rev 16280)
@@ -23,3 +23,12 @@
 
 #include "sapwood-client.h"
 
+GQuark
+sapwood_pixmap_error_get_quark (void)
+{
+  static GQuark q = 0;
+  if (!q)
+    q = g_quark_from_static_string ("sapwood-pixmap-error-quark");
+  return q;
+}
+

Modified: projects/haf/trunk/sapwood/engine/sapwood-client.h
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-client.h	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/engine/sapwood-client.h	2008-09-29 16:19:32 UTC (rev 16280)
@@ -24,5 +24,14 @@
 #ifndef SAPWOOD_CLIENT_H
 #define SAPWOOD_CLIENT_H
 
+#include <glib.h>
 
+G_BEGIN_DECLS
+
+#define SAPWOOD_PIXMAP_ERROR  (sapwood_pixmap_error_get_quark ())
+
+G_GNUC_INTERNAL GQuark sapwood_pixmap_error_get_quark (void);
+
+G_END_DECLS
+
 #endif /* !SAPWOOD_CLIENT_H */

Modified: projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:19:32 UTC (rev 16280)
@@ -31,15 +31,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-static GQuark
-sapwood_pixmap_error_get_quark ()
-{
-  static GQuark q = 0;
-  if (!q)
-    q = g_quark_from_static_string ("sapwood-pixmap-error-quark");
-  return q;
-}
-
 static int
 pixbuf_proto_get_socket (GError **err)
 {

Modified: projects/haf/trunk/sapwood/engine/sapwood-pixmap.h
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap.h	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap.h	2008-09-29 16:19:32 UTC (rev 16280)
@@ -22,12 +22,11 @@
 #ifndef SAPWOOD_PIXMAP_H
 #define SAPWOOD_PIXMAP_H 1
 
-#include <glib/gerror.h>
 #include <gtk/gtk.h>
+#include "sapwood-client.h"
 
 G_BEGIN_DECLS
 
-#define SAPWOOD_PIXMAP_ERROR  (sapwood_pixmap_error_get_quark ())
 enum {
     SAPWOOD_PIXMAP_ERROR_FAILED
 };

Modified: projects/haf/trunk/sapwood/tests/double-free.c
===================================================================
--- projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:19:20 UTC (rev 16279)
+++ projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:19:32 UTC (rev 16280)
@@ -35,8 +35,6 @@
 #include "sapwood-pixmap-priv.h"
 #include "sapwood-proto.h"
 
-#undef SAPWOOD_PIXMAP_ERROR
-#define SAPWOOD_PIXMAP_ERROR 0
 #define SAPWOOD_PIXMAP_ERROR_FAILED 0
 #define SAPWOOD_SERVER "sapwood-server"