Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-im/empathy/files: empathy-3.2.2-delivery-failed.patch empathy-3.2.2-telepathy-logger-0.4.patch empathy-3.2.2-cancellable-not-NULL.patch
Date: Wed, 02 May 2012 05:45:45
Message-Id: 20120502054535.089152004B@flycatcher.gentoo.org
1 tetromino 12/05/02 05:45:35
2
3 Added: empathy-3.2.2-delivery-failed.patch
4 empathy-3.2.2-telepathy-logger-0.4.patch
5 empathy-3.2.2-cancellable-not-NULL.patch
6 Log:
7 Fix telepathy-glib-0.4 compatibility (bug #413423, thanks to Antoine Lemoine and Jack River). Fix a crash and do not silently fail to send messages. Drop old.
8
9 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 net-im/empathy/files/empathy-3.2.2-delivery-failed.patch
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-delivery-failed.patch?rev=1.1&content-type=text/plain
16
17 Index: empathy-3.2.2-delivery-failed.patch
18 ===================================================================
19 From 457cdd199d2aa20cbebcc25ea305137ce7b0f440 Mon Sep 17 00:00:00 2001
20 From: Guillaume Desmottes <guillaume.desmottes@××××××××××××.uk>
21 Date: Tue, 22 Nov 2011 15:42:11 +0100
22 Subject: [PATCH] don't ignore TP_DELIVERY_STATUS_TEMPORARILY_FAILED delivery
23 report
24
25 We should display an error message as well if not the user will assume the
26 message has been sent and the spinner keeps spinning.
27
28 https://bugzilla.gnome.org/show_bug.cgi?id=664564
29 ---
30 libempathy/empathy-tp-chat.c | 3 ++-
31 1 files changed, 2 insertions(+), 1 deletions(-)
32
33 diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
34 index 2285f3f..f65f25d 100644
35 --- a/libempathy/empathy-tp-chat.c
36 +++ b/libempathy/empathy-tp-chat.c
37 @@ -375,7 +375,8 @@ handle_delivery_report (EmpathyTpChat *self,
38 tp_chat_set_delivery_status (self, delivery_token,
39 EMPATHY_DELIVERY_STATUS_NONE);
40 goto out;
41 - } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED) {
42 + } else if (delivery_status != TP_DELIVERY_STATUS_PERMANENTLY_FAILED &&
43 + delivery_status != TP_DELIVERY_STATUS_TEMPORARILY_FAILED) {
44 goto out;
45 }
46
47 --
48 1.7.8.6
49
50
51
52
53 1.1 net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch?rev=1.1&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-telepathy-logger-0.4.patch?rev=1.1&content-type=text/plain
57
58 Index: empathy-3.2.2-telepathy-logger-0.4.patch
59 ===================================================================
60 From 86ba5be5fa9a044fbcce6618ac6cd6dd7bdf3482 Mon Sep 17 00:00:00 2001
61 From: Danielle Madeley <danielle.madeley@××××××××××××.uk>
62 Date: Tue, 3 Apr 2012 10:35:09 +1000
63 Subject: [PATCH] TplCallEndReason ceased to exist on March 28
64
65 ---
66 libempathy-gtk/empathy-log-window.c | 11 ++++++-----
67 libempathy/empathy-message.c | 2 +-
68 2 files changed, 7 insertions(+), 6 deletions(-)
69
70 diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
71 index 72d4d46..c11bb02 100644
72 --- a/libempathy-gtk/empathy-log-window.c
73 +++ b/libempathy-gtk/empathy-log-window.c
74 @@ -1236,11 +1236,11 @@ get_icon_for_event (TplEvent *event)
75 else if (TPL_IS_CALL_EVENT (event))
76 {
77 TplCallEvent *call = TPL_CALL_EVENT (event);
78 - TplCallEndReason reason = tpl_call_event_get_end_reason (call);
79 + TpCallStateChangeReason reason = tpl_call_event_get_end_reason (call);
80 TplEntity *sender = tpl_event_get_sender (event);
81 TplEntity *receiver = tpl_event_get_receiver (event);
82
83 - if (reason == TPL_CALL_END_REASON_NO_ANSWER)
84 + if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
85 icon = EMPATHY_IMAGE_CALL_MISSED;
86 else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
87 icon = EMPATHY_IMAGE_CALL_OUTGOING;
88 @@ -1357,7 +1357,7 @@ log_window_append_call (TplEvent *event,
89 COL_EVENTS_EVENT, event,
90 -1);
91
92 - if (tpl_call_event_get_end_reason (call) != TPL_CALL_END_REASON_NO_ANSWER)
93 + if (tpl_call_event_get_end_reason (call) != TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
94 {
95 gchar *body;
96 gchar *tmp;
97 @@ -3243,11 +3243,12 @@ log_window_got_messages_for_date_cb (GObject *manager,
98 }
99 else
100 {
101 - TplCallEndReason reason = tpl_call_event_get_end_reason (call);
102 + TpCallStateChangeReason reason =
103 + tpl_call_event_get_end_reason (call);
104 TplEntity *sender = tpl_event_get_sender (event);
105 TplEntity *receiver = tpl_event_get_receiver (event);
106
107 - if (reason == TPL_CALL_END_REASON_NO_ANSWER)
108 + if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
109 {
110 if (ctx->subtype & EVENT_CALL_MISSED)
111 append = TRUE;
112 diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
113 index 6111bcd..a4caae1 100644
114 --- a/libempathy/empathy-message.c
115 +++ b/libempathy/empathy-message.c
116 @@ -411,7 +411,7 @@ empathy_message_from_tpl_log_event (TplEvent *logevent)
117
118 timestamp = tpl_event_get_timestamp (logevent);
119
120 - if (tpl_call_event_get_end_reason (call) == TPL_CALL_END_REASON_NO_ANSWER)
121 + if (tpl_call_event_get_end_reason (call) == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
122 body = g_strdup_printf (_("Missed call from %s"),
123 tpl_entity_get_alias (tpl_event_get_sender (logevent)));
124 else if (tpl_entity_get_entity_type (tpl_event_get_sender (logevent)) == TPL_ENTITY_SELF)
125 --
126 1.7.8.6
127
128
129
130
131 1.1 net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch
132
133 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch?rev=1.1&view=markup
134 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/empathy/files/empathy-3.2.2-cancellable-not-NULL.patch?rev=1.1&content-type=text/plain
135
136 Index: empathy-3.2.2-cancellable-not-NULL.patch
137 ===================================================================
138 From 641a6b06225cd00f62001d041316e72535662306 Mon Sep 17 00:00:00 2001
139 From: Guillaume Desmottes <guillaume.desmottes@××××××××××××.uk>
140 Date: Wed, 30 Nov 2011 12:55:29 +0100
141 Subject: [PATCH] ui-utils: don't expect that cancellable is not NULL
142
143 cancellable are always optional so this code should be NULL safe.
144 ---
145 libempathy-gtk/empathy-ui-utils.c | 5 +++--
146 1 files changed, 3 insertions(+), 2 deletions(-)
147
148 diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
149 index d5f63c9..2b9f5cf 100644
150 --- a/libempathy-gtk/empathy-ui-utils.c
151 +++ b/libempathy-gtk/empathy-ui-utils.c
152 @@ -549,7 +549,8 @@ pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual,
153 closure->result = g_object_ref (result);
154 closure->width = width;
155 closure->height = height;
156 - closure->cancellable = g_object_ref (cancellable);
157 + if (cancellable != NULL)
158 + closure->cancellable = g_object_ref (cancellable);
159
160 return closure;
161 }
162 @@ -558,7 +559,7 @@ static void
163 pixbuf_avatar_from_individual_closure_free (
164 PixbufAvatarFromIndividualClosure *closure)
165 {
166 - g_object_unref (closure->cancellable);
167 + g_clear_object (&closure->cancellable);
168 tp_clear_object (&closure->loader);
169 g_object_unref (closure->individual);
170 g_object_unref (closure->result);
171 --
172 1.7.8.6
Report Message
Find on MARC Find on Google Groups