[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - configure.in tubes/source

[Will Thompson]

 configure.in             |    2 +-
 tubes/source/manager.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5cbdd431f1ea30904050eb1f2339c78209c4d401
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Mar 22 19:13:09 2012 +0000

    configure: Depend on new enough tp-glib for FT api

diff --git a/configure.in b/configure.in
index 7fdabdb..34a8b8b 100644
--- a/configure.in
+++ b/configure.in
@@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" = "yes"; then
     ENABLE_TELEPATHY="TRUE"
     AC_MSG_RESULT([yes])
-    PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.16.4 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 dbus-1 dbus-glib-1 )
+    PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.17.1 glib-2.0 gobject-2.0 gthread-2.0 gio-2.0 dbus-1 dbus-glib-1 )
 else
     AC_MSG_RESULT([no])
 fi
commit 362ddfd74b9eb0bc16bd78998ca62edc7aa327f7
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Mar 22 17:35:00 2012 +0000

    tubes: don't bypass approval for tubes
    
    Setting BypassApproval makes incoming channels skip the approver
    step—the step which triggers the dialog box asking whether the user
    wants to accept the offer.

diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 1f6e05c..8403270 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -303,7 +303,7 @@ bool TeleManager::connect()
 
     pImpl->mpClient = tp_simple_handler_new_with_factory(
             pFactory,                       // factory
-            TRUE,                           // bypass_approval
+            FALSE,                          // bypass_approval
             FALSE,                          // requests
             getFullClientName().getStr(),   // name
             FALSE,                          // uniquify