diff options
author | Crispin Flowerday <gnome@flowerday.cx> | 2006-01-18 02:54:32 +0800 |
---|---|---|
committer | Crispin Flowerday <crispin@src.gnome.org> | 2006-01-18 02:54:32 +0800 |
commit | f81cb08fcbb2efc28cfccfa3fd685ad9d8c0e377 (patch) | |
tree | 9bf35ea0a30bf7c1c5823e56bc084e7e2f9a5ada /embed | |
parent | ce161c639c50899f3b720e31a55397542e6a6a4c (diff) | |
download | gsoc2013-epiphany-f81cb08fcbb2efc28cfccfa3fd685ad9d8c0e377.tar.gz gsoc2013-epiphany-f81cb08fcbb2efc28cfccfa3fd685ad9d8c0e377.tar.zst gsoc2013-epiphany-f81cb08fcbb2efc28cfccfa3fd685ad9d8c0e377.zip |
Change the 'ephy_embed_event_get_property' function return a GValue*
2006-01-17 Crispin Flowerday <gnome@flowerday.cx>
* embed/ephy-embed-event.c: (ephy_embed_event_get_property):
* embed/ephy-embed-event.h:
* embed/mozilla/mozilla-embed-event.cpp:
* src/ephy-tab.c: (save_property_url),
(ephy_tab_dom_mouse_click_cb):
* src/ephy-window.c: (update_popups_tooltips), (show_embed_popup):
* src/epiphany.defs:
* src/epiphany.override:
* src/popup-commands.c: (popup_cmd_link_in_new_window),
(popup_cmd_link_in_new_tab), (popup_cmd_bookmark_link),
(popup_cmd_copy_link_address), (save_property_url),
(popup_cmd_open_link), (popup_cmd_set_image_as_background),
(popup_cmd_copy_image_location), (popup_cmd_open_image):
Change the 'ephy_embed_event_get_property' function
return a GValue* rather than taking a pointer to it as
an argument.
Diffstat (limited to 'embed')
-rw-r--r-- | embed/ephy-embed-event.c | 7 | ||||
-rw-r--r-- | embed/ephy-embed-event.h | 11 | ||||
-rw-r--r-- | embed/mozilla/mozilla-embed-event.cpp | 7 |
3 files changed, 10 insertions, 15 deletions
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c index 7a4ef6826..069a839d7 100644 --- a/embed/ephy-embed-event.c +++ b/embed/ephy-embed-event.c @@ -88,13 +88,12 @@ ephy_embed_event_get_coords (EphyEmbedEvent *event, iface->get_coordinates (event, x, y); } -void +const GValue* ephy_embed_event_get_property (EphyEmbedEvent *event, - const char *name, - const GValue **value) + const char *name) { EphyEmbedEventIface *iface = EPHY_EMBED_EVENT_GET_IFACE (event); - iface->get_property (event, name, value); + return iface->get_property (event, name); } gboolean diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h index 95d59d073..075a971b0 100644 --- a/embed/ephy-embed-event.h +++ b/embed/ephy-embed-event.h @@ -61,9 +61,8 @@ struct _EphyEmbedEventIface void (* get_coordinates) (EphyEmbedEvent *event, guint *x, guint *y); - void (* get_property) (EphyEmbedEvent *event, - const char *name, - const GValue **value); + const GValue* (* get_property) (EphyEmbedEvent *event, + const char *name); gboolean (* has_property) (EphyEmbedEvent *event, const char *name); gpointer (* get_dom_event) (EphyEmbedEvent *event); @@ -85,10 +84,8 @@ guint ephy_embed_event_get_modifier (EphyEmbedEvent *event); void ephy_embed_event_get_coords (EphyEmbedEvent *event, guint *x, guint *y); - -void ephy_embed_event_get_property (EphyEmbedEvent *event, - const char *name, - const GValue **value); +const GValue* ephy_embed_event_get_property (EphyEmbedEvent *event, + const char *name); gboolean ephy_embed_event_has_property (EphyEmbedEvent *event, const char *name); diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp index cbd2802d4..eae87d95c 100644 --- a/embed/mozilla/mozilla-embed-event.cpp +++ b/embed/mozilla/mozilla-embed-event.cpp @@ -140,12 +140,11 @@ impl_get_coordinates (EphyEmbedEvent *event, *y = ((MozillaEmbedEvent *) event)->y; } -static void +static const GValue* impl_get_property (EphyEmbedEvent *event, - const char *name, - const GValue **value) + const char *name) { - *value = (const GValue *) g_hash_table_lookup (((MozillaEmbedEvent *) event)->priv->props, name); + return (const GValue *) g_hash_table_lookup (((MozillaEmbedEvent *) event)->priv->props, name); } static gboolean |