diff options
| author | Vyas Giridharan <vyasgiridhar27@gmail.com> | 2017-08-22 20:41:44 +0530 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2017-08-22 18:22:08 +0300 |
| commit | 2660473c3c7cd7b3d9b9adf968d8960574f06694 (patch) | |
| tree | 10db776f9248d69be454ad65a9d5b52a7df4efb0 | |
| parent | aec60260e8ee77e9bc7de57c4a98b62cfb12c56d (diff) | |
| download | nautilus-2660473c3c7cd7b3d9b9adf968d8960574f06694.tar.gz | |
icon-info: ported declaration to G_DECLARE*
This patch ports declaration of NautilusIconInfo to
the G_DECLARE* format.
https://bugzilla.gnome.org/show_bug.cgi?id=771777
| -rw-r--r-- | src/nautilus-icon-info.c | 5 | ||||
| -rw-r--r-- | src/nautilus-icon-info.h | 15 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/nautilus-icon-info.c b/src/nautilus-icon-info.c index 854feb2f5..ad5a7f714 100644 --- a/src/nautilus-icon-info.c +++ b/src/nautilus-icon-info.c @@ -35,11 +35,6 @@ struct _NautilusIconInfo gint orig_scale; }; -struct _NautilusIconInfoClass -{ - GObjectClass parent_class; -}; - static void schedule_reap_cache (void); G_DEFINE_TYPE (NautilusIconInfo, diff --git a/src/nautilus-icon-info.h b/src/nautilus-icon-info.h index 592b534d3..505a7be0f 100644 --- a/src/nautilus-icon-info.h +++ b/src/nautilus-icon-info.h @@ -48,19 +48,8 @@ typedef enum { /* Maximum size of an icon that the icon factory will ever produce */ #define NAUTILUS_ICON_MAXIMUM_SIZE 320 -typedef struct _NautilusIconInfo NautilusIconInfo; -typedef struct _NautilusIconInfoClass NautilusIconInfoClass; - - -#define NAUTILUS_TYPE_ICON_INFO (nautilus_icon_info_get_type ()) -#define NAUTILUS_ICON_INFO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_ICON_INFO, NautilusIconInfo)) -#define NAUTILUS_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ICON_INFO, NautilusIconInfoClass)) -#define NAUTILUS_IS_ICON_INFO(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_ICON_INFO)) -#define NAUTILUS_IS_ICON_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ICON_INFO)) -#define NAUTILUS_ICON_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_ICON_INFO, NautilusIconInfoClass)) - - -GType nautilus_icon_info_get_type (void) G_GNUC_CONST; +#define NAUTILUS_TYPE_ICON_INFO (nautilus_icon_info_get_type ()) +G_DECLARE_FINAL_TYPE (NautilusIconInfo, nautilus_icon_info, NAUTILUS, ICON_INFO, GObject) NautilusIconInfo * nautilus_icon_info_new_for_pixbuf (GdkPixbuf *pixbuf, int scale); |