diff options
Diffstat (limited to 'gabble')
| -rw-r--r-- | gabble/Makefile.am | 3 | ||||
| -rw-r--r-- | gabble/capabilities-set.h | 3 | ||||
| -rw-r--r-- | gabble/gabble.h | 1 | ||||
| -rw-r--r-- | gabble/plugin.h | 2 | ||||
| -rw-r--r-- | gabble/sidecar.h | 3 | ||||
| -rw-r--r-- | gabble/types.h | 34 |
6 files changed, 42 insertions, 4 deletions
diff --git a/gabble/Makefile.am b/gabble/Makefile.am index 83b7d0acf..698062f59 100644 --- a/gabble/Makefile.am +++ b/gabble/Makefile.am @@ -11,7 +11,8 @@ gabbleinclude_HEADERS = \ error.h \ gabble.h \ plugin.h \ - sidecar.h + sidecar.h \ + types.h # We install these headers alongside gabble's so that an actual separate Wocky # installation won't clash with them. Update with: diff --git a/gabble/capabilities-set.h b/gabble/capabilities-set.h index 01dc89dda..c6fa0872c 100644 --- a/gabble/capabilities-set.h +++ b/gabble/capabilities-set.h @@ -25,6 +25,8 @@ #include <wocky/wocky-node.h> +#include <gabble/types.h> + G_BEGIN_DECLS /** @@ -32,7 +34,6 @@ G_BEGIN_DECLS * * A set of capabilities. */ -typedef struct _GabbleCapabilitySet GabbleCapabilitySet; GabbleCapabilitySet *gabble_capability_set_new (void); GabbleCapabilitySet *gabble_capability_set_new_from_stanza ( diff --git a/gabble/gabble.h b/gabble/gabble.h index 1ff2b090a..3ec1fc70a 100644 --- a/gabble/gabble.h +++ b/gabble/gabble.h @@ -28,6 +28,7 @@ #include <gabble/error.h> #include <gabble/plugin.h> #include <gabble/sidecar.h> +#include <gabble/types.h> #undef IN_GABBLE_PLUGINS_GABBLE_H diff --git a/gabble/plugin.h b/gabble/plugin.h index 007c8f200..eab30ae45 100644 --- a/gabble/plugin.h +++ b/gabble/plugin.h @@ -28,6 +28,7 @@ #include <wocky/wocky-session.h> #include <gabble/sidecar.h> +#include <gabble/types.h> G_BEGIN_DECLS @@ -40,7 +41,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GABBLE_TYPE_PLUGIN, \ GabblePluginInterface)) -typedef struct _GabblePlugin GabblePlugin; typedef struct _GabblePluginInterface GabblePluginInterface; typedef void (*GabblePluginCreateSidecarImpl) ( diff --git a/gabble/sidecar.h b/gabble/sidecar.h index 992374772..349e846df 100644 --- a/gabble/sidecar.h +++ b/gabble/sidecar.h @@ -23,6 +23,8 @@ #include <glib-object.h> +#include <gabble/types.h> + G_BEGIN_DECLS #define GABBLE_TYPE_SIDECAR (gabble_sidecar_get_type ()) @@ -34,7 +36,6 @@ G_BEGIN_DECLS (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GABBLE_TYPE_SIDECAR, \ GabbleSidecarInterface)) -typedef struct _GabbleSidecar GabbleSidecar; typedef struct _GabbleSidecarInterface GabbleSidecarInterface; typedef GHashTable * (*GabbleSidecarGetImmutablePropertiesImpl) ( diff --git a/gabble/types.h b/gabble/types.h new file mode 100644 index 000000000..8069728c5 --- /dev/null +++ b/gabble/types.h @@ -0,0 +1,34 @@ +/* + * types.h - type definitions available to telepathy-gabble plugins + * Copyright © 2010 Collabora Ltd. + * Copyright © 2010 Nokia Corporation + * + * This library 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 library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __GABBLE_PLUGINS_TYPES_H__ +#define __GABBLE_PLUGINS_TYPES_H__ + +#include <glib.h> + +G_BEGIN_DECLS + +typedef struct _GabbleCapabilitySet GabbleCapabilitySet; +typedef struct _GabblePlugin GabblePlugin; +typedef struct _GabbleSidecar GabbleSidecar; + +G_END_DECLS + +#endif |