empathy r636 - trunk/libempathy
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r636 - trunk/libempathy
- Date: Fri, 15 Feb 2008 21:29:20 +0000 (GMT)
Author: xclaesse
Date: Fri Feb 15 21:29:20 2008
New Revision: 636
URL: http://svn.gnome.org/viewvc/empathy?rev=636&view=rev
Log:
Simplifies empathy_call_with_contact_id.
Modified:
trunk/libempathy/empathy-utils.c
Modified: trunk/libempathy/empathy-utils.c
==============================================================================
--- trunk/libempathy/empathy-utils.c (original)
+++ trunk/libempathy/empathy-utils.c Fri Feb 15 21:29:20 2008
@@ -464,24 +464,18 @@
}
#ifdef HAVE_VOIP
-struct empathy_call_cb_user_data {
- guint handler;
- GObject *factory;
-};
-
static void
-empathy_call_with_contact_id_got_handle_cb (EmpathyContact *contact,
- GParamSpec *property, gpointer user_data) {
-
- struct empathy_call_cb_user_data *ud =
- (struct empathy_call_cb_user_data *) user_data;
-
- g_signal_handler_disconnect (contact, ud->handler);
+got_handle_cb (EmpathyContact *contact,
+ GParamSpec *property,
+ EmpathyContactFactory *factory)
+{
+ g_signal_handlers_disconnect_by_func (contact,
+ got_handle_cb,
+ factory);
empathy_call_with_contact (contact);
- g_object_unref (ud->factory);
+ g_object_unref (factory);
g_object_unref (contact);
- g_free (ud);
}
#endif
@@ -500,13 +494,10 @@
g_object_unref (contact);
g_object_unref (factory);
} else {
- struct empathy_call_cb_user_data *ud;
- ud = g_malloc0 (sizeof (struct empathy_call_cb_user_data));
- ud->factory = G_OBJECT (factory);
- ud->handler = g_signal_connect (G_OBJECT (contact), "notify::handle",
- G_CALLBACK (empathy_call_with_contact_id_got_handle_cb), ud);
+ g_signal_connect (contact, "notify::handle",
+ G_CALLBACK (got_handle_cb),
+ factory);
}
-
#endif
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]