[Libreoffice-commits] core.git: tubes/source

[Stephan Bergmann]

 tubes/source/manager.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 30e7c3051dd582307437b82f1dbc21290fd2e916
Author: Stephan Bergmann 
Date:   Mon Dec 19 23:19:09 2016 +0100

Fix SolarMutex getting lost across call to g_main_context_iteration

At least with SAL_USE_VCLPLUGIN=gtk, sticking DBG_TESTSOLARMUTEX() before 
and
after this while loop demonstrates that, without the explicit
SolarMutexReleaser, the SolarMutex was acquired before the loop but isn't
thereafter.

Change-Id: I4a97063103193821cc5eb3469484dd3346a60822

diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index aa55005..a742e28 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -492,7 +493,10 @@ bool TeleManager::createAccountManager()
 TeleManagerImpl::mbAccountManagerReadyHandlerInvoked = false;
 tp_proxy_prepare_async( pImpl->mpAccountManager, nullptr, 
TeleManagerImpl::AccountManagerReadyHandler, nullptr);
 while (!TeleManagerImpl::mbAccountManagerReadyHandlerInvoked)
+{
+SolarMutexReleaser rel;
 g_main_context_iteration( nullptr, TRUE);
+}
 
 return TeleManagerImpl::mbAccountManagerReady;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: tubes/source

[David Tardon]

 tubes/source/contacts.cxx |   23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 18565a34d6e2768d70462f124c6d6972448efe22
Author: David Tardon 
Date:   Wed Dec 23 10:35:00 2015 +0100

convert tubes to VclPtr

Change-Id: I54fb058ad1ad89183acfd4d2661c10ccffc408d6

diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index 6f8ae2c..d7ec246 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -23,12 +23,12 @@ namespace {
 
 class TubeContacts : public ModelessDialog
 {
-PushButton* mpBtnDemo;
-PushButton* mpBtnBuddy;
-PushButton* mpBtnGroup;
-PushButton* mpBtnInvite;
-PushButton* mpBtnListen;
-ListBox*mpList;
+VclPtr mpBtnDemo;
+VclPtr mpBtnBuddy;
+VclPtr mpBtnGroup;
+VclPtr mpBtnInvite;
+VclPtr mpBtnListen;
+VclPtrmpList;
 Collaboration*  mpCollaboration;
 
 DECL_LINK_TYPED( BtnDemoHdl, Button*, void );
@@ -124,6 +124,17 @@ public:
 }
 virtual ~TubeContacts()
 {
+dispose();
+}
+
+virtual void dispose() override
+{
+mpBtnListen.clear();
+mpBtnGroup.clear();
+mpBtnDemo.clear();
+mpBtnBuddy.clear();
+mpBtnGroup.clear();
+mpList.clear();
 }
 
 static OUString fromUTF8( const char *pStr )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: tubes/source

[David Tardon]

 tubes/source/conference.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 623b38fa5769f8cdec10b54b2a600bc4c4e077e6
Author: David Tardon dtar...@redhat.com
Date:   Sun Jan 11 13:08:37 2015 +0100

OSL_ENSURE was not declared in this scope

Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99

diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 86986fc..df4a63f 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer 
user_data, GObject *
 
 void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* 
pChannel )
 {
-OSL_ENSURE( !mpChannel, TeleConference::setChannel: already have 
channel);
+SAL_WARN_IF( mpChannel, tubes, TeleConference::setChannel: already have 
channel);
 if (mpChannel)
 g_object_unref( mpChannel);
 if (mpAccount)
@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
 {
 INFO_LOGGER( TeleConference::offerTube);
 
-OSL_ENSURE( mpChannel, TeleConference::offerTube: no channel);
+SAL_WARN_IF( !mpChannel, tubes, TeleConference::offerTube: no channel);
 if (!mpChannel)
 return false;
 
@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
 {
 INFO_LOGGER( TeleConference::setTube);
 
-OSL_ENSURE( !pImpl-mpTube, TeleConference::setTube: already tubed);
+SAL_WARN_IF( pImpl-mpTube, tubes, TeleConference::setTube: already 
tubed);
 
 pImpl-mpTube = pTube;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: tubes/source

[Julien Nabet]

 tubes/source/file-transfer-helper.c |   20 ++--
 tubes/source/manager.cxx|5 +++--
 2 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit fe5acac6976850d67f70347a2d2657f9105bfebd
Author: Julien Nabet serval2...@yahoo.fr
Date:   Mon Nov 4 22:43:14 2013 +0100

Silence -Wdeprecated-declarations for the moment

Change-Id: If08c7f72195dfff6ae3b7cb52b4137aeda3bc675
Reviewed-on: https://gerrit.libreoffice.org/6604
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/tubes/source/file-transfer-helper.c 
b/tubes/source/file-transfer-helper.c
index 6450343..093d419 100644
--- a/tubes/source/file-transfer-helper.c
+++ b/tubes/source/file-transfer-helper.c
@@ -642,8 +642,11 @@ check_hash_incoming (EmpathyFTHandler *handler)
 
   g_signal_emit (handler, signals[HASHING_STARTED], 0);
 
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   g_io_scheduler_push_job (do_hash_job_incoming, hash_data, NULL,
G_PRIORITY_DEFAULT, priv-cancellable);
+  #pragma GCC diagnostic pop
 }
 }
 
@@ -1037,9 +1040,11 @@ again:
   if (bytes_read  0)
 {
   g_checksum_update (hash_data-checksum, hash_data-buffer, bytes_read);
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   g_io_scheduler_job_send_to_mainloop_async (job, emit_hashing_progress,
   hash_data, NULL);
-
+  #pragma GCC diagnostic pop
   g_free (hash_data-buffer);
   hash_data-buffer = NULL;
 
@@ -1054,8 +1059,11 @@ out:
   if (error != NULL)
 hash_data-error = error;
 
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   g_io_scheduler_job_send_to_mainloop_async (job, hash_job_done,
   hash_data, NULL);
+  #pragma GCC diagnostic pop
 
   return FALSE;
 }
@@ -1079,8 +1087,11 @@ do_hash_job_incoming (GIOSchedulerJob *job,
   if (error != NULL)
 {
   hash_data-error = error;
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   g_io_scheduler_job_send_to_mainloop_async (job, hash_job_done,
   hash_data, NULL);
+  #pragma GCC diagnostic pop
   return FALSE;
 }
 
@@ -1124,8 +1135,11 @@ ft_handler_read_async_cb (GObject *source,
 
   g_signal_emit (handler, signals[HASHING_STARTED], 0);
 
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   g_io_scheduler_push_job (do_hash_job, hash_data, NULL,
   G_PRIORITY_DEFAULT, priv-cancellable);
+  #pragma GCC diagnostic pop
 }
 
 static void
@@ -1378,8 +1392,10 @@ channel_prepared_cb (
   callbacks_data_free (cb_data);
   return;
 }
-
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored -Wdeprecated-declarations
   properties = tp_channel_borrow_immutable_properties (TP_CHANNEL (channel));
+  #pragma GCC diagnostic pop
 
   priv-content_hash = g_strdup (
   tp_asv_get_string (properties, ContentHash));
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index f5787b4..7d4ee5a 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -768,7 +768,8 @@ static void presence_changed_cb( TpContact* /* contact */,
 AccountContactPairV TeleManager::getContacts()
 {
 AccountContactPairV pairs;
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored -Wdeprecated-declarations
 for (GList *accounts = tp_account_manager_get_valid_accounts 
(pImpl-mpAccountManager);
 accounts != NULL; accounts = g_list_delete_link (accounts, 
accounts))
 {
@@ -804,7 +805,7 @@ AccountContactPairV TeleManager::getContacts()
 }
 g_ptr_array_unref (contacts);
 }
-
+#pragma GCC diagnostic pop
 return pairs;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: tubes/source

[Chr . Rossmanith]

 tubes/source/manager.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 2bded30459c47ae1017399536fc2a19af797e9a6
Author: Chr. Rossmanith chrrossman...@gmx.de
Date:   Thu Mar 14 22:57:52 2013 +0100

Remove RTL_CONSTASCII_STRINGPARAM from tubes

Change-Id: If30e500ad751a220fcecd78cbf29a8e4dde08ff7

diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 1a152ce..f8070ad 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -827,21 +827,21 @@ AccountContactPairV TeleManager::getContacts()
 rtl::OString TeleManager::getFullClientName()
 {
 OStringBuffer aBuf(64);
-aBuf.append( RTL_CONSTASCII_STRINGPARAM( LIBO_CLIENT_SUFFIX)).append( 
pImpl-msNameSuffix);
+aBuf.append( LIBO_CLIENT_SUFFIX ).append( pImpl-msNameSuffix);
 return aBuf.makeStringAndClear();
 }
 
 rtl::OString TeleManager::getFullServiceName()
 {
 OStringBuffer aBuf(64);
-aBuf.append( RTL_CONSTASCII_STRINGPARAM( LIBO_DTUBE_SERVICE)).append( 
pImpl-msNameSuffix);
+aBuf.append( LIBO_DTUBE_SERVICE ).append( pImpl-msNameSuffix);
 return aBuf.makeStringAndClear();
 }
 
 rtl::OString TeleManager::getFullObjectPath()
 {
 OStringBuffer aBuf(64);
-aBuf.append( '/').append( RTL_CONSTASCII_STRINGPARAM( 
LIBO_DTUBE_SERVICE)).append( pImpl-msNameSuffix);
+aBuf.append( '/').append( LIBO_DTUBE_SERVICE ).append( 
pImpl-msNameSuffix);
 OString aStr( aBuf.makeStringAndClear().replace( '.', '/'));
 return aStr;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits