Fix refcounting of GossipGroupChat. Add debug message when alias request

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.

svn path=/trunk/; revision=94

diff --git a/ChangeLog b/ChangeLog
index d58dfaf07e8e5631a9721ea3176211ca90a20262..18d06118cd9f0adb80818d14539dc7d9a2012e8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am
index ce814e53c5f281d2d44cba749ded50f19c2d2cae..987201956e374e9b44658504850ef904debe5fff 100644 (file)
--- 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 (file)
index 0000000..7b803b1
Binary files /dev/null and b/data/22x22/empathy-group-message.png differ

diff --git a/libempathy-gtk/gossip-group-chat.c b/libempathy-gtk/gossip-group-chat.c
index f16bee0de125d32e63522135e941b62dac5c573e..3dc4022bf382794bb4d124c817d0c3a8e89eb4c1 100644 (file)
--- 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 fb7198ff0549e1dcb83117ef6a30bef6977b673d..12e83dcccfb56eebe04fb42c25ca22191cf53447 100644 (file)
--- 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 0bbd46a9555459d9ccb42f9a564990bbb0fc3aa3..8338e9eb458daa313004d98219c5f64b7a829ba8 100644 (file)
--- 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,