diff options
| author | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-02-27 16:07:53 -0600 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-02-27 16:09:43 -0600 |
| commit | db8c20923637d1b70f860195230dc5861e3db17f (patch) | |
| tree | 587a179c767e801797e3dde4313cb7f1e2ee816d | |
| parent | 9986da997e9269ebe9cc7c9a20e9bfcc0bd6117a (diff) | |
| download | epiphany-db8c20923637d1b70f860195230dc5861e3db17f.tar.gz | |
link: Use G_DECLARE_INTERFACE
| -rw-r--r-- | src/ephy-link.c | 4 | ||||
| -rw-r--r-- | src/ephy-link.h | 14 | ||||
| -rw-r--r-- | src/ephy-window.c | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/src/ephy-link.c b/src/ephy-link.c index 585f3866d..8ae4978ed 100644 --- a/src/ephy-link.c +++ b/src/ephy-link.c @@ -56,7 +56,7 @@ ephy_link_base_init (gpointer g_class) ("open-link", EPHY_TYPE_LINK, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyLinkIface, open_link), + G_STRUCT_OFFSET (EphyLinkInterface, open_link), ephy_signal_accumulator_object, ephy_embed_get_type, g_cclosure_marshal_generic, GTK_TYPE_WIDGET /* Can't use an interface type here */, @@ -78,7 +78,7 @@ ephy_link_get_type (void) { const GTypeInfo our_info = { - sizeof (EphyLinkIface), + sizeof (EphyLinkInterface), ephy_link_base_init, NULL, }; diff --git a/src/ephy-link.h b/src/ephy-link.h index d09a3ccda..fd4c68d1e 100644 --- a/src/ephy-link.h +++ b/src/ephy-link.h @@ -25,15 +25,9 @@ G_BEGIN_DECLS -#define EPHY_TYPE_LINK (ephy_link_get_type ()) -#define EPHY_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_LINK, EphyLink)) -#define EPHY_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_LINK, EphyLinkIface)) -#define EPHY_IS_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_LINK)) -#define EPHY_IS_LINK_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_LINK)) -#define EPHY_LINK_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_LINK, EphyLinkIface)) +#define EPHY_TYPE_LINK (ephy_link_get_type ()) -typedef struct _EphyLink EphyLink; -typedef struct _EphyLinkIface EphyLinkIface; +G_DECLARE_INTERFACE (EphyLink, ephy_link, EPHY, LINK, GObject) typedef enum { @@ -46,7 +40,7 @@ typedef enum EPHY_LINK_BOOKMARK = 1 << 6 } EphyLinkFlags; -struct _EphyLinkIface +struct _EphyLinkInterface { GTypeInterface base_iface; @@ -57,8 +51,6 @@ struct _EphyLinkIface EphyLinkFlags flags); }; -GType ephy_link_get_type (void); - EphyEmbed *ephy_link_open (EphyLink *link, const char *address, EphyEmbed *embed, diff --git a/src/ephy-window.c b/src/ephy-window.c index a4c0c55a7..05fa4062e 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -621,7 +621,7 @@ ephy_window_open_link (EphyLink *link, } static void -ephy_window_link_iface_init (EphyLinkIface *iface) +ephy_window_link_iface_init (EphyLinkInterface *iface) { iface->open_link = ephy_window_open_link; } |