diff options
| author | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-02-16 13:46:37 -0500 |
|---|---|---|
| committer | Siraj Razick <siraj.razick@collabora.co.uk> | 2012-02-17 15:46:52 -0500 |
| commit | d26187345ce6fb1370139b8bac75eebcf5d082d7 (patch) | |
| tree | 7dc1567c069a6b3073bdd06369136ed32752ace1 /src/connection.h | |
| parent | f4c3aaf503acb9d26f15d8cb21432b9dfbf7e51a (diff) | |
| download | telepathy-salut-d26187345ce6fb1370139b8bac75eebcf5d082d7.tar.gz | |
salut-connection: Merge src/connection.h and salut/connection.h
SalutConnection is not used by plugins anymore so this patch merges
src/connection.h and salut/connection.h into a single file.
Diffstat (limited to 'src/connection.h')
| -rw-r--r-- | src/connection.h | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/connection.h b/src/connection.h index d88c152d..065c4e56 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,7 +1,7 @@ /* * connection.h - Header for SalutConnection - * Copyright (C) 2005 Collabora Ltd. - * Copyright (C) 2005 Nokia Corporation + * Copyright © 2005-2012 Collabora Ltd. + * Copyright © 2005-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 @@ -35,10 +35,29 @@ #include <wocky/wocky.h> -#include "salut/connection.h" +#include "salut/plugin-connection.h" G_BEGIN_DECLS +#define SALUT_TYPE_CONNECTION (salut_connection_get_type ()) +#define SALUT_CONNECTION(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj), SALUT_TYPE_CONNECTION, SalutConnection)) +#define SALUT_CONNECTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), SALUT_TYPE_CONNECTION, \ + SalutConnectionClass)) +#define SALUT_IS_CONNECTION(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj), SALUT_TYPE_CONNECTION)) +#define SALUT_IS_CONNECTION_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass), SALUT_TYPE_CONNECTION)) +#define SALUT_CONNECTION_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), SALUT_TYPE_CONNECTION, \ + SalutConnectionClass)) + +typedef struct _SalutConnection SalutConnection; +typedef struct _SalutConnectionClass SalutConnectionClass; + +GType salut_connection_get_type (void); + typedef struct _SalutPresenceCache SalutPresenceCache; typedef struct _SalutDisco SalutDisco; @@ -91,6 +110,10 @@ const gchar * const *salut_connection_get_implemented_interfaces (void); gchar *salut_normalize_non_empty (const gchar *id, GError **error); +WockySession * salut_connection_get_session (SalutPluginConnection *connection); + +const gchar * salut_connection_get_name (SalutPluginConnection *connection); + G_END_DECLS #endif /* #ifndef __SALUT_CONNECTION_H__*/ |