[next] telepathy-glib: room-list: rename 'got-rooms' signal to 'got-room'

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 6199b89e2978b0f72ea0baee5865812567f8cc13
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=6199b89e2978b0f72ea0baee5865812567f8cc13

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Thu Apr 26 10:25:35 2012 +0200

room-list: rename 'got-rooms' signal to 'got-room'

It's not plural.

---

 telepathy-glib/room-list.c |    8 ++++----
 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 a35f357..14ce0fd 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 bd485b9..b017ea4 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);