diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-26 10:25:35 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-30 11:47:20 +0200 |
| commit | 6199b89e2978b0f72ea0baee5865812567f8cc13 (patch) | |
| tree | 66064c8736d6d6fb994bc4d7d0fbbe4c28182202 | |
| parent | 2e3b97db5c99be0144abfab369302aedb65fb5be (diff) | |
room-list: rename 'got-rooms' signal to 'got-room'
It's not plural.
| -rw-r--r-- | telepathy-glib/room-list.c | 8 | ||||
| -rw-r--r-- | tests/dbus/room-list.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/telepathy-glib/room-list.c b/telepathy-glib/room-list.c index a35f357e7..14ce0fd56 100644 --- a/telepathy-glib/room-list.c +++ b/telepathy-glib/room-list.c @@ -81,7 +81,7 @@ enum }; enum { - SIG_GOT_ROOMS, + SIG_GOT_ROOM, SIG_FAILED, LAST_SIGNAL }; @@ -156,7 +156,7 @@ got_rooms_cb (TpChannel *channel, TpRoomInfo *room; room = _tp_room_info_new (g_ptr_array_index (rooms, i)); - g_signal_emit (self, signals[SIG_GOT_ROOMS], 0, room); + g_signal_emit (self, signals[SIG_GOT_ROOM], 0, room); g_object_unref (room); } } @@ -275,7 +275,7 @@ tp_room_list_class_init (TpRoomListClass *klass) /** - * TpRoomList::got-rooms: + * TpRoomList::got-room: * @self: a #TpRoomList * @room: a #TpRoomInfo * @@ -285,7 +285,7 @@ tp_room_list_class_init (TpRoomListClass *klass) * * Since: UNRELEASED */ - signals[SIG_GOT_ROOMS] = g_signal_new ("got-rooms", + signals[SIG_GOT_ROOM] = g_signal_new ("got-room", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, diff --git a/tests/dbus/room-list.c b/tests/dbus/room-list.c index bd485b949..b017ea43c 100644 --- a/tests/dbus/room-list.c +++ b/tests/dbus/room-list.c @@ -174,7 +174,7 @@ notify_cb (GObject *object, } static void -got_rooms_cb (TpRoomList *channel, +got_room_cb (TpRoomList *channel, TpRoomInfo *room, Test *test) { @@ -197,8 +197,8 @@ test_listing (Test *test, g_signal_connect (test->room_list, "notify::listing", G_CALLBACK (notify_cb), test); - g_signal_connect (test->room_list, "got-rooms", - G_CALLBACK (got_rooms_cb), test); + g_signal_connect (test->room_list, "got-room", + G_CALLBACK (got_room_cb), test); tp_room_list_start (test->room_list); |