[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/source
Will Thompson
wjt at kemper.freedesktop.org
Thu Mar 22 08:40:32 PDT 2012
tubes/source/manager.cxx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 52c85e7bfb00696b4b68331ab6139c98d93329b9
Author: Will Thompson <will.thompson at collabora.co.uk>
Date: Thu Mar 22 15:40:10 2012 +0000
tubes manager: fix a compiler warning
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index ed53a10..8dd0fe2 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -164,10 +164,11 @@ static void TeleManager_DBusChannelHandler(
tp_handle_channels_context_accept( pContext);
else
{
- GError aError = { TP_ERRORS, TP_ERROR_CONFUSED,
+ GError *pError = g_error_new_literal( TP_ERRORS, TP_ERROR_CONFUSED,
"None of these channels were LibreOffice D-Bus tubes; "
- "why did the Channel Dispatcher give them to us?" };
- tp_handle_channels_context_fail( pContext, &aError);
+ "why did the Channel Dispatcher give them to us?");
+ tp_handle_channels_context_fail( pContext, pError);
+ g_clear_error (&pError);
}
}
More information about the Libreoffice-commits
mailing list