diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-11-19 12:55:17 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-11-19 12:55:17 +0000 |
| commit | b021d9faf0c1fc1ad5319339030650ebdb65a8db (patch) | |
| tree | e87055b02cf2d82908ec5373b5809d55ca4098d5 /telepathy-glib/proxy.h | |
| parent | 494db1fdd6034f62a349b0b19a909ab067fd186a (diff) | |
| download | telepathy-glib-b021d9faf0c1fc1ad5319339030650ebdb65a8db.tar.gz | |
Give the generated tp-cli-*.h G_BEGIN_DECLS/G_END_DECLS guards. Make them not self contained (they expect proxy.h to have been included first). Include generic interfaces in proxy.h unless TP_PROXY_IN_CLI_IMPLEMENTATION is defined, and define it in tp-cli-*.c.
20071119125517-53eee-8fbfd339dca1f838710deea799e8d10a4417180f.gz
Diffstat (limited to 'telepathy-glib/proxy.h')
| -rw-r--r-- | telepathy-glib/proxy.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h index 3fafad998..011a6c1e3 100644 --- a/telepathy-glib/proxy.h +++ b/telepathy-glib/proxy.h @@ -52,4 +52,8 @@ GType tp_proxy_get_type (void); G_END_DECLS +#ifndef TP_PROXY_IN_CLI_IMPLEMENTATION +#include <telepathy-glib/_gen/tp-cli-generic-interfaces.h> +#endif + #endif /* #ifndef __TP_PROXY_H__*/ |