diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2013-11-04 22:43:14 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-08 10:32:28 -0600 |
commit | fe5acac6976850d67f70347a2d2657f9105bfebd (patch) | |
tree | e375b2f7fb70d504925ee19700d5073a4ea50c37 /tubes | |
parent | 61a20e43b1ec7641bed073244c988e3ea981f086 (diff) |
Silence -Wdeprecated-declarations for the moment
Change-Id: If08c7f72195dfff6ae3b7cb52b4137aeda3bc675
Reviewed-on: https://gerrit.libreoffice.org/6604
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'tubes')
-rw-r--r-- | tubes/source/file-transfer-helper.c | 20 | ||||
-rw-r--r-- | tubes/source/manager.cxx | 5 |
2 files changed, 21 insertions, 4 deletions
diff --git a/tubes/source/file-transfer-helper.c b/tubes/source/file-transfer-helper.c index 6450343bbb09..093d4190f4d8 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 f5787b420b01..7d4ee5a7a354 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; } |