diff options
author | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 17:22:56 +0200 |
---|---|---|
committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2011-02-01 21:06:07 +0200 |
commit | d89fac0a04f9938aa82fb193cef041f0c8a98ff3 (patch) | |
tree | e7544e9461d352535838948677d1327afd28d1d6 /src | |
parent | a32e4e8a1e68e4f9b65c3ad9d66b1d1059d32356 (diff) |
ring-text-channel: always use normal message type
Diffstat (limited to 'src')
-rw-r--r-- | src/ring-text-channel.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ring-text-channel.c b/src/ring-text-channel.c index d8110f7..14c4488 100644 --- a/src/ring-text-channel.c +++ b/src/ring-text-channel.c @@ -705,6 +705,7 @@ ring_text_channel_receive_deliver(RingTextChannel *self, tp_message_set_string(msg, 0, "sms-service-centre", sms_g_deliver_get_smsc(sms)); +#if nomore { char *mwi_type = NULL; guint mwi_line = 0, mwi_messages = 0; @@ -722,7 +723,6 @@ ring_text_channel_receive_deliver(RingTextChannel *self, if (mwi_type) { msg_type = TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE; -#if nomore /* XXX: waiting for upstream tp-glib to get these */ if (g_str_equal(mwi_type, "voice")) tp_message_set_string(msg, 0, NOKIA_VOICEMAIL_TYPE, "tel"); @@ -745,7 +745,6 @@ ring_text_channel_receive_deliver(RingTextChannel *self, mwi_discard); } } -#endif g_free(mwi_type); } else { @@ -754,6 +753,10 @@ ring_text_channel_receive_deliver(RingTextChannel *self, tp_message_set_uint32(msg, 0, "message-type", msg_type); } +#endif + + tp_message_set_uint32(msg, 0, "message-type", + TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL); gboolean string = FALSE, bytes = FALSE; |