Fix some warnings

svn path=/trunk/; revision=926

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 473004c2d725514572d4a4873ebc1c1b3728c485..ae5f83f1c2aef18da0f7fd6993816f5328cb2878 100644 (file)
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -498,7 +498,7 @@ tp_call_constructor (GType type,
   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 @@ empathy_tp_call_class_init (EmpathyTpCallClass *klass)
 
   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,

diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c
index 675854b27ea46ab858435a57320b2de2ca1f39f9..f09d8ce1b72388f257d5071b99f7ffa4ac643345 100644 (file)
--- a/libempathy/empathy-tp-group.c
+++ b/libempathy/empathy-tp-group.c
@@ -967,7 +967,7 @@ empathy_tp_group_get_invitation (EmpathyTpGroup  *group,
        }
 
        if (remote_contact) {
-               *remote_contact = contact;
+               *remote_contact = g_object_ref (contact);
        }
 
        return invitation;

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index f8a199ca9ac75e3f4b4a7a9d4c2eebe5d812e8d3..2533d774364eb28f6a0c1ec5d675d35716bec07d 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -386,8 +386,8 @@ call_window_update (EmpathyCallWindow *window)
 
       call_window_finalize (window);
     }
-
-  g_object_unref (contact);
+  if (contact)
+      g_object_unref (contact);
 }
 
 GtkWidget *

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 0cafbfdd8d64e8469d420ae8f67469a9eb44967a..18788fb7d16beaf135f0a10227439166208dabb5 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -393,6 +393,10 @@ status_icon_call_filter_new_channel (EmpathyFilter     *filter,
                event->user_data = group;
                g_free (msg);
        }
+
+       if (contact) {
+               g_object_unref (contact);
+       }
 }
 
 static void