summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-glib.h
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2005-06-19 15:31:25 +0000
committerMurray Cumming <murrayc@murrayc.com>2005-06-19 15:31:25 +0000
commit6a4596752c074fbfd10eec0462d6a3f7ac62dfc8 (patch)
tree2225344e91b3889f1eb4ff30ad1b441a0669ee7e /dbus/dbus-glib.h
parent6e3a318982eaafb7903844671cb602920480220f (diff)
2005-06-18 Murray Cumming <murrayc@murrayc.com>
* dbus/dbus-glib.h: * glib/dbus-gobject.c: * glib/dbus-gproxy.c: * glib/dbus-gvalue.c: Predeclare structs as typedef struct _Something Something instead of typedef struct Something Something, so we can redeclare the prototypes. Other GNOME libraries do this already.
Diffstat (limited to 'dbus/dbus-glib.h')
-rw-r--r--dbus/dbus-glib.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
index 4debe6fe..7d03058e 100644
--- a/dbus/dbus-glib.h
+++ b/dbus/dbus-glib.h
@@ -35,15 +35,15 @@ G_BEGIN_DECLS
/**
* Convert to DBusConnection with dbus_g_connection_get_connection() in dbus-glib-lowlevel.h
*/
-typedef struct DBusGConnection DBusGConnection;
+typedef struct _DBusGConnection DBusGConnection;
/**
* Convert to DBusMessage with dbus_g_message_get_message() in dbus-glib-lowlevel.h
*/
-typedef struct DBusGMessage DBusGMessage;
+typedef struct _DBusGMessage DBusGMessage;
/**
* Deliberately not possible to convert to DBusPendingCall
*/
-typedef struct DBusGPendingCall DBusGPendingCall;
+typedef struct _DBusGPendingCall DBusGPendingCall;
typedef void (* DBusGPendingCallNotify) (DBusGPendingCall *pending,
void *user_data);
@@ -85,15 +85,15 @@ void dbus_g_thread_init (void);
DBusGConnection* dbus_g_bus_get (DBusBusType type,
GError **error);
-typedef struct DBusGObjectInfo DBusGObjectInfo;
-typedef struct DBusGMethodInfo DBusGMethodInfo;
+typedef struct _DBusGObjectInfo DBusGObjectInfo;
+typedef struct _DBusGMethodInfo DBusGMethodInfo;
/**
* Object typically generated by dbus-binding-tool that
* stores a mapping from introspection data to a
* function pointer for a C method to be invoked.
*/
-struct DBusGMethodInfo
+struct _DBusGMethodInfo
{
GCallback function; /**< C method to invoke */
GClosureMarshal marshaller; /**< Marshaller to invoke method */
@@ -104,7 +104,7 @@ struct DBusGMethodInfo
* Introspection data for a GObject, normally autogenerated by
* a tool such as dbus-binding-tool.
*/
-struct DBusGObjectInfo
+struct _DBusGObjectInfo
{
int format_version; /**< Allows us to change the rest of this struct
* by adding DBusGObjectInfo2, DBusGObjectInfo3, etc.
@@ -130,8 +130,8 @@ GObject * dbus_g_connection_lookup_g_object (DBusGConnection *connectio
* Generic recursive value
*/
-typedef struct DBusGValueIterator DBusGValueIterator;
-struct DBusGValueIterator
+typedef struct _DBusGValueIterator DBusGValueIterator;
+struct _DBusGValueIterator
{
void *dummy1; /**< Don't use this */
void *dummy2; /**< Don't use this */
@@ -151,7 +151,7 @@ struct DBusGValueIterator
void *pad5; /**< Don't use this */
};
-typedef struct DBusGValue DBusGValue;
+typedef struct _DBusGValue DBusGValue;
#ifdef DBUS_COMPILATION
#include "glib/dbus-gtype-specialized.h"
@@ -202,8 +202,8 @@ void dbus_g_object_register_marshaller_array(GClosureMarshal marshaller
guint n_types,
const GType* types);
-typedef struct DBusGProxy DBusGProxy;
-typedef struct DBusGProxyClass DBusGProxyClass;
+typedef struct _DBusGProxy DBusGProxy;
+typedef struct _DBusGProxyClass DBusGProxyClass;
#define DBUS_TYPE_G_PROXY (dbus_g_proxy_get_type ())
#define DBUS_G_PROXY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), DBUS_TYPE_G_PROXY, DBusGProxy))
@@ -272,7 +272,7 @@ gboolean dbus_g_proxy_invoke (DBusGProxy *proxy,
GType first_arg_type,
...);
-typedef struct DBusGMethodInvocation DBusGMethodInvocation;
+typedef struct _DBusGMethodInvocation DBusGMethodInvocation;
void dbus_g_method_return (DBusGMethodInvocation *context, ...);