diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-01 13:54:00 -0500 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-02-01 13:58:56 -0500 |
| commit | a687785628216f8f73c699096e9aae4a07b811c6 (patch) | |
| tree | 9a520514155cbe632b1bd771e773abb3e506a951 /plugins/console.c | |
| parent | bf805ba0b2ecced81e5c2830a79d021a42da91a7 (diff) | |
| parent | e4cccf0a604c7cdf1107aa9b5d9cdaa996bcc702 (diff) | |
Merge remote-tracking branch 'siraj/windows-compile-fix'
Conflicts:
lib/loudmouth/Makefile.am
plugins/console.c
src/Makefile.am
src/connection.c
src/error.c
src/plugin-loader.c
src/plugin.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'plugins/console.c')
| -rw-r--r-- | plugins/console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/console.c b/plugins/console.c index 8d6795c9d..7e980dbf8 100644 --- a/plugins/console.c +++ b/plugins/console.c @@ -80,7 +80,7 @@ static void gabble_console_plugin_create_sidecar_async ( GabblePlugin *plugin, const gchar *sidecar_interface, - GabbleConnection *connection, + GabblePluginConnection *connection, WockySession *session, GAsyncReadyCallback callback, gpointer user_data) @@ -315,7 +315,7 @@ gabble_console_sidecar_class_init (GabbleConsoleSidecarClass *klass) g_object_class_install_property (object_class, PROP_CONNECTION, g_param_spec_object ("connection", "Connection", "Gabble connection", - GABBLE_TYPE_CONNECTION, + GABBLE_TYPE_PLUGIN_CONNECTION, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, PROP_SESSION, |