[empathy/next: 55/79] Merge branch 'master' into next
- From: Simon McVittie <smcv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/next: 55/79] Merge branch 'master' into next
- Date: Thu, 3 Apr 2014 14:30:36 +0000 (UTC)
commit ad0198d6511e4ae7df807539dccf699e914dd438
Merge: 8f0e2ae 35ddfed
Author: Simon McVittie <simon mcvittie collabora co uk>
Date: Tue Mar 25 19:04:18 2014 +0000
Merge branch 'master' into next
Conflicts:
configure.ac
extensions/Makefile.am
extensions/misc.xml
libempathy-gtk/empathy-call-utils.c
libempathy-gtk/empathy-call-utils.h
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-share-my-desktop.c
libempathy/empathy-ft-handler.c
libempathy/empathy-request-util.c
libempathy/empathy-tp-chat.c
src/empathy-call-handler.c
telepathy-account-widgets
NEWS | 56 +
configure.ac | 7 +-
extensions/Makefile.am | 1 -
extensions/misc.xml | 2 -
goa-mc-plugin/mcp-account-manager-goa.c | 411 +++-
help/cs/cs.po | 4396 ++++++++++++++++++++++-------
libempathy-gtk/empathy-call-utils.c | 62 +-
libempathy-gtk/empathy-call-utils.h | 8 +-
libempathy-gtk/empathy-chat.c | 13 +-
libempathy-gtk/empathy-individual-menu.c | 8 +-
libempathy-gtk/empathy-log-window.c | 2 +-
libempathy-gtk/empathy-new-call-dialog.c | 2 +-
libempathy-gtk/empathy-share-my-desktop.c | 16 +-
libempathy/empathy-ft-handler.c | 60 +-
libempathy/empathy-request-util.c | 17 +-
libempathy/empathy-tp-chat.c | 32 +-
po/ca.po | 956 ++++---
po/cs.po | 30 +-
po/da.po | 949 ++++---
po/eu.po | 951 ++++---
po/fi.po | 969 ++++----
po/fr.po | 951 ++++---
po/hu.po | 542 ++--
po/ko.po | 897 +++---
po/lt.po | 496 ++--
po/lv.po | 617 ++--
po/nb.po | 395 ++--
po/pa.po | 597 ++--
po/pl.po | 575 ++--
po/pt.po | 577 ++--
po/ru.po | 577 ++--
po/sr.po | 575 ++--
po/sr latin po | 575 ++--
po/uk.po | 957 ++++---
src/.gitignore | 2 +
{extensions => src}/Chat_Manager.xml | 0
src/Makefile.am | 15 +-
src/empathy-accounts-dialog.c | 4 +-
src/empathy-call-handler.c | 22 +-
src/empathy-chat-manager.c | 117 +-
src/empathy-chat-manager.h | 5 +-
41 files changed, 10151 insertions(+), 7293 deletions(-)
---
diff --cc configure.ac
index 654a372,28990ab..914d292
--- a/configure.ac
+++ b/configure.ac
@@@ -2,9 -2,9 +2,9 @@@ dnl If not 1, append datestamp to the v
m4_define(empathy_released, 0)
m4_define([empathy_major_version], [3])
- m4_define([empathy_minor_version], [11])
- m4_define([empathy_micro_version], [4])
- m4_define([empathy_nano_version], [0])
+ m4_define([empathy_minor_version], [12])
+ m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [0])
++m4_define([empathy_nano_version], [1])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],
diff --cc extensions/Makefile.am
index 0c8b1e0,79622d4..daeeee7
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@@ -12,7 -12,8 +12,6 @@@ EXTRA_DIST =
all.xml \
generic-types.xml \
misc.xml \
- Chat_Manager.xml \
- Logger.xml \
- Channel_Interface_Credentials_Storage.xml \
$(NULL)
noinst_LTLIBRARIES = libemp-extensions.la
diff --cc extensions/misc.xml
index 103dac8,f8bc5f1..7c1e1ea
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@@ -4,6 -4,7 +4,4 @@@
<tp:title>Misc extensions for Empathy</tp:title>
- <xi:include href="Chat_Manager.xml" />
-
-<xi:include href="Logger.xml" />
-<xi:include href="Channel_Interface_Credentials_Storage.xml" />
-
</tp:spec>
diff --cc libempathy-gtk/empathy-call-utils.c
index 2e6e5bc,c6380ba..f662d85
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@@ -121,20 -93,18 +93,18 @@@ empathy_call_create_call_request (TpAcc
gboolean initial_video,
gint64 timestamp)
{
- GVariant *call_request;
TpAccountChannelRequest *call_req;
- /* Call */
- call_request = empathy_call_create_call_request (contact,
- initial_audio,
- initial_video);
+ if (initial_video)
+ call_req = tp_account_channel_request_new_audio_video_call (account,
+ timestamp);
+ else
+ call_req = tp_account_channel_request_new_audio_call (account, timestamp);
- call_req = tp_account_channel_request_new (account, call_request, timestamp);
- tp_account_channel_request_set_target_id (call_req, TP_HANDLE_TYPE_CONTACT,
++ tp_account_channel_request_set_target_id (call_req, TP_ENTITY_TYPE_CONTACT,
+ contact);
- tp_account_channel_request_create_channel_async (call_req,
- EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL);
-
- g_object_unref (call_req);
+ return call_req;
}
void
diff --cc libempathy-gtk/empathy-chat.c
index 6cf9b1e,f17bbbb..1002236
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@@ -844,17 -846,12 +844,12 @@@ chat_command_msg_internal (EmpathyChat
EmpathyChatPriv *priv = GET_PRIV (chat);
ChatCommandMsgData *data;
TpAccountChannelRequest *req;
- GVariantDict dict;
- g_variant_dict_init (&dict, NULL);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_CHANNEL_TYPE, "s",
- TP_IFACE_CHANNEL_TYPE_TEXT);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, "u",
- TP_ENTITY_TYPE_CONTACT);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_TARGET_ID, "s", contact_id);
+ req = tp_account_channel_request_new_text (priv->account,
+ empathy_get_current_action_time ());
- req = tp_account_channel_request_new (priv->account,
- g_variant_dict_end (&dict), empathy_get_current_action_time ());
- tp_account_channel_request_set_target_id (req, TP_HANDLE_TYPE_CONTACT,
++ tp_account_channel_request_set_target_id (req, TP_ENTITY_TYPE_CONTACT,
+ contact_id);
/* FIXME: We should probably search in members alias. But this
* is enough for IRC */
diff --cc libempathy/empathy-ft-handler.c
index c24dcb7,367e946..21e44d8
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@@ -828,25 -828,12 +828,14 @@@ ft_handler_create_channel_cb (GObject *
static void
ft_handler_push_to_dispatcher (EmpathyFTHandler *handler)
{
- TpAccount *account;
EmpathyFTHandlerPriv *priv = GET_PRIV (handler);
- TpAccountChannelRequest *req;
+ g_return_if_fail (priv->request != NULL);
+
DEBUG ("Pushing request to the dispatcher");
- account = empathy_contact_get_account (priv->contact);
-
- req = tp_account_channel_request_new (account,
- g_variant_dict_end (priv->request), priv->user_action_time);
-
- g_clear_pointer (&priv->request, g_variant_dict_unref);
-
- tp_account_channel_request_create_and_handle_channel_async (req, NULL,
- ft_handler_create_channel_cb, handler);
-
- g_object_unref (req);
+ tp_account_channel_request_create_and_handle_channel_async (priv->request,
+ NULL, ft_handler_create_channel_cb, handler);
}
static void
@@@ -926,11 -905,10 +907,10 @@@ hash_job_done (gpointer user_data
else
{
/* set the checksum in the request...
- * org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentHash
+ * im.telepathy.v1.Channel.Type.FileTransfer.ContentHash
*/
- g_variant_dict_insert (priv->request,
- TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_HASH, "s",
- g_checksum_get_string (hash_data->checksum));
+ tp_account_channel_request_set_file_transfer_hash (priv->request,
+ TP_FILE_HASH_TYPE_MD5, g_checksum_get_string (hash_data->checksum));
}
cleanup:
diff --cc libempathy/empathy-request-util.c
index 17cc037,4eb8334..dae2678
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@@ -60,23 -60,14 +60,14 @@@ create_text_channel (TpAccount *account
GAsyncReadyCallback callback,
gpointer user_data)
{
- GVariantDict dict;
TpAccountChannelRequest *req;
- g_variant_dict_init (&dict, NULL);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_CHANNEL_TYPE, "s",
- TP_IFACE_CHANNEL_TYPE_TEXT);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, "u",
- target_entity_type);
- g_variant_dict_insert (&dict, TP_PROP_CHANNEL_TARGET_ID, "s", target_id);
+ req = tp_account_channel_request_new_text (account, timestamp);
- tp_account_channel_request_set_target_id (req, target_handle_type, target_id);
++ tp_account_channel_request_set_target_id (req, target_entity_type, target_id);
+ tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE);
if (sms_channel)
- g_variant_dict_insert (&dict,
- TP_PROP_CHANNEL_INTERFACE_SMS1_SMS_CHANNEL, "b", TRUE);
-
- req = tp_account_channel_request_new (account, g_variant_dict_end (&dict),
- timestamp);
- tp_account_channel_request_set_delegate_to_preferred_handler (req, TRUE);
+ tp_account_channel_request_set_sms_channel (req, TRUE);
tp_account_channel_request_ensure_channel_async (req,
EMPATHY_CHAT_TP_BUS_NAME, NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
