[monet/bberg-playground: 1/4] Committing some initial work.
- From: Benjamin Berg <bberg src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [monet/bberg-playground: 1/4] Committing some initial work.
- Date: Thu, 20 Aug 2009 16:56:25 +0000 (UTC)
commit d8d492e8aab6b42e72dae5162260d81c0071a00e
Author: Benjamin Berg <benjamin sipsolutions net>
Date: Sat Aug 15 18:11:41 2009 +0200
Committing some initial work.
monet/Makefile.am | 11 ++++++++++-
monet/mn-enum-types.h.in | 11 ++++-------
monet/mn-parts.h | 7 +++++++
monet/monet.c | 1 +
monet/monet.h | 11 +++++++++++
tests/test-drawing.c | 2 ++
6 files changed, 35 insertions(+), 8 deletions(-)
---
diff --git a/monet/Makefile.am b/monet/Makefile.am
index 1565528..e8fb251 100644
--- a/monet/Makefile.am
+++ b/monet/Makefile.am
@@ -8,6 +8,9 @@ STAMP_FILES = \
stamp-mn-enum-types.h
source_h = \
+ mn-display.h \
+ mn-stylesheet.h \
+ mn-context.h \
mn-parts.h \
mn-types.h \
monet.h
@@ -33,7 +36,13 @@ mn-enum-types.c: stamp-mn-enum-types.h mn-enum-types.c.in
lib_LTLIBRARIES = libmonet.la
-libmonet_la_SOURCES = $(source_h) monet.c
+libmonet_la_SOURCES = $(BUILT_SOURCES) \
+ $(source_h) \
+ mn-display.c \
+ mn-stylesheet.c \
+ mn-context.c \
+ monet.c
+
libmonet_la_LIBADD = $(MONET_LIBS)
monetincludedir = $(includedir)/monet-1.0/monet
diff --git a/monet/mn-enum-types.h.in b/monet/mn-enum-types.h.in
index c7d1b6c..7d4ff95 100644
--- a/monet/mn-enum-types.h.in
+++ b/monet/mn-enum-types.h.in
@@ -1,10 +1,7 @@
/*** BEGIN file-header ***/
-#if !defined(NBTK_H_INSIDE) && !defined(NBTK_COMPILATION)
-#error "Only <monet/monet.h> can be included directly.h"
-#endif
-#ifndef __NBTK_ENUM_TYPES_H__
-#define __NBTK_ENUM_TYPES_H__
+#ifndef __MN_ENUM_TYPES_H__
+#define __MN_ENUM_TYPES_H__
#include <glib-object.h>
@@ -19,11 +16,11 @@ G_BEGIN_DECLS
/*** BEGIN file-tail ***/
G_END_DECLS
-#endif /* !__NBTK_ENUM_TYPES_H__ */
+#endif /* !__MN_ENUM_TYPES_H__ */
/*** END file-tail ***/
/*** BEGIN value-header ***/
GType @enum_name _get_type (void) G_GNUC_CONST;
-#define NBTK_TYPE_ ENUMSHORT@ (@enum_name _get_type())
+#define MN_TYPE_ ENUMSHORT@ (@enum_name _get_type())
/*** END value-header ***/
diff --git a/monet/mn-parts.h b/monet/mn-parts.h
index b8478d2..6028cbe 100644
--- a/monet/mn-parts.h
+++ b/monet/mn-parts.h
@@ -4,6 +4,10 @@
* Author: Thomas Wood <thos gnome org>
*/
+#ifndef _MN_PARTS
+#define _MN_PARTS
+
+
typedef enum
{
MN_SCROLLBAR_STEPPER_UP,
@@ -59,3 +63,6 @@ typedef enum
MN_NOTEBOOK_TAB,
MN_NOTEBOOK_BORDER
} MnNotebookParts;
+
+#endif /* _MN_PARTS */
+
diff --git a/monet/monet.c b/monet/monet.c
index 92e293e..f9b0f36 100644
--- a/monet/monet.c
+++ b/monet/monet.c
@@ -6,3 +6,4 @@ monet_init (gint *argc,
{
g_type_init ();
}
+
diff --git a/monet/monet.h b/monet/monet.h
index a2c22b7..1a0feff 100644
--- a/monet/monet.h
+++ b/monet/monet.h
@@ -1,3 +1,14 @@
#include <glib-object.h>
+#include "mn-enum-types.h"
+#include "mn-display.h"
+#include "mn-stylesheet.h"
+#include "mn-context.h"
+#include "mn-enum-types.h"
+#include "mn-parts.h"
+#include "mn-types.h"
void monet_init (gint *argc, gchar ***argv);
+void monet_install_property_parser (GParamSpec *pspec,
+ GSList *aliases,
+ MnPropertyParser parser);
+
diff --git a/tests/test-drawing.c b/tests/test-drawing.c
index 1fd6c60..8cd7172 100644
--- a/tests/test-drawing.c
+++ b/tests/test-drawing.c
@@ -7,4 +7,6 @@ main (int argc, char **argv)
{
monet_init (&argc, &argv);
printf ("Hello World\n");
+
+ return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]