diff options
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-command-manager.c | 8 | ||||
-rw-r--r-- | embed/ephy-command-manager.h | 8 | ||||
-rw-r--r-- | embed/ephy-cookie-manager.c | 18 | ||||
-rw-r--r-- | embed/ephy-cookie-manager.h | 8 | ||||
-rw-r--r-- | embed/ephy-embed-event.c | 16 | ||||
-rw-r--r-- | embed/ephy-embed-event.h | 8 | ||||
-rw-r--r-- | embed/ephy-embed-single.c | 14 | ||||
-rw-r--r-- | embed/ephy-embed-single.h | 8 | ||||
-rw-r--r-- | embed/ephy-embed.c | 84 | ||||
-rw-r--r-- | embed/ephy-embed.h | 8 | ||||
-rw-r--r-- | embed/ephy-password-manager.c | 8 | ||||
-rw-r--r-- | embed/ephy-password-manager.h | 8 | ||||
-rw-r--r-- | embed/ephy-permission-manager.c | 20 | ||||
-rw-r--r-- | embed/ephy-permission-manager.h | 8 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-event.cpp | 4 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 16 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed.cpp | 6 |
17 files changed, 125 insertions, 125 deletions
diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c index 9a248e87e..2f9375d9e 100644 --- a/embed/ephy-command-manager.c +++ b/embed/ephy-command-manager.c @@ -36,7 +36,7 @@ ephy_command_manager_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyCommandManagerIFace), + sizeof (EphyCommandManagerIface), ephy_command_manager_base_init, NULL, }; @@ -60,7 +60,7 @@ ephy_command_manager_base_init (gpointer g_class) g_signal_new ("command_changed", EPHY_TYPE_COMMAND_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCommandManagerIFace, command_changed), + G_STRUCT_OFFSET (EphyCommandManagerIface, command_changed), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, @@ -75,7 +75,7 @@ void ephy_command_manager_do_command (EphyCommandManager *manager, const char *command) { - EphyCommandManagerIFace *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager); + EphyCommandManagerIface *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager); iface->do_command (manager, command); } @@ -83,6 +83,6 @@ gboolean ephy_command_manager_can_do_command (EphyCommandManager *manager, const char *command) { - EphyCommandManagerIFace *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager); + EphyCommandManagerIface *iface = EPHY_COMMAND_MANAGER_GET_IFACE (manager); return iface->can_do_command (manager, command); } diff --git a/embed/ephy-command-manager.h b/embed/ephy-command-manager.h index 78cd5835f..aee7004d3 100644 --- a/embed/ephy-command-manager.h +++ b/embed/ephy-command-manager.h @@ -28,15 +28,15 @@ G_BEGIN_DECLS #define EPHY_TYPE_COMMAND_MANAGER (ephy_command_manager_get_type ()) #define EPHY_COMMAND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManager)) -#define EPHY_COMMAND_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIFace)) +#define EPHY_COMMAND_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIface)) #define EPHY_IS_COMMAND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COMMAND_MANAGER)) #define EPHY_IS_COMMAND_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COMMAND_MANAGER)) -#define EPHY_COMMAND_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIFace)) +#define EPHY_COMMAND_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COMMAND_MANAGER, EphyCommandManagerIface)) typedef struct EphyCommandManager EphyCommandManager; -typedef struct EphyCommandManagerIFace EphyCommandManagerIFace; +typedef struct EphyCommandManagerIface EphyCommandManagerIface; -struct EphyCommandManagerIFace +struct EphyCommandManagerIface { GTypeInterface base_iface; diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c index c3d45dfad..fe0e26f83 100644 --- a/embed/ephy-cookie-manager.c +++ b/embed/ephy-cookie-manager.c @@ -109,7 +109,7 @@ ephy_cookie_manager_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyCookieManagerIFace), + sizeof (EphyCookieManagerIface), ephy_cookie_manager_base_init, NULL, }; @@ -140,7 +140,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) g_signal_new ("cookie-added", EPHY_TYPE_COOKIE_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCookieManagerIFace, added), + G_STRUCT_OFFSET (EphyCookieManagerIface, added), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -157,7 +157,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) g_signal_new ("cookie-changed", EPHY_TYPE_COOKIE_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCookieManagerIFace, changed), + G_STRUCT_OFFSET (EphyCookieManagerIface, changed), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -174,7 +174,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) g_signal_new ("cookie-deleted", EPHY_TYPE_COOKIE_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCookieManagerIFace, deleted), + G_STRUCT_OFFSET (EphyCookieManagerIface, deleted), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -191,7 +191,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) g_signal_new ("cookie-rejected", EPHY_TYPE_COOKIE_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCookieManagerIFace, rejected), + G_STRUCT_OFFSET (EphyCookieManagerIface, rejected), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, @@ -208,7 +208,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) g_signal_new ("cookies-cleared", EPHY_TYPE_COOKIE_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyCookieManagerIFace, cleared), + G_STRUCT_OFFSET (EphyCookieManagerIface, cleared), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, @@ -229,7 +229,7 @@ ephy_cookie_manager_base_init (gpointer base_iface) GList * ephy_cookie_manager_list_cookies (EphyCookieManager *manager) { - EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); + EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); return iface->list (manager); } @@ -244,7 +244,7 @@ void ephy_cookie_manager_remove_cookie (EphyCookieManager *manager, const EphyCookie *cookie) { - EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); + EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); iface->remove (manager, cookie); } @@ -257,6 +257,6 @@ ephy_cookie_manager_remove_cookie (EphyCookieManager *manager, void ephy_cookie_manager_clear (EphyCookieManager *manager) { - EphyCookieManagerIFace *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); + EphyCookieManagerIface *iface = EPHY_COOKIE_MANAGER_GET_IFACE (manager); iface->clear (manager); } diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h index d07e85638..069ad0a6a 100644 --- a/embed/ephy-cookie-manager.h +++ b/embed/ephy-cookie-manager.h @@ -29,15 +29,15 @@ G_BEGIN_DECLS #define EPHY_TYPE_COOKIE_MANAGER (ephy_cookie_manager_get_type ()) #define EPHY_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManager)) -#define EPHY_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIFace)) +#define EPHY_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface)) #define EPHY_IS_COOKIE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_COOKIE_MANAGER)) #define EPHY_IS_COOKIE_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COOKIE_MANAGER)) -#define EPHY_COOKIE_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIFace)) +#define EPHY_COOKIE_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_COOKIE_MANAGER, EphyCookieManagerIface)) #define EPHY_TYPE_COOKIE (ephy_cookie_get_type ()) typedef struct EphyCookieManager EphyCookieManager; -typedef struct EphyCookieManagerIFace EphyCookieManagerIFace; +typedef struct EphyCookieManagerIface EphyCookieManagerIface; typedef enum { @@ -72,7 +72,7 @@ typedef struct guint p3p_policy : 3; } EphyCookie; -struct EphyCookieManagerIFace +struct EphyCookieManagerIface { GTypeInterface base_iface; diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c index 1271e29ed..6cd698d36 100644 --- a/embed/ephy-embed-event.c +++ b/embed/ephy-embed-event.c @@ -41,7 +41,7 @@ ephy_embed_event_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyEmbedEventIFace), + sizeof (EphyEmbedEventIface), ephy_embed_event_base_init, NULL, }; @@ -66,21 +66,21 @@ ephy_embed_event_base_init (gpointer g_class) EphyEmbedEventType ephy_embed_event_get_event_type (EphyEmbedEvent *event) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); return iface->get_type (event); } EmbedEventContext ephy_embed_event_get_context (EphyEmbedEvent *event) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); return iface->get_context (event); } guint ephy_embed_event_get_modifier (EphyEmbedEvent *event) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); return iface->get_modifier (event); } @@ -88,7 +88,7 @@ void ephy_embed_event_get_coords (EphyEmbedEvent *event, guint *x, guint *y) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); iface->get_coordinates (event, x, y); } @@ -97,7 +97,7 @@ ephy_embed_event_get_property (EphyEmbedEvent *event, const char *name, const GValue **value) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); iface->get_property (event, name, value); } @@ -105,13 +105,13 @@ gboolean ephy_embed_event_has_property (EphyEmbedEvent *event, const char *name) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); return iface->has_property (event, name); } gpointer ephy_embed_event_get_dom_event (EphyEmbedEvent *event) { - EphyEmbedEventIFace *iface = EPHY_EMBED_EVENT_GET_IFACE (event); + EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); return iface->get_dom_event (event); } diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h index 0cd3c58c6..d8790fad9 100644 --- a/embed/ephy-embed-event.h +++ b/embed/ephy-embed-event.h @@ -29,12 +29,12 @@ G_BEGIN_DECLS #define EPHY_TYPE_EMBED_EVENT (ephy_embed_event_get_type ()) #define EPHY_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_EVENT, EphyEmbedEvent)) -#define EPHY_EMBED_EVENT_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_EVENT, EphyEmbedEventIFace)) +#define EPHY_EMBED_EVENT_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_EVENT, EphyEmbedEventIface)) #define EPHY_IS_EMBED_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_EVENT)) #define EPHY_IS_EMBED_EVENT_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_EVENT)) -#define EPHY_EMBED_EVENT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED_EVENT, EphyEmbedEventIFace)) +#define EPHY_EMBED_EVENT_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED_EVENT, EphyEmbedEventIface)) -typedef struct EphyEmbedEventIFace EphyEmbedEventIFace; +typedef struct EphyEmbedEventIface EphyEmbedEventIface; typedef struct EphyEmbedEvent EphyEmbedEvent; typedef enum @@ -57,7 +57,7 @@ typedef enum EPHY_EMBED_EVENT_KEY } EphyEmbedEventType; -struct EphyEmbedEventIFace +struct EphyEmbedEventIface { GTypeInterface parent_iface; diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 20e6a4f5d..c0303af7c 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -36,7 +36,7 @@ ephy_embed_single_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyEmbedSingleIFace), + sizeof (EphyEmbedSingleIface), ephy_embed_single_iface_init, NULL, }; @@ -71,7 +71,7 @@ ephy_embed_single_iface_init (gpointer g_class) g_signal_new ("handle_content", EPHY_TYPE_EMBED_SINGLE, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedSingleIFace, handle_content), + G_STRUCT_OFFSET (EphyEmbedSingleIface, handle_content), g_signal_accumulator_true_handled, NULL, ephy_marshal_BOOLEAN__STRING_STRING, G_TYPE_BOOLEAN, @@ -92,7 +92,7 @@ ephy_embed_single_iface_init (gpointer g_class) void ephy_embed_single_clear_cache (EphyEmbedSingle *single) { - EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); + EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); iface->clear_cache (single); } @@ -105,7 +105,7 @@ ephy_embed_single_clear_cache (EphyEmbedSingle *single) void ephy_embed_single_clear_auth_cache (EphyEmbedSingle *single) { - EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); + EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); iface->clear_auth_cache (single); } @@ -120,7 +120,7 @@ void ephy_embed_single_set_offline_mode (EphyEmbedSingle *single, gboolean offline) { - EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); + EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); iface->set_offline_mode (single, offline); } @@ -135,7 +135,7 @@ void ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *single, const char* address) { - EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); + EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); iface->load_proxy_autoconf (single, address); } @@ -153,6 +153,6 @@ GList * ephy_embed_single_get_font_list (EphyEmbedSingle *single, const char *langGroup) { - EphyEmbedSingleIFace *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); + EphyEmbedSingleIface *iface = EPHY_EMBED_SINGLE_GET_IFACE (single); return iface->get_font_list (single, langGroup); } diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h index e5457aa5a..f9db7cfb9 100644 --- a/embed/ephy-embed-single.h +++ b/embed/ephy-embed-single.h @@ -28,15 +28,15 @@ G_BEGIN_DECLS #define EPHY_TYPE_EMBED_SINGLE (ephy_embed_single_get_type ()) #define EPHY_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingle)) -#define EPHY_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIFace)) +#define EPHY_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) #define EPHY_IS_EMBED_SINGLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED_SINGLE)) #define EPHY_IS_EMBED_SINGLE_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_SINGLE)) -#define EPHY_EMBED_SINGLE_GET_IFACE(i) (G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIFace)) +#define EPHY_EMBED_SINGLE_GET_IFACE(i) (G_TYPE_INSTANCE_GET_INTERFACE ((i), EPHY_TYPE_EMBED_SINGLE, EphyEmbedSingleIface)) typedef struct EphyEmbedSingle EphyEmbedSingle; -typedef struct EphyEmbedSingleIFace EphyEmbedSingleIFace; +typedef struct EphyEmbedSingleIface EphyEmbedSingleIface; -struct EphyEmbedSingleIFace +struct EphyEmbedSingleIface { GTypeInterface base_iface; diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c index 186f3ef5b..f371cfc15 100644 --- a/embed/ephy-embed.c +++ b/embed/ephy-embed.c @@ -39,7 +39,7 @@ ephy_embed_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyEmbedIFace), + sizeof (EphyEmbedIface), ephy_embed_base_init, NULL, }; @@ -63,7 +63,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_new_window", EPHY_TYPE_EMBED, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyEmbedIFace, new_window), + G_STRUCT_OFFSET (EphyEmbedIface, new_window), NULL, NULL, ephy_marshal_VOID__POINTER_INT, G_TYPE_NONE, @@ -73,7 +73,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_context_menu", EPHY_TYPE_EMBED, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedIFace, context_menu), + G_STRUCT_OFFSET (EphyEmbedIface, context_menu), g_signal_accumulator_true_handled, NULL, ephy_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, @@ -82,7 +82,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_favicon", EPHY_TYPE_EMBED, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyEmbedIFace, favicon), + G_STRUCT_OFFSET (EphyEmbedIface, favicon), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, @@ -91,7 +91,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_location", EPHY_TYPE_EMBED, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyEmbedIFace, location), + G_STRUCT_OFFSET (EphyEmbedIface, location), NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, @@ -100,7 +100,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_net_state", EPHY_TYPE_EMBED, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyEmbedIFace, net_state), + G_STRUCT_OFFSET (EphyEmbedIface, net_state), NULL, NULL, ephy_marshal_VOID__STRING_INT, G_TYPE_NONE, @@ -110,7 +110,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_dom_mouse_click", EPHY_TYPE_EMBED, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedIFace, dom_mouse_click), + G_STRUCT_OFFSET (EphyEmbedIface, dom_mouse_click), g_signal_accumulator_true_handled, NULL, ephy_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, @@ -119,7 +119,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_dom_mouse_down", EPHY_TYPE_EMBED, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedIFace, dom_mouse_down), + G_STRUCT_OFFSET (EphyEmbedIface, dom_mouse_down), g_signal_accumulator_true_handled, NULL, ephy_marshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, @@ -128,7 +128,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_popup_blocked", EPHY_TYPE_EMBED, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyEmbedIFace, popup_blocked), + G_STRUCT_OFFSET (EphyEmbedIface, popup_blocked), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, @@ -136,7 +136,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_security_change", EPHY_TYPE_EMBED, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedIFace, security_change), + G_STRUCT_OFFSET (EphyEmbedIface, security_change), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, @@ -145,7 +145,7 @@ ephy_embed_base_init (gpointer g_class) g_signal_new ("ge_zoom_change", EPHY_TYPE_EMBED, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedIFace, zoom_change), + G_STRUCT_OFFSET (EphyEmbedIface, zoom_change), NULL, NULL, g_cclosure_marshal_VOID__FLOAT, G_TYPE_NONE, @@ -160,63 +160,63 @@ void ephy_embed_load_url (EphyEmbed *embed, const char *url) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->load_url (embed, url); } void ephy_embed_stop_load (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->stop_load (embed); } gboolean ephy_embed_can_go_back (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->can_go_back (embed); } gboolean ephy_embed_can_go_forward (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->can_go_forward (embed); } gboolean ephy_embed_can_go_up (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->can_go_up (embed); } GSList * ephy_embed_get_go_up_list (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_go_up_list (embed); } void ephy_embed_go_back (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->go_back (embed); } void ephy_embed_go_forward (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->go_forward (embed); } void ephy_embed_go_up (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->go_up (embed); } @@ -224,7 +224,7 @@ ephy_embed_go_up (EphyEmbed *embed) char * ephy_embed_get_title (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_title (embed); } @@ -232,21 +232,21 @@ char * ephy_embed_get_location (EphyEmbed *embed, gboolean toplevel) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_location (embed, toplevel); } char * ephy_embed_get_link_message (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_link_message (embed); } char * ephy_embed_get_js_status (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_js_status (embed); } @@ -254,7 +254,7 @@ void ephy_embed_reload (EphyEmbed *embed, EmbedReloadFlags flags) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->reload (embed, flags); } @@ -263,21 +263,21 @@ ephy_embed_zoom_set (EphyEmbed *embed, float zoom, gboolean reflow) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->zoom_set (embed, zoom, reflow); } float ephy_embed_zoom_get (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->zoom_get (embed); } int ephy_embed_shistory_n_items (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->shistory_n_items (embed); } @@ -288,14 +288,14 @@ ephy_embed_shistory_get_nth (EphyEmbed *embed, char **url, char **title) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->shistory_get_nth (embed, nth, is_relative, url, title); } int ephy_embed_shistory_get_pos (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->shistory_get_pos (embed); } @@ -303,7 +303,7 @@ void ephy_embed_shistory_go_nth (EphyEmbed *embed, int nth) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->shistory_go_nth (embed, nth); } @@ -312,7 +312,7 @@ ephy_embed_get_security_level (EphyEmbed *embed, EmbedSecurityLevel *level, char **description) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->get_security_level (embed, level, description); } @@ -322,7 +322,7 @@ ephy_embed_find_set_properties (EphyEmbed *embed, gboolean case_sensitive, gboolean match_word) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->find_set_properties (embed, search_string, case_sensitive, match_word); } @@ -330,14 +330,14 @@ gboolean ephy_embed_find_next (EphyEmbed *embed, gboolean backwards) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->find_next (embed, backwards); } void ephy_embed_activate (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->activate (embed); } @@ -345,14 +345,14 @@ void ephy_embed_set_encoding (EphyEmbed *embed, const char *encoding) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->set_encoding (embed, encoding); } EphyEncodingInfo * ephy_embed_get_encoding_info (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->get_encoding_info (embed); } @@ -360,21 +360,21 @@ void ephy_embed_print (EphyEmbed *embed, EmbedPrintInfo *info) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->print (embed, info); } void ephy_embed_print_preview_close (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); iface->print_preview_close (embed); } int ephy_embed_print_preview_n_pages (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->print_preview_n_pages (embed); } @@ -383,13 +383,13 @@ ephy_embed_print_preview_navigate (EphyEmbed *embed, EmbedPrintPreviewNavType type, int page) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->print_preview_navigate (embed, type, page); } gboolean ephy_embed_has_modified_forms (EphyEmbed *embed) { - EphyEmbedIFace *iface = EPHY_EMBED_GET_IFACE (embed); + EphyEmbedIface *iface = EPHY_EMBED_GET_IFACE (embed); return iface->has_modified_forms (embed); } diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h index e41e9f5e6..f7e3bcfd4 100644 --- a/embed/ephy-embed.h +++ b/embed/ephy-embed.h @@ -32,13 +32,13 @@ G_BEGIN_DECLS #define EPHY_TYPE_EMBED (ephy_embed_get_type ()) #define EPHY_EMBED(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_EMBED, EphyEmbed)) -#define EPHY_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED, EphyEmbedIFace)) +#define EPHY_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_EMBED, EphyEmbedIface)) #define EPHY_IS_EMBED(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_EMBED)) #define EPHY_IS_EMBED_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED)) -#define EPHY_EMBED_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIFace)) +#define EPHY_EMBED_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_EMBED, EphyEmbedIface)) typedef struct EphyEmbed EphyEmbed; -typedef struct EphyEmbedIFace EphyEmbedIFace; +typedef struct EphyEmbedIface EphyEmbedIface; typedef enum { @@ -135,7 +135,7 @@ typedef enum STATE_IS_SECURE_HIGH } EmbedSecurityLevel; -struct EphyEmbedIFace +struct EphyEmbedIface { GTypeInterface base_iface; diff --git a/embed/ephy-password-manager.c b/embed/ephy-password-manager.c index 14de93d79..b1b4a5b02 100644 --- a/embed/ephy-password-manager.c +++ b/embed/ephy-password-manager.c @@ -115,7 +115,7 @@ ephy_password_manager_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyPasswordManagerIFace), + sizeof (EphyPasswordManagerIface), NULL, NULL, }; @@ -140,7 +140,7 @@ void ephy_password_manager_add (EphyPasswordManager *manager, EphyPasswordInfo *info) { - EphyPasswordManagerIFace *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); + EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); iface->add (manager, info); } @@ -155,7 +155,7 @@ void ephy_password_manager_remove (EphyPasswordManager *manager, EphyPasswordInfo *info) { - EphyPasswordManagerIFace *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); + EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); iface->remove (manager, info); } @@ -170,6 +170,6 @@ ephy_password_manager_remove (EphyPasswordManager *manager, GList * ephy_password_manager_list (EphyPasswordManager *manager) { - EphyPasswordManagerIFace *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); + EphyPasswordManagerIface *iface = EPHY_PASSWORD_MANAGER_GET_IFACE (manager); return iface->list (manager); } diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h index 5cb141f0f..1d0d5c0f4 100644 --- a/embed/ephy-password-manager.h +++ b/embed/ephy-password-manager.h @@ -29,15 +29,15 @@ G_BEGIN_DECLS #define EPHY_TYPE_PASSWORD_MANAGER (ephy_password_manager_get_type ()) #define EPHY_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManager)) -#define EPHY_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIFace)) +#define EPHY_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) #define EPHY_IS_PASSWORD_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PASSWORD_MANAGER)) #define EPHY_IS_PASSWORD_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PASSWORD_MANAGER)) -#define EPHY_PASSWORD_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIFace)) +#define EPHY_PASSWORD_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PASSWORD_MANAGER, EphyPasswordManagerIface)) #define EPHY_TYPE_PASSWORD_INFO (ephy_password_info_get_type ()) typedef struct EphyPasswordManager EphyPasswordManager; -typedef struct EphyPasswordManagerIFace EphyPasswordManagerIFace; +typedef struct EphyPasswordManagerIface EphyPasswordManagerIface; typedef struct { @@ -46,7 +46,7 @@ typedef struct char *password; } EphyPasswordInfo; -struct EphyPasswordManagerIFace +struct EphyPasswordManagerIface { GTypeInterface base_iface; diff --git a/embed/ephy-permission-manager.c b/embed/ephy-permission-manager.c index 22add0d0b..6a4eb76c5 100644 --- a/embed/ephy-permission-manager.c +++ b/embed/ephy-permission-manager.c @@ -113,7 +113,7 @@ ephy_permission_manager_get_type (void) { static const GTypeInfo our_info = { - sizeof (EphyPermissionManagerIFace), + sizeof (EphyPermissionManagerIface), ephy_permission_manager_base_init, NULL, }; @@ -145,7 +145,7 @@ ephy_permission_manager_base_init (gpointer g_class) g_signal_new ("permission-added", EPHY_TYPE_PERMISSION_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyPermissionManagerIFace, added), + G_STRUCT_OFFSET (EphyPermissionManagerIface, added), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -163,7 +163,7 @@ ephy_permission_manager_base_init (gpointer g_class) g_signal_new ("permission-changed", EPHY_TYPE_PERMISSION_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyPermissionManagerIFace, changed), + G_STRUCT_OFFSET (EphyPermissionManagerIface, changed), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -181,7 +181,7 @@ ephy_permission_manager_base_init (gpointer g_class) g_signal_new ("permission-deleted", EPHY_TYPE_PERMISSION_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyPermissionManagerIFace, deleted), + G_STRUCT_OFFSET (EphyPermissionManagerIface, deleted), NULL, NULL, g_cclosure_marshal_VOID__BOXED, G_TYPE_NONE, @@ -198,7 +198,7 @@ ephy_permission_manager_base_init (gpointer g_class) g_signal_new ("permissions-cleared", EPHY_TYPE_PERMISSION_MANAGER, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EphyPermissionManagerIFace, cleared), + G_STRUCT_OFFSET (EphyPermissionManagerIface, cleared), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, @@ -224,7 +224,7 @@ ephy_permission_manager_add (EphyPermissionManager *manager, EphyPermissionType type, EphyPermission permission) { - EphyPermissionManagerIFace *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); + EphyPermissionManagerIface *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); iface->add (manager, host, type, permission); } @@ -242,7 +242,7 @@ ephy_permission_manager_remove (EphyPermissionManager *manager, const char *host, EphyPermissionType type) { - EphyPermissionManagerIFace *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); + EphyPermissionManagerIface *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); iface->remove (manager, host, type); } @@ -255,7 +255,7 @@ ephy_permission_manager_remove (EphyPermissionManager *manager, void ephy_permission_manager_clear (EphyPermissionManager *manager) { - EphyPermissionManagerIFace *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); + EphyPermissionManagerIface *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); iface->clear (manager); } @@ -275,7 +275,7 @@ ephy_permission_manager_test (EphyPermissionManager *manager, const char *host, EphyPermissionType type) { - EphyPermissionManagerIFace *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); + EphyPermissionManagerIface *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); return iface->test (manager, host, type); } @@ -293,6 +293,6 @@ GList * ephy_permission_manager_list (EphyPermissionManager *manager, EphyPermissionType type) { - EphyPermissionManagerIFace *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); + EphyPermissionManagerIface *iface = EPHY_PERMISSION_MANAGER_GET_IFACE (manager); return iface->list (manager, type); } diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h index 40f9e295c..0be7fbdee 100644 --- a/embed/ephy-permission-manager.h +++ b/embed/ephy-permission-manager.h @@ -29,15 +29,15 @@ G_BEGIN_DECLS #define EPHY_TYPE_PERMISSION_MANAGER (ephy_permission_manager_get_type ()) #define EPHY_PERMISSION_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManager)) -#define EPHY_PERMISSION_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIFace)) +#define EPHY_PERMISSION_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_CAST((k), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIface)) #define EPHY_IS_PERMISSION_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), EPHY_TYPE_PERMISSION_MANAGER)) #define EPHY_IS_PERMISSION_MANAGER_IFACE(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_PERMISSION_MANAGER)) -#define EPHY_PERMISSION_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIFace)) +#define EPHY_PERMISSION_MANAGER_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), EPHY_TYPE_PERMISSION_MANAGER, EphyPermissionManagerIface)) #define EPHY_TYPE_PERMISSION_INFO (ephy_permission_info_get_type ()) typedef struct EphyPermissionManager EphyPermissionManager; -typedef struct EphyPermissionManagerIFace EphyPermissionManagerIFace; +typedef struct EphyPermissionManagerIface EphyPermissionManagerIface; typedef enum { @@ -60,7 +60,7 @@ typedef struct EphyPermission permission; } EphyPermissionInfo; -struct EphyPermissionManagerIFace +struct EphyPermissionManagerIface { GTypeInterface base_iface; diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp index 9300457a9..0454ac3f2 100644 --- a/embed/mozilla/mozilla-embed-event.cpp +++ b/embed/mozilla/mozilla-embed-event.cpp @@ -37,7 +37,7 @@ struct MozillaEmbedEventPrivate static void mozilla_embed_event_class_init (MozillaEmbedEventClass *klass); static void mozilla_embed_event_init (MozillaEmbedEvent *event); -static void ephy_embed_event_iface_init (EphyEmbedEventIFace *iface); +static void ephy_embed_event_iface_init (EphyEmbedEventIface *iface); static GObjectClass *parent_class = NULL; @@ -184,7 +184,7 @@ mozilla_embed_event_finalize (GObject *object) } static void -ephy_embed_event_iface_init (EphyEmbedEventIFace *iface) +ephy_embed_event_iface_init (EphyEmbedEventIface *iface) { iface->get_type = impl_get_type; iface->get_context = impl_get_context; diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index ef801f393..055f5ff80 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -99,10 +99,10 @@ struct MozillaEmbedSinglePrivate }; static void mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass); -static void ephy_embed_single_iface_init (EphyEmbedSingleIFace *iface); -static void ephy_cookie_manager_iface_init (EphyCookieManagerIFace *iface); -static void ephy_password_manager_iface_init (EphyPasswordManagerIFace *iface); -static void ephy_permission_manager_iface_init (EphyPermissionManagerIFace *iface); +static void ephy_embed_single_iface_init (EphyEmbedSingleIface *iface); +static void ephy_cookie_manager_iface_init (EphyCookieManagerIface *iface); +static void ephy_password_manager_iface_init (EphyPasswordManagerIface *iface); +static void ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface); static void mozilla_embed_single_init (MozillaEmbedSingle *ges); static GObjectClass *parent_class = NULL; @@ -877,7 +877,7 @@ mozilla_embed_single_class_init (MozillaEmbedSingleClass *klass) } static void -ephy_embed_single_iface_init (EphyEmbedSingleIFace *iface) +ephy_embed_single_iface_init (EphyEmbedSingleIface *iface) { iface->clear_cache = impl_clear_cache; iface->clear_auth_cache = impl_clear_auth_cache; @@ -887,7 +887,7 @@ ephy_embed_single_iface_init (EphyEmbedSingleIFace *iface) } static void -ephy_cookie_manager_iface_init (EphyCookieManagerIFace *iface) +ephy_cookie_manager_iface_init (EphyCookieManagerIface *iface) { iface->list = impl_list_cookies; iface->remove = impl_remove_cookie; @@ -895,7 +895,7 @@ ephy_cookie_manager_iface_init (EphyCookieManagerIFace *iface) } static void -ephy_password_manager_iface_init (EphyPasswordManagerIFace *iface) +ephy_password_manager_iface_init (EphyPasswordManagerIface *iface) { iface->add = NULL; /* not implemented yet */ iface->remove = impl_remove_password; @@ -903,7 +903,7 @@ ephy_password_manager_iface_init (EphyPasswordManagerIFace *iface) } static void -ephy_permission_manager_iface_init (EphyPermissionManagerIFace *iface) +ephy_permission_manager_iface_init (EphyPermissionManagerIface *iface) { iface->add = impl_permission_manager_add; iface->remove = impl_permission_manager_remove; diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp index accd424a9..fda58e858 100644 --- a/embed/mozilla/mozilla-embed.cpp +++ b/embed/mozilla/mozilla-embed.cpp @@ -44,7 +44,7 @@ static void mozilla_embed_class_init (MozillaEmbedClass *klass); static void mozilla_embed_init (MozillaEmbed *gs); static void mozilla_embed_destroy (GtkObject *object); -static void ephy_embed_iface_init (EphyEmbedIFace *iface); +static void ephy_embed_iface_init (EphyEmbedIface *iface); static void mozilla_embed_connect_signals (MozillaEmbed *membed); static void mozilla_embed_location_changed_cb (GtkMozEmbed *embed, @@ -110,7 +110,7 @@ impl_manager_can_do_command (EphyCommandManager *manager, } static void -ephy_command_manager_iface_init (EphyCommandManagerIFace *iface) +ephy_command_manager_iface_init (EphyCommandManagerIface *iface) { iface->do_command = impl_manager_do_command; iface->can_do_command = impl_manager_can_do_command; @@ -1068,7 +1068,7 @@ mozilla_embed_security_level (MozillaEmbed *membed) } static void -ephy_embed_iface_init (EphyEmbedIFace *iface) +ephy_embed_iface_init (EphyEmbedIface *iface) { iface->load_url = impl_load_url; iface->stop_load = impl_stop_load; |