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

[From: subversion at stage.maemo.org]

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

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

	Moved the structure definition for the SapwoodPixmap into a private
	header

	* engine/Makefile.am: include the private header file
	* engine/sapwood-pixmap-priv.h: moved the structure definition to this
	file
	* engine/sapwood-pixmap.c: include the private header instead of the
	public one; dropped the structure definition
	* tests/double-free.c: include the private header file instead of
	using the copied structure definition


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:18:55 UTC (rev 16277)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:08 UTC (rev 16278)
@@ -1,5 +1,18 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Moved the structure definition for the SapwoodPixmap into a private
+	header
+
+	* engine/Makefile.am: include the private header file
+	* engine/sapwood-pixmap-priv.h: moved the structure definition to this
+	file
+	* engine/sapwood-pixmap.c: include the private header instead of the
+	public one; dropped the structure definition
+	* tests/double-free.c: include the private header file instead of
+	using the copied structure definition
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Added files for reusable client code to connect to the server
 
 	* engine/Makefile.am: added the files

Modified: projects/haf/trunk/sapwood/engine/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 16:18:55 UTC (rev 16277)
+++ projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 16:19:08 UTC (rev 16278)
@@ -18,8 +18,9 @@
 	sapwood-style.h		\
 	theme-pixbuf.c		\
 	theme-pixbuf.h		\
-	sapwood-pixmap.c	\
-	sapwood-pixmap.h	\
+	sapwood-pixmap.c \
+	sapwood-pixmap.h \
+	sapwood-pixmap-priv.h \
 	$(NULL)
 
 libsapwood_la_LDFLAGS = -avoid-version -module -Wl,-z,defs

Added: projects/haf/trunk/sapwood/engine/sapwood-pixmap-priv.h
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap-priv.h	2008-09-29 16:18:55 UTC (rev 16277)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap-priv.h	2008-09-29 16:19:08 UTC (rev 16278)
@@ -0,0 +1,37 @@
+/* This file is part of GTK+ Sapwood Engine
+ *
+ * AUTHORS
+ *     Sven Herzberg
+ *
+ * Copyright (C) 2008  Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
+
+#ifndef SAPWOOD_PIXMAP_PRIV_H
+#define SAPWOOD_PIXMAP_PRIV_H
+
+#include "sapwood-pixmap.h"
+
+struct _SapwoodPixmap {
+  guint32    id;
+  gint       width;
+  gint       height;
+  GdkPixmap *pixmap[3][3];
+  GdkBitmap *pixmask[3][3];
+};
+
+#endif /* !SAPWOOD_PIXMAP_PRIV_H */

Modified: projects/haf/trunk/sapwood/engine/sapwood-pixmap.c
===================================================================
--- projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:18:55 UTC (rev 16277)
+++ projects/haf/trunk/sapwood/engine/sapwood-pixmap.c	2008-09-29 16:19:08 UTC (rev 16278)
@@ -20,7 +20,7 @@
  */
 #include <config.h>
 
-#include "sapwood-pixmap.h"
+#include "sapwood-pixmap-priv.h"
 #include "sapwood-proto.h"
 
 #include <errno.h>
@@ -31,14 +31,6 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-struct _SapwoodPixmap {
-  guint32    id;
-  gint       width;
-  gint       height;
-  GdkPixmap *pixmap[3][3];
-  GdkBitmap *pixmask[3][3];
-};
-
 static GQuark
 sapwood_pixmap_error_get_quark ()
 {

Modified: projects/haf/trunk/sapwood/tests/double-free.c
===================================================================
--- projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:18:55 UTC (rev 16277)
+++ projects/haf/trunk/sapwood/tests/double-free.c	2008-09-29 16:19:08 UTC (rev 16278)
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #include <gio/gio.h>
 #include <gtk/gtktestutils.h>
-#include "sapwood-pixmap.h"
+#include "sapwood-pixmap-priv.h"
 #include "sapwood-proto.h"
 
 #undef SAPWOOD_PIXMAP_ERROR
@@ -40,14 +40,6 @@
 #define SAPWOOD_PIXMAP_ERROR_FAILED 0
 #define SAPWOOD_SERVER "sapwood-server"
 
-struct _SapwoodPixmap {
-  guint32    id;
-  gint       width;
-  gint       height;
-  GdkPixmap *pixmap[3][3];
-  GdkBitmap *pixmask[3][3];
-};
-
 /* FIXME: refactor this out into a libproto-client.la library for the engine
  * and the test cases */
 static int