Mercurial > pidgin3 / changeset

--- a/pidgin/gtkblist-theme-loader.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkblist-theme-loader.c	Fri Mar 29 04:48:49 2019 -0400
@@ -32,6 +32,17 @@
 #include "gtkblist-theme-loader.h"
 #include "gtkblist-theme.h"
 
+/**
+ * PidginBlistThemeLoader:
+ *
+ * A pidgin buddy list theme loader. extends PurpleThemeLoader (theme-loader.h)
+ * This is a class designed to build sound themes
+ */
+struct _PidginBlistThemeLoader
+{
+	PurpleThemeLoader parent;
+};
+
 /******************************************************************************
  * Globals
  *****************************************************************************/

--- a/pidgin/gtkblist-theme-loader.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkblist-theme-loader.h	Fri Mar 29 04:48:49 2019 -0400
@@ -32,31 +32,7 @@
 #include <glib-object.h>
 #include "theme-loader.h"
 
-typedef struct _PidginBlistThemeLoader        PidginBlistThemeLoader;
-typedef struct _PidginBlistThemeLoaderClass   PidginBlistThemeLoaderClass;
-
-#define PIDGIN_TYPE_BLIST_THEME_LOADER            (pidgin_blist_theme_loader_get_type ())
-#define PIDGIN_BLIST_THEME_LOADER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoader))
-#define PIDGIN_BLIST_THEME_LOADER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass))
-#define PIDGIN_IS_BLIST_THEME_LOADER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER))
-#define PIDGIN_IS_BLIST_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME_LOADER))
-#define PIDGIN_BLIST_THEME_LOADER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME_LOADER, PidginBlistThemeLoaderClass))
-
-/**
- * PidginBlistThemeLoader:
- *
- * A pidgin buddy list theme loader. extends PurpleThemeLoader (theme-loader.h)
- * This is a class designed to build sound themes
- */
-struct _PidginBlistThemeLoader
-{
-	PurpleThemeLoader parent;
-};
-
-struct _PidginBlistThemeLoaderClass
-{
-	PurpleThemeLoaderClass parent_class;
-};
+#define PIDGIN_TYPE_BLIST_THEME_LOADER  pidgin_blist_theme_loader_get_type()
 
 /**************************************************************************/
 /* Buddy List Theme-Loader API                                            */
@@ -68,7 +44,8 @@
  *
  * Returns: The #GType for a blist theme loader.
  */
-GType pidgin_blist_theme_loader_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginBlistThemeLoader, pidgin_blist_theme_loader, PIDGIN,
+		BLIST_THEME_LOADER, PurpleThemeLoader)
 
 G_END_DECLS
 

--- a/pidgin/gtkblist-theme.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkblist-theme.c	Fri Mar 29 04:48:49 2019 -0400
@@ -29,6 +29,19 @@
  * Structs
  *****************************************************************************/
 
+/**
+ * PidginBlistTheme:
+ *
+ * A pidgin buddy list theme.
+ * This is an object for Purple to represent a buddy list theme.
+ *
+ * PidginBlistTheme is a PurpleTheme Object.
+ */
+struct _PidginBlistTheme
+{
+	PurpleTheme parent;
+};
+
 typedef struct {
 	/* Buddy list */
 	gdouble opacity;

--- a/pidgin/gtkblist-theme.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkblist-theme.h	Fri Mar 29 04:48:49 2019 -0400
@@ -34,38 +34,12 @@
 
 #include "theme.h"
 
-typedef struct _PidginBlistTheme        PidginBlistTheme;
-typedef struct _PidginBlistThemeClass   PidginBlistThemeClass;
-
 #define PIDGIN_TYPE_BLIST_THEME            (pidgin_blist_theme_get_type ())
-#define PIDGIN_BLIST_THEME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistTheme))
-#define PIDGIN_BLIST_THEME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass))
-#define PIDGIN_IS_BLIST_THEME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_BLIST_THEME))
-#define PIDGIN_IS_BLIST_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_BLIST_THEME))
-#define PIDGIN_BLIST_THEME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_BLIST_THEME, PidginBlistThemeClass))
 
 #define PIDGIN_TYPE_THEME_FONT             (pidgin_theme_font_get_type())
 
 #define PIDGIN_TYPE_BLIST_LAYOUT           (pidgin_blist_layout_get_type())
 
-/**
- * PidginBlistTheme:
- *
- * A pidgin buddy list theme.
- * This is an object for Purple to represent a buddy list theme.
- *
- * PidginBlistTheme is a PurpleTheme Object.
- */
-struct _PidginBlistTheme
-{
-	PurpleTheme parent;
-};
-
-struct _PidginBlistThemeClass
-{
-	PurpleThemeClass parent_class;
-};
-
 typedef struct _PidginThemeFont PidginThemeFont;
 
 typedef struct _PidginBlistLayout PidginBlistLayout;
@@ -170,7 +144,8 @@
  *
  * Returns: The #GType for a blist theme.
  */
-GType pidgin_blist_theme_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginBlistTheme, pidgin_blist_theme, PIDGIN, BLIST_THEME,
+		PurpleTheme)
 
 /**
  * pidgin_blist_layout_get_type:

--- a/pidgin/gtkconv-theme-loader.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkconv-theme-loader.c	Fri Mar 29 04:48:49 2019 -0400
@@ -28,6 +28,17 @@
 #include "debug.h"
 #include "prefs.h"
 
+/**
+ * PidginConvThemeLoader:
+ *
+ * A pidgin conversation theme loader. Extends PurpleThemeLoader (theme-loader.h)
+ * This is a class designed to build conversation themes
+ */
+struct _PidginConvThemeLoader
+{
+	PurpleThemeLoader parent;
+};
+
 /*****************************************************************************
  * Conversation Theme Builder
  *****************************************************************************/

--- a/pidgin/gtkconv-theme-loader.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkconv-theme-loader.h	Fri Mar 29 04:48:49 2019 -0400
@@ -32,31 +32,7 @@
 #include <glib-object.h>
 #include "theme-loader.h"
 
-typedef struct _PidginConvThemeLoader       PidginConvThemeLoader;
-typedef struct _PidginConvThemeLoaderClass  PidginConvThemeLoaderClass;
-
-#define PIDGIN_TYPE_CONV_THEME_LOADER            (pidgin_conversation_theme_loader_get_type ())
-#define PIDGIN_CONV_THEME_LOADER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_CONV_THEME_LOADER, PidginConvThemeLoader))
-#define PIDGIN_CONV_THEME_LOADER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_CONV_THEME_LOADER, PidginConvThemeLoaderClass))
-#define PIDGIN_IS_CONV_THEME_LOADER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_CONV_THEME_LOADER))
-#define PIDGIN_IS_CONV_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_CONV_THEME_LOADER))
-#define PIDGIN_CONV_THEME_LOADER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_CONV_THEME_LOADER, PidginConvThemeLoaderClass))
-
-/**
- * PidginConvThemeLoader:
- *
- * A pidgin conversation theme loader. Extends PurpleThemeLoader (theme-loader.h)
- * This is a class designed to build conversation themes
- */
-struct _PidginConvThemeLoader
-{
-	PurpleThemeLoader parent;
-};
-
-struct _PidginConvThemeLoaderClass
-{
-	PurpleThemeLoaderClass parent_class;
-};
+#define PIDGIN_TYPE_CONV_THEME_LOADER  pidgin_conversation_theme_loader_get_type()
 
 /**************************************************************************/
 /* Pidgin Conversation Theme-Loader API                                   */
@@ -68,7 +44,8 @@
  *
  * Returns: The #GType for a conversation theme loader.
  */
-GType pidgin_conversation_theme_loader_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginConvThemeLoader, pidgin_conversation_theme_loader,
+		PIDGIN, CONV_THEME_LOADER, PurpleThemeLoader)
 
 G_END_DECLS
 

--- a/pidgin/gtkconv-theme.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkconv-theme.c	Fri Mar 29 04:48:49 2019 -0400
@@ -40,6 +40,20 @@
  * Structs
  *****************************************************************************/
 
+/**
+ * PidginConvTheme:
+ *
+ * extends PurpleTheme (theme.h)
+ * A pidgin icon theme.
+ * This object represents a Pidgin icon theme.
+ *
+ * PidginConvTheme is a PurpleTheme Object.
+ */
+struct _PidginConvTheme
+{
+	PurpleTheme parent;
+};
+
 typedef struct {
 	/* current config options */
 	char     *variant; /* allowed to be NULL if there are no variants */

--- a/pidgin/gtkconv-theme.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkconv-theme.h	Fri Mar 29 04:48:49 2019 -0400
@@ -33,34 +33,7 @@
 #include "conversation.h"
 #include "theme.h"
 
-typedef struct _PidginConvTheme        PidginConvTheme;
-typedef struct _PidginConvThemeClass   PidginConvThemeClass;
-
-#define PIDGIN_TYPE_CONV_THEME            (pidgin_conversation_theme_get_type ())
-#define PIDGIN_CONV_THEME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_CONV_THEME, PidginConvTheme))
-#define PIDGIN_CONV_THEME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_CONV_THEME, PidginConvThemeClass))
-#define PIDGIN_IS_CONV_THEME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_CONV_THEME))
-#define PIDGIN_IS_CONV_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_CONV_THEME))
-#define PIDGIN_CONV_THEME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_CONV_THEME, PidginConvThemeClass))
-
-/**
- * PidginConvTheme:
- *
- * extends PurpleTheme (theme.h)
- * A pidgin icon theme.
- * This object represents a Pidgin icon theme.
- *
- * PidginConvTheme is a PurpleTheme Object.
- */
-struct _PidginConvTheme
-{
-	PurpleTheme parent;
-};
-
-struct _PidginConvThemeClass
-{
-	PurpleThemeClass parent_class;
-};
+#define PIDGIN_TYPE_CONV_THEME  pidgin_conversation_theme_get_type()
 
 typedef enum {
 	PIDGIN_CONVERSATION_THEME_TEMPLATE_MAIN,
@@ -91,7 +64,8 @@
  *
  * Returns: The #GType for a conversation theme.
  */
-GType pidgin_conversation_theme_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginConvTheme, pidgin_conversation_theme, PIDGIN,
+		CONV_THEME, PurpleTheme)
 
 /**
  * pidgin_conversation_theme_get_info:

--- a/pidgin/gtkicon-theme-loader.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkicon-theme-loader.c	Fri Mar 29 04:48:49 2019 -0400
@@ -26,6 +26,17 @@
 #include "xmlnode.h"
 #include "debug.h"
 
+/**
+ * PidginIconThemeLoader:
+ *
+ * A pidgin icon theme loader. Extends PurpleThemeLoader (theme-loader.h)
+ * This is a class designed to build icon themes
+ */
+struct _PidginIconThemeLoader
+{
+	PurpleThemeLoader parent;
+};
+
 /*****************************************************************************
  * Icon Theme Builder
  *****************************************************************************/

--- a/pidgin/gtkicon-theme-loader.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkicon-theme-loader.h	Fri Mar 29 04:48:49 2019 -0400
@@ -32,31 +32,7 @@
 #include <glib-object.h>
 #include "theme-loader.h"
 
-typedef struct _PidginIconThemeLoader       PidginIconThemeLoader;
-typedef struct _PidginIconThemeLoaderClass  PidginIconThemeLoaderClass;
-
-#define PIDGIN_TYPE_ICON_THEME_LOADER            (pidgin_icon_theme_loader_get_type ())
-#define PIDGIN_ICON_THEME_LOADER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoader))
-#define PIDGIN_ICON_THEME_LOADER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass))
-#define PIDGIN_IS_ICON_THEME_LOADER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME_LOADER))
-#define PIDGIN_IS_ICON_THEME_LOADER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME_LOADER))
-#define PIDGIN_ICON_THEME_LOADER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME_LOADER, PidginIconThemeLoaderClass))
-
-/**
- * PidginIconThemeLoader:
- *
- * A pidgin icon theme loader. Extends PurpleThemeLoader (theme-loader.h)
- * This is a class designed to build icon themes
- */
-struct _PidginIconThemeLoader
-{
-	PurpleThemeLoader parent;
-};
-
-struct _PidginIconThemeLoaderClass
-{
-	PurpleThemeLoaderClass parent_class;
-};
+#define PIDGIN_TYPE_ICON_THEME_LOADER  pidgin_icon_theme_loader_get_type()
 
 /**************************************************************************/
 /* Pidgin Icon Theme-Loader API                                           */
@@ -68,7 +44,8 @@
  *
  * Returns: The #GType for an icon theme loader.
  */
-GType pidgin_icon_theme_loader_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginIconThemeLoader, pidgin_icon_theme_loader, PIDGIN,
+		ICON_THEME_LOADER, PurpleThemeLoader)
 
 G_END_DECLS
 

--- a/pidgin/gtkicon-theme.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkicon-theme.h	Fri Mar 29 04:48:49 2019 -0400
@@ -32,29 +32,7 @@
 #include <glib-object.h>
 #include "theme.h"
 
-typedef struct _PidginIconTheme        PidginIconTheme;
-typedef struct _PidginIconThemeClass   PidginIconThemeClass;
-
-#define PIDGIN_TYPE_ICON_THEME            (pidgin_icon_theme_get_type ())
-#define PIDGIN_ICON_THEME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconTheme))
-#define PIDGIN_ICON_THEME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass))
-#define PIDGIN_IS_ICON_THEME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_ICON_THEME))
-#define PIDGIN_IS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_ICON_THEME))
-#define PIDGIN_ICON_THEME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_ICON_THEME, PidginIconThemeClass))
-
-/**
- * PidginIconTheme:
- *
- * extends PurpleTheme (theme.h)
- * A pidgin icon theme.
- * This object represents a Pidgin icon theme.
- *
- * PidginIconTheme is a PurpleTheme Object.
- */
-struct _PidginIconTheme
-{
-	PurpleTheme parent;
-};
+#define PIDGIN_TYPE_ICON_THEME  pidgin_icon_theme_get_type()
 
 struct _PidginIconThemeClass
 {
@@ -71,7 +49,8 @@
  *
  * Returns: The #GType for an icon theme.
  */
-GType pidgin_icon_theme_get_type(void);
+G_DECLARE_DERIVABLE_TYPE(PidginIconTheme, pidgin_icon_theme, PIDGIN,
+		ICON_THEME, PurpleTheme)
 
 /**
  * pidgin_icon_theme_get_icon:

--- a/pidgin/gtkstatus-icon-theme.c	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkstatus-icon-theme.c	Fri Mar 29 04:48:49 2019 -0400
@@ -22,6 +22,20 @@
 
 #include "gtkstatus-icon-theme.h"
 
+/**
+ * PidginStatusIconTheme:
+ *
+ * extends PidginIconTheme (gtkicon-theme.h)
+ * A pidgin status icon theme.
+ * This object represents a Pidgin status icon theme.
+ *
+ * PidginStatusIconTheme is a PidginIconTheme Object.
+ */
+struct _PidginStatusIconTheme
+{
+	PidginIconTheme parent;
+};
+
 /******************************************************************************
  * Globals
  *****************************************************************************/

--- a/pidgin/gtkstatus-icon-theme.h	Fri Mar 29 04:25:49 2019 -0400
+++ b/pidgin/gtkstatus-icon-theme.h	Fri Mar 29 04:48:49 2019 -0400
@@ -31,34 +31,7 @@
 #include <glib-object.h>
 #include "gtkicon-theme.h"
 
-typedef struct _PidginStatusIconTheme        PidginStatusIconTheme;
-typedef struct _PidginStatusIconThemeClass   PidginStatusIconThemeClass;
-
-#define PIDGIN_TYPE_STATUS_ICON_THEME            (pidgin_status_icon_theme_get_type ())
-#define PIDGIN_STATUS_ICON_THEME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconTheme))
-#define PIDGIN_STATUS_ICON_THEME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass))
-#define PIDGIN_IS_STATUS_ICON_THEME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PIDGIN_TYPE_STATUS_ICON_THEME))
-#define PIDGIN_IS_STATUS_ICON_THEME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PIDGIN_TYPE_STATUS_ICON_THEME))
-#define PIDGIN_STATUS_ICON_THEME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PIDGIN_TYPE_STATUS_ICON_THEME, PidginStatusIconThemeClass))
-
-/**
- * PidginStatusIconTheme:
- *
- * extends PidginIconTheme (gtkicon-theme.h)
- * A pidgin status icon theme.
- * This object represents a Pidgin status icon theme.
- *
- * PidginStatusIconTheme is a PidginIconTheme Object.
- */
-struct _PidginStatusIconTheme
-{
-	PidginIconTheme parent;
-};
-
-struct _PidginStatusIconThemeClass
-{
-	PidginIconThemeClass parent_class;
-};
+#define PIDGIN_TYPE_STATUS_ICON_THEME  pidgin_status_icon_theme_get_type()
 
 /**************************************************************************/
 /* Pidgin Status Icon Theme API                                           */
@@ -70,7 +43,8 @@
  *
  * Returns: The #GType for a status icon theme.
  */
-GType pidgin_status_icon_theme_get_type(void);
+G_DECLARE_FINAL_TYPE(PidginStatusIconTheme, pidgin_status_icon_theme, PIDGIN,
+		STATUS_ICON_THEME, PidginIconTheme)
 
 G_END_DECLS