empathy r926 - in trunk: libempathy src

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Apr 11 16:00:41 2008
New Revision: 926
URL: http://svn.gnome.org/viewvc/empathy?rev=926&view=rev

Log:
Fix some warnings


Modified:
   trunk/libempathy/empathy-tp-call.c
   trunk/libempathy/empathy-tp-group.c
   trunk/src/empathy-call-window.c
   trunk/src/empathy-status-icon.c

Modified: trunk/libempathy/empathy-tp-call.c
==============================================================================
--- trunk/libempathy/empathy-tp-call.c	(original)
+++ trunk/libempathy/empathy-tp-call.c	Fri Apr 11 16:00:41 2008
@@ -498,7 +498,7 @@
   if (empathy_tp_group_is_ready (priv->group))
       tp_call_group_ready_cb (call);
   else
-      g_signal_connect_swapped (priv->group, "ready",
+      g_signal_connect_swapped (priv->group, "notify::ready",
           G_CALLBACK (tp_call_group_ready_cb), call);
 
   /* Start stream engine */
@@ -616,7 +616,7 @@
 
   g_object_class_install_property (object_class, PROP_CHANNEL,
       g_param_spec_object ("channel", "channel", "channel",
-      TELEPATHY_CHAN_TYPE,
+      TP_TYPE_CHANNEL,
       G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE |
       G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
   g_object_class_install_property (object_class, PROP_CONTACT,

Modified: trunk/libempathy/empathy-tp-group.c
==============================================================================
--- trunk/libempathy/empathy-tp-group.c	(original)
+++ trunk/libempathy/empathy-tp-group.c	Fri Apr 11 16:00:41 2008
@@ -967,7 +967,7 @@
 	}
 
 	if (remote_contact) {
-		*remote_contact = contact;
+		*remote_contact = g_object_ref (contact);
 	}
 
 	return invitation;

Modified: trunk/src/empathy-call-window.c
==============================================================================
--- trunk/src/empathy-call-window.c	(original)
+++ trunk/src/empathy-call-window.c	Fri Apr 11 16:00:41 2008
@@ -386,8 +386,8 @@
 
       call_window_finalize (window);
     }
-
-  g_object_unref (contact);
+  if (contact)
+      g_object_unref (contact);
 }
 
 GtkWidget *

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Fri Apr 11 16:00:41 2008
@@ -393,6 +393,10 @@
 		event->user_data = group;
 		g_free (msg);
 	}
+
+	if (contact) {
+		g_object_unref (contact);
+	}
 }
 
 static void