Attachment #310139 for bug #413423




   TplCallEndReason ceased to exist on March 28
libempathy-gtk/empathy-log-window.c |   11 ++++++-----
libempathy/empathy-message.c        |    2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
++ b/libempathy-gtk/empathy-log-window.c
-- a/libempathy-gtk/empathy-log-window.c

  else if (TPL_IS_CALL_EVENT (event))
    {
      TplCallEvent *call = TPL_CALL_EVENT (event);
      TpCallStateChangeReason reason = tpl_call_event_get_end_reason 
      TplEntity *sender = tpl_event_get_sender (event);
      TplEntity *receiver = tpl_event_get_receiver (event);

      if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
        icon = EMPATHY_IMAGE_CALL_MISSED;
      else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
        icon = EMPATHY_IMAGE_CALL_OUTGOING;

      COL_EVENTS_EVENT, event,
      -1);

  if (tpl_call_event_get_end_reason (call) != 
    {
      gchar *body;
      gchar *tmp;

            }
          else
            {
              TpCallStateChangeReason reason =
                tpl_call_event_get_end_reason (call);
              TplEntity *sender = tpl_event_get_sender (event);
              TplEntity *receiver = tpl_event_get_receiver (event);

              if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
                {
                  if (ctx->subtype & EVENT_CALL_MISSED)
                    append = TRUE;

Lines 411-417 empathy_message_from_tpl_log_event (TplEvent Link Here

(-)a/libempathy/empathy-message.c (-1 / +1 lines)
411		411
412	timestamp = tpl_event_get_timestamp (logevent);	412	timestamp = tpl_event_get_timestamp (logevent);
413		413
414	if (tpl_call_event_get_end_reason (call) ==	414	if (tpl_call_event_get_end_reason (call) ==
415	body = g_strdup_printf (_("Missed call from	415	body = g_strdup_printf (_("Missed call from
416	tpl_entity_get_alias	416	tpl_entity_get_alias
417	else if (tpl_entity_get_entity_type	417	else if (tpl_entity_get_entity_type

Return to bug 413423

Line Link Here

(-)file_not_specified_in_diff (-7 / +7 lines)
	TplCallEndReason ceased to exist on March 28		TplCallEndReason ceased to exist on March 28
1	libempathy-gtk/empathy-log-window.c \| 11 ++++++-----	1	libempathy-gtk/empathy-log-window.c \| 11 ++++++-----
2	libempathy/empathy-message.c \| 2 +-	2	libempathy/empathy-message.c \| 2 +-
3	2 files changed, 7 insertions(+), 6 deletions(-)	3	2 files changed, 7 insertions(+), 6 deletions(-)
4	--	4	++ b/libempathy-gtk/empathy-log-window.c
5	-- a/libempathy-gtk/empathy-log-window.c
Lines 1236-1246 get_icon_for_event (TplEvent *event) Link Here
1236	else if (TPL_IS_CALL_EVENT (event))	1236	else if (TPL_IS_CALL_EVENT (event))
1237	{	1237	{
1238	TplCallEvent *call = TPL_CALL_EVENT (event);	1238	TplCallEvent *call = TPL_CALL_EVENT (event);
1239	TplCallEndReason reason = tpl_call_event_get_end_reason (call);	1239	TpCallStateChangeReason reason = tpl_call_event_get_end_reason
1240	TplEntity *sender = tpl_event_get_sender (event);	1240	TplEntity *sender = tpl_event_get_sender (event);
1241	TplEntity *receiver = tpl_event_get_receiver (event);	1241	TplEntity *receiver = tpl_event_get_receiver (event);
1242		1242
1243	if (reason == TPL_CALL_END_REASON_NO_ANSWER)	1243	if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
1244	icon = EMPATHY_IMAGE_CALL_MISSED;	1244	icon = EMPATHY_IMAGE_CALL_MISSED;
1245	else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)	1245	else if (tpl_entity_get_entity_type (sender) == TPL_ENTITY_SELF)
1246	icon = EMPATHY_IMAGE_CALL_OUTGOING;	1246	icon = EMPATHY_IMAGE_CALL_OUTGOING;
Lines 1357-1363 log_window_append_call (TplEvent *event, Link Here
1357	COL_EVENTS_EVENT, event,	1357	COL_EVENTS_EVENT, event,
1358	-1);	1358	-1);
1359		1359
1360	if (tpl_call_event_get_end_reason (call) !=	1360	if (tpl_call_event_get_end_reason (call) !=
1361	{	1361	{
1362	gchar *body;	1362	gchar *body;
1363	gchar *tmp;	1363	gchar *tmp;
Lines 3243-3253 log_window_got_messages_for_date_cb (GObject Link Here
3243	}	3243	}
3244	else	3244	else
3245	{	3245	{
3246	TplCallEndReason reason = tpl_call_event_get_end_reason	3246	TpCallStateChangeReason reason =
		3247	tpl_call_event_get_end_reason (call);
3247	TplEntity *sender = tpl_event_get_sender (event);	3248	TplEntity *sender = tpl_event_get_sender (event);
3248	TplEntity *receiver = tpl_event_get_receiver (event);	3249	TplEntity *receiver = tpl_event_get_receiver (event);
3249		3250
3250	if (reason == TPL_CALL_END_REASON_NO_ANSWER)	3251	if (reason == TP_CALL_STATE_CHANGE_REASON_NO_ANSWER)
3251	{	3252	{
3252	if (ctx->subtype & EVENT_CALL_MISSED)	3253	if (ctx->subtype & EVENT_CALL_MISSED)
3253	append = TRUE;	3254	append = TRUE;