diff options
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.c | 12 | ||||
| -rw-r--r-- | libempathy/empathy-tp-chat.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index bed7aa78e..d27337b25 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -96,7 +96,7 @@ typedef struct { GtkWidget *info_bar_vbox; GtkWidget *search_bar; - GList *pending_messages; + GSList *pending_messages; /* TRUE if the pending messages can be displayed. This is to avoid to show * pending messages *before* messages from logs. (#603980) */ gboolean can_show_pending; @@ -1116,7 +1116,7 @@ chat_message_received (EmpathyChat *chat, EmpathyMessage *message) TP_CHANNEL_CHAT_STATE_ACTIVE, chat); - priv->pending_messages = g_list_prepend (priv->pending_messages, + priv->pending_messages = g_slist_prepend (priv->pending_messages, g_object_ref (message)); g_signal_emit (chat, signals[NEW_MESSAGE], 0, message); @@ -2936,7 +2936,7 @@ empathy_chat_get_nb_unread_messages (EmpathyChat *self) g_return_val_if_fail (EMPATHY_IS_CHAT (self), FALSE); - return g_list_length (priv->pending_messages); + return g_slist_length (priv->pending_messages); } /* called when the messages have been read by user */ @@ -2952,7 +2952,7 @@ empathy_chat_messages_read (EmpathyChat *self) while (priv->pending_messages != NULL) { g_object_unref (priv->pending_messages->data); - priv->pending_messages = g_list_delete_link ( + priv->pending_messages = g_slist_delete_link ( priv->pending_messages, priv->pending_messages); } } diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 381095efc..ea1c5ea62 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -1672,25 +1672,25 @@ out: void empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat, - const GList *messages) { + const GSList *messages) { EmpathyTpChatPriv *priv = GET_PRIV (chat); /* Copy messages as the messges list (probably is) our own */ - GList *msgs = g_list_copy ((GList *) messages); - GList *l; + GSList *msgs = g_slist_copy ((GSList *) messages); + GSList *l; guint length; GArray *message_ids; g_return_if_fail (EMPATHY_IS_TP_CHAT (chat)); g_return_if_fail (priv->ready); - length = g_list_length ((GList *) messages); + length = g_slist_length ((GSList *) messages); if (length == 0) return; message_ids = g_array_sized_new (FALSE, FALSE, sizeof (guint), length); - for (l = msgs; l != NULL; l = g_list_next (l)) { + for (l = msgs; l != NULL; l = g_slist_next (l)) { GList *m; EmpathyMessage *message = EMPATHY_MESSAGE (l->data); @@ -1710,7 +1710,7 @@ empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat, acknowledge_messages (chat, message_ids); g_array_free (message_ids, TRUE); - g_list_free (msgs); + g_slist_free (msgs); } gboolean diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 6b5fc8d0b..f281e1dc1 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -84,7 +84,7 @@ const GList * empathy_tp_chat_get_pending_messages (EmpathyTpChat *chat); void empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat, EmpathyMessage *message); void empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat, - const GList *messages); + const GSList *messages); gboolean empathy_tp_chat_password_needed (EmpathyTpChat *chat); |