empathy r2170 - trunk/libempathy-gtk
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r2170 - trunk/libempathy-gtk
- Date: Fri, 9 Jan 2009 16:14:27 +0000 (UTC)
Author: xclaesse
Date: Fri Jan 9 16:14:27 2009
New Revision: 2170
URL: http://svn.gnome.org/viewvc/empathy?rev=2170&view=rev
Log:
Fix coding style, user the right unique name
Signed-off-by: Sjoerd Simons <sjoerd simons collabora co uk>
Modified:
trunk/libempathy-gtk/empathy-chat.c
Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c (original)
+++ trunk/libempathy-gtk/empathy-chat.c Fri Jan 9 16:14:27 2009
@@ -184,17 +184,17 @@
DEBUG ("Account reconnected, request a new Text channel");
switch (priv->handle_type) {
- case TP_HANDLE_TYPE_CONTACT:
- empathy_dispatcher_chat_with_contact_id (account, unique_name,
- NULL, NULL);
- break;
- case TP_HANDLE_TYPE_ROOM:
- empathy_dispatcher_join_muc (account, unique_name, NULL, NULL);
- break;
- default:
- g_assert_not_reached ();
- break;
- }
+ case TP_HANDLE_TYPE_CONTACT:
+ empathy_dispatcher_chat_with_contact_id (account, priv->id,
+ NULL, NULL);
+ break;
+ case TP_HANDLE_TYPE_ROOM:
+ empathy_dispatcher_join_muc (account, priv->id, NULL, NULL);
+ break;
+ default:
+ g_assert_not_reached ();
+ break;
+ }
}
}
@@ -454,7 +454,7 @@
}
static void
-chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
+chat_message_received (EmpathyChat *chat, EmpathyMessage *message)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
EmpathyContact *sender;
@@ -1251,22 +1251,20 @@
}
static void
-show_pending_messages (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
- const GList *messages, *l;
+show_pending_messages (EmpathyChat *chat) {
+ EmpathyChatPriv *priv = GET_PRIV (chat);
+ const GList *messages, *l;
- if (chat->view == NULL || priv->tp_chat == NULL)
- return;
+ if (chat->view == NULL || priv->tp_chat == NULL)
+ return;
- messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
+ messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
- for (l = messages; l != NULL ; l = g_list_next (l))
- {
- EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
- chat_message_received (chat, message);
- }
- empathy_tp_chat_acknowledge_messages (priv->tp_chat, messages);
+ for (l = messages; l != NULL ; l = g_list_next (l)) {
+ EmpathyMessage *message = EMPATHY_MESSAGE (l->data);
+ chat_message_received (chat, message);
+ }
+ empathy_tp_chat_acknowledge_messages (priv->tp_chat, messages);
}
static void
@@ -1360,7 +1358,7 @@
/* Add the main widget in the chat widget */
gtk_container_add (GTK_CONTAINER (chat), priv->widget);
- show_pending_messages (chat);
+ show_pending_messages (chat);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]