[Galago-commits] r2677 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-04-05 02:18:59 -0700 (Wed, 05 Apr 2006)
New Revision: 2677

Modified:
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-core.c
   trunk/libgalago/libgalago/galago-core.h
Log:
- Add ABI padding stuffs to the GalagoCore and GalagoCoreClass structs.
- Try to confuse gapi parser less.


Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-04-05 09:12:20 UTC (rev 2676)
+++ trunk/libgalago/ChangeLog	2006-04-05 09:18:59 UTC (rev 2677)
@@ -1,3 +1,10 @@
+Wed Apr 05 02:18:33 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-core.c:
+	* libgalago/galago-core.h:
+	  - Add ABI padding stuffs to the GalagoCore and GalagoCoreClass structs.
+	  - Try to confuse gapi parser less.
+
 Wed Apr 05 02:10:42 PDT 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-core.c:

Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c	2006-04-05 09:12:20 UTC (rev 2676)
+++ trunk/libgalago/libgalago/galago-core.c	2006-04-05 09:18:59 UTC (rev 2677)
@@ -34,6 +34,10 @@
 # include <signal.h>
 #endif
 
+#ifdef __G_LIB_H__
+# include <dbus/dbus-glib-lowlevel.h>
+#endif
+
 struct _GalagoCorePrivate
 {
 	/*

Modified: trunk/libgalago/libgalago/galago-core.h
===================================================================
--- trunk/libgalago/libgalago/galago-core.h	2006-04-05 09:12:20 UTC (rev 2676)
+++ trunk/libgalago/libgalago/galago-core.h	2006-04-05 09:18:59 UTC (rev 2677)
@@ -22,14 +22,11 @@
 #ifndef _GALAGO_CORE_H_
 #define _GALAGO_CORE_H_
 
+#include <libgalago/galago-account.h>
 #include <libgalago/galago-dbus.h>
 #include <libgalago/galago-person.h>
 #include <libgalago/galago-service.h>
 
-#ifdef __G_LIB_H__
-# include <dbus/dbus-glib-lowlevel.h>
-#endif
-
 #define GALAGO_DBUS_CORE_INTERFACE "org.freedesktop.Galago.Core"
 #define GALAGO_DBUS_CORE_OBJECT    "/org/freedesktop/Galago/Core"
 
@@ -64,6 +61,8 @@
 		(G_TYPE_INSTANCE_GET_CLASS((obj), GALAGO_TYPE_CORE, \
 								   GalagoCoreClass))
 
+typedef struct _GalagoCore        GalagoCore;
+typedef struct _GalagoCoreClass   GalagoCoreClass;
 typedef struct _GalagoCorePrivate GalagoCorePrivate;
 
 /**
@@ -85,15 +84,15 @@
 
 } GalagoInitFlags;
 
-typedef struct _GalagoCore
+
+struct _GalagoCore
 {
 	GalagoObject parent_object;
 
 	GalagoCorePrivate *priv;
+};
 
-} GalagoCore;
-
-typedef struct
+struct _GalagoCoreClass
 {
 	GalagoObjectClass parent_class;
 
@@ -107,7 +106,13 @@
 	GalagoAccount *(*calc_priority_account)(GalagoCore *core,
 											GalagoPerson *person);
 
-} GalagoCoreClass;
+#ifndef _DOXYGEN_
+	void (*reserved_1)(void);
+	void (*reserved_2)(void);
+	void (*reserved_3)(void);
+	void (*reserved_4)(void);
+#endif
+};
 
 /**
  * Returns GalagoCore's GType.