Mercurial > pidgin3 / file diff

--- a/libpurple/roomlist.h	Tue Jul 02 18:21:13 2019 -0400
+++ b/libpurple/roomlist.h	Tue Jul 02 21:53:48 2019 -0400
@@ -28,15 +28,8 @@
  * @title: Room List API
  */
 
-#define PURPLE_TYPE_ROOMLIST             (purple_roomlist_get_type())
-#define PURPLE_ROOMLIST(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_ROOMLIST, PurpleRoomlist))
-#define PURPLE_ROOMLIST_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_ROOMLIST, PurpleRoomlistClass))
-#define PURPLE_IS_ROOMLIST(obj)          (G_TYPE_CHECK_INSTANCE_TYPE((obj), PURPLE_TYPE_ROOMLIST))
-#define PURPLE_IS_ROOMLIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_ROOMLIST))
-#define PURPLE_ROOMLIST_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_ROOMLIST, PurpleRoomlistClass))
-
+#define PURPLE_TYPE_ROOMLIST (purple_roomlist_get_type())
 typedef struct _PurpleRoomlist PurpleRoomlist;
-typedef struct _PurpleRoomlistClass PurpleRoomlistClass;
 
 #define PURPLE_TYPE_ROOMLIST_ROOM        (purple_roomlist_room_get_type())
 
@@ -131,21 +124,6 @@
 	gpointer ui_data;
 };
 
-/**
- * PurpleRoomlistClass:
- *
- * Base class for all #PurpleRoomlist's
- */
-struct _PurpleRoomlistClass {
-	GObjectClass parent_class;
-
-	/*< private >*/
-	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
-};
-
 G_BEGIN_DECLS
 
 /**************************************************************************/
@@ -157,7 +135,7 @@
  *
  * Returns: The #GType for the Room List object.
  */
-GType purple_roomlist_get_type(void);
+G_DECLARE_FINAL_TYPE(PurpleRoomlist, purple_roomlist, PURPLE, ROOMLIST, GObject)
 
 /**
  * purple_roomlist_show_with_account: