diff options
| author | Pierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk> | 2009-06-15 00:20:28 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-06-15 22:40:10 +0800 |
| commit | e37fbd376151222f336650f66476c3cdc0957451 (patch) | |
| tree | 75e58b0649148b1c24f2d2112061a5a51180d85e | |
| parent | 0b23d0983acb95ced196c766ee112143ec314c22 (diff) | |
| download | gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar.gz gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar.bz2 gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar.lz gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar.xz gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.tar.zst gsoc2013-empathy-e37fbd376151222f336650f66476c3cdc0957451.zip | |
Simplify map_view_marker_update_position
| -rw-r--r-- | src/empathy-map-view.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index 3a2210fa2..276b69402 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -66,9 +66,9 @@ static void map_view_zoom_in_cb (GtkWidget *widget, EmpathyMapView *window); static void map_view_zoom_out_cb (GtkWidget *widget, EmpathyMapView *window); -static void map_view_contact_location_notify (GObject *gobject, +static void map_view_contact_location_notify (EmpathyContact *contact, GParamSpec *arg1, - gpointer user_data); + ChamplainMarker *marker); static void map_view_state_changed (ChamplainView *view, @@ -227,12 +227,10 @@ map_view_marker_update_position (ChamplainMarker *marker, } static void -map_view_contact_location_notify (GObject *gobject, +map_view_contact_location_notify (EmpathyContact *contact, GParamSpec *arg1, - gpointer user_data) + ChamplainMarker *marker) { - ChamplainMarker *marker = CHAMPLAIN_MARKER (user_data); - EmpathyContact *contact = EMPATHY_CONTACT (gobject); map_view_marker_update_position (marker, contact); } @@ -299,7 +297,8 @@ map_view_contacts_foreach (GtkTreeModel *model, g_signal_connect (contact, "notify::location", G_CALLBACK (map_view_contact_location_notify), marker); - g_object_set_data_full (G_OBJECT (marker), "contact", g_object_ref (contact), g_object_unref); + g_object_set_data_full (G_OBJECT (marker), "contact", + g_object_ref (contact), g_object_unref); map_view_marker_update_position (CHAMPLAIN_MARKER (marker), contact); |