diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-09 13:30:52 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-09 13:30:52 +0000 |
| commit | f654ace092c9a6c4aea6d00bd405f056766a5a50 (patch) | |
| tree | 10fab8b14b58f2351b2fe66d24f8e60c75667504 /telepathy-glib/simple-password-manager.c | |
| parent | 8d4e7536c0720846a2d9b1789d7358a40bfac2a6 (diff) | |
| parent | 10c3dda166f5dbf8f28117fbe07a4c237ac81598 (diff) | |
| download | telepathy-glib-f654ace092c9a6c4aea6d00bd405f056766a5a50.tar.gz | |
Merge branch 'telepathy-glib-0.16'
Conflicts:
NEWS
Diffstat (limited to 'telepathy-glib/simple-password-manager.c')
| -rw-r--r-- | telepathy-glib/simple-password-manager.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/telepathy-glib/simple-password-manager.c b/telepathy-glib/simple-password-manager.c index 96f06ed32..9aedb5de2 100644 --- a/telepathy-glib/simple-password-manager.c +++ b/telepathy-glib/simple-password-manager.c @@ -308,6 +308,12 @@ tp_simple_password_manager_channel_closed_cb (GObject *chan, } static void +free_gstring (gpointer p) +{ + g_string_free (p, TRUE); +} + +static void tp_simple_password_manager_channel_finished_cb ( TpBasePasswordChannel *channel, const GString *str, @@ -328,7 +334,7 @@ tp_simple_password_manager_channel_finished_cb ( else { g_simple_async_result_set_op_res_gpointer ( - result, (gpointer) str, NULL); + result, g_boxed_copy (G_TYPE_GSTRING, str), free_gstring); } g_simple_async_result_complete (result); |