aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--data/22x22/Makefile.am1
-rw-r--r--data/22x22/empathy-group-message.pngbin0 -> 1261 bytes
-rw-r--r--libempathy-gtk/gossip-group-chat.c2
-rw-r--r--libempathy-gtk/gossip-private-chat.c1
-rw-r--r--libempathy/empathy-tp-contact-list.c7
6 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d58dfaf07..18d06118c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2007-05-25 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/gossip-group-chat.c: Fix refcounting of
+ GossipGroupChat.
+ * libempathy/empathy-tp-contact-list.c: Add debug message when alias
+ request fails.
+ * data/22x22/empathy-group-message.png:
+ * data/22x22/Makefile.am: Add group message icon.
+
+2007-05-25 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/gossip-new-chatroom-dialog.c: Do not use the server
entry's value if it's hidden.
* libempathy-gtk/gossip-contact-list-view.c:Do not highlight groups
diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am
index ce814e53c..987201956 100644
--- a/data/22x22/Makefile.am
+++ b/data/22x22/Makefile.am
@@ -2,6 +2,7 @@ icondir = $(datadir)/icons/hicolor/22x22/apps
icon_DATA = \
empathy.png \
empathy-new-message.png \
+ empathy-group-message.png \
empathy-proto-ekiga.png \
empathy-proto-google-talk.png \
empathy-proto-msn.png \
diff --git a/data/22x22/empathy-group-message.png b/data/22x22/empathy-group-message.png
new file mode 100644
index 000000000..7b803b1be
--- /dev/null
+++ b/data/22x22/empathy-group-message.png
Binary files differ
diff --git a/libempathy-gtk/gossip-group-chat.c b/libempathy-gtk/gossip-group-chat.c
index f16bee0de..3dc4022bf 100644
--- a/libempathy-gtk/gossip-group-chat.c
+++ b/libempathy-gtk/gossip-group-chat.c
@@ -323,7 +323,7 @@ group_chat_create_ui (GossipGroupChat *chat)
g_object_unref (glade);
- g_object_set_data (G_OBJECT (priv->widget), "chat", chat);
+ g_object_set_data (G_OBJECT (priv->widget), "chat", g_object_ref (chat));
/* Add room GtkTextView. */
gtk_container_add (GTK_CONTAINER (priv->scrolled_window_chat),
diff --git a/libempathy-gtk/gossip-private-chat.c b/libempathy-gtk/gossip-private-chat.c
index fb7198ff0..12e83dccc 100644
--- a/libempathy-gtk/gossip-private-chat.c
+++ b/libempathy-gtk/gossip-private-chat.c
@@ -106,7 +106,6 @@ gossip_private_chat_init (GossipPrivateChat *chat)
priv->is_online = FALSE;
private_chat_create_ui (chat);
-
}
static void
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 0bbd46a95..8338e9eb4 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -1714,7 +1714,12 @@ tp_contact_list_request_aliases_cb (DBusGProxy *proxy,
guint i = 0;
gchar **name;
- for (name = contact_names; *name && !error; name++) {
+ if (error) {
+ gossip_debug (DEBUG_DOMAIN, "Error requesting aliases: %s",
+ error->message);
+ }
+
+ for (name = contact_names; *name; name++) {
GossipContact *contact;
contact = empathy_tp_contact_list_get_from_handle (data->list,