diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 08:02:24 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 08:02:24 +0800 |
| commit | 77f2925266281eb12f75743dabeedb94e2493e51 (patch) | |
| tree | 3a59cd65f8eb67eb93e5d0de4f82a3c5d0ea6269 | |
| parent | c33fdeaba0949ce84d3b3fabc56007d3ab9de7e9 (diff) | |
| parent | 1df763a74cf894b15a75f3ccdc513216771c74b3 (diff) | |
| download | gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar.gz gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar.bz2 gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar.lz gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar.xz gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.tar.zst gsoc2013-empathy-77f2925266281eb12f75743dabeedb94e2493e51.zip | |
Merge branch 'tooltip-143' into empathy-skype
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 9 | ||||
| -rw-r--r-- | src/empathy-chat-window.c | 17 |
2 files changed, 16 insertions, 10 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 29f886416..d2ae46d9d 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -102,13 +102,14 @@ tp_chat_set_delivery_status (EmpathyTpChat *self, EmpathyDeliveryStatus delivery_status) { EmpathyTpChatPriv *priv = GET_PRIV (self); + TpDeliveryReportingSupportFlags flags = + tp_text_channel_get_delivery_reporting_support ( + TP_TEXT_CHANNEL (priv->channel)); /* channel must support receiving failures and successes */ if (!tp_str_empty (token) && - tp_text_channel_get_delivery_reporting_support ( - TP_TEXT_CHANNEL (priv->channel)) & - (TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES | - TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES)) { + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_FAILURES && + flags & TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_SUCCESSES) { DEBUG ("Delivery status (%s) = %u", token, delivery_status); diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index d498d8fec..4bf43cd70 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -737,12 +737,17 @@ chat_window_update_chat_tab_full (EmpathyChat *chat, tp_account_get_display_name (account)); if (nb_sending > 0) { - append_markup_printf (tooltip, "\n"); - append_markup_printf (tooltip, - ngettext ("Sending %d message", - "Sending %d messages", - nb_sending), - nb_sending); + char *tmp = g_strdup_printf ( + ngettext ("Sending %d message", + "Sending %d messages", + nb_sending), + nb_sending); + + g_string_append (tooltip, "\n"); + g_string_append (tooltip, tmp); + + gtk_widget_set_tooltip_text (sending_spinner, tmp); + g_free (tmp); } if (!EMP_STR_EMPTY (status)) { |