Get rid of gresult type. Use return values instead of out-parameters

2003-11-05  Christian Persch  <chpe@cvs.gnome.org>

	* embed/Makefile.am:
	* embed/ephy-command-manager.c: (ephy_command_manager_do_command),
	(ephy_command_manager_get_command_state):
	* embed/ephy-command-manager.h:
	* embed/ephy-embed-event.c: (ephy_embed_event_get_type),
	(ephy_embed_event_class_init), (ephy_embed_event_init),
	(ephy_embed_event_finalize), (ephy_embed_event_new),
	(ephy_embed_event_get_event_type), (ephy_embed_event_get_coords),
	(ephy_embed_event_get_context), (ephy_embed_event_set_property):
	* embed/ephy-embed-event.h:
	* embed/ephy-embed-persist.c: (ephy_embed_persist_cancel):
	* embed/ephy-embed-persist.h:
	* embed/ephy-embed-popup-control.c:
	(ephy_embed_popup_control_set_event),
	(embed_popup_copy_location_cmd), (embed_popup_save_page_as_cmd),
	(embed_popup_open_frame_cmd):
	* embed/ephy-embed-single.c: (ephy_embed_single_get_type),
	(ephy_embed_single_class_init), (ephy_embed_single_clear_cache),
	(ephy_embed_single_set_offline_mode),
	(ephy_embed_single_load_proxy_autoconf),
	(ephy_embed_single_get_font_list),
	(ephy_embed_single_list_cookies),
	(ephy_embed_single_remove_cookies),
	(ephy_embed_single_list_passwords),
	(ephy_embed_single_remove_passwords),
	(ephy_embed_single_free_cookies),
	(ephy_embed_single_free_passwords):
	* embed/ephy-embed-single.h:
	* embed/ephy-embed-types.h:
	* embed/ephy-embed.c: (ephy_embed_get_type),
	(ephy_embed_base_init), (ephy_embed_new), (ephy_embed_load_url),
	(ephy_embed_stop_load), (ephy_embed_can_go_back),
	(ephy_embed_can_go_forward), (ephy_embed_can_go_up),
	(ephy_embed_get_go_up_list), (ephy_embed_go_back),
	(ephy_embed_go_forward), (ephy_embed_go_up),
	(ephy_embed_get_title), (ephy_embed_get_location),
	(ephy_embed_reload), (ephy_embed_zoom_set), (ephy_embed_zoom_get),
	(ephy_embed_shistory_n_items), (ephy_embed_shistory_get_nth),
	(ephy_embed_shistory_get_pos), (ephy_embed_shistory_go_nth),
	(ephy_embed_get_security_level), (ephy_embed_find_set_properties),
	(ephy_embed_find_next), (ephy_embed_activate),
	(ephy_embed_set_encoding), (ephy_embed_get_encoding_info),
	(ephy_embed_print), (ephy_embed_print_preview_close),
	(ephy_embed_print_preview_n_pages),
	(ephy_embed_print_preview_navigate):
	* embed/ephy-embed.h:
	* embed/ephy-history.c:
	* embed/find-dialog.c: (find_dialog_go_next),
	(find_dialog_go_prev):
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-embed.cpp:
	* embed/mozilla/mozilla-embed.h:
	* lib/Makefile.am:
	* lib/ephy-state.c:
	* lib/ephy-types.h:
	* src/ephy-encoding-dialog.c: (sync_embed_cb), (activate_choice):
	* src/ephy-encoding-menu.c: (update_encoding_menu_cb),
	(encoding_activate_cb):
	* src/ephy-favicon-action.c: (each_url_get_data_binder):
	* src/ephy-nautilus-view.c: (gnv_embed_dom_mouse_click_cb),
	(gnv_embed_context_menu_cb), (gnv_embed_title_cb),
	(gnv_popup_cmd_frame_in_new_window), (gnv_zoomable_zoom_in_cb),
	(gnv_zoomable_zoom_out_cb):
	* src/ephy-navigation-action.c: (activate_up_menu_item_cb),
	(setup_back_or_forward_menu), (setup_up_menu):
	* src/ephy-tab.c: (ephy_tab_address_cb),
	(ephy_tab_zoom_changed_cb), (ephy_tab_title_cb),
	(ephy_tab_dom_mouse_click_cb), (ephy_tab_update_navigation_flags),
	(ephy_tab_set_title):
	* src/ephy-window.c: (edit_menu_show_cb), (sync_tab_security),
	(show_embed_popup), (ephy_window_set_zoom):
	* src/pdm-dialog.c: (pdm_dialog_init):
	* src/popup-commands.c: (popup_cmd_frame_in_new_tab),
	(popup_cmd_frame_in_new_window), (popup_cmd_open_frame):
	* src/ppview-toolbar.c: (toolbar_update_sensitivity),
	(toolbar_cmd_ppv_goto_last), (clamp_page_limits):
	* src/prefs-dialog.c: (setup_font_menu),
	(prefs_homepage_current_button_clicked_cb):
	* src/session.c: (save_tab):
	* src/window-commands.c: (window_cmd_file_send_to),
	(window_cmd_file_bookmark_page), (window_cmd_view_page_source):

	Get rid of gresult type. Use return values instead of out-parameters
	whereever possible, and port all callers.

1 files changed, 233 insertions, 295 deletions

diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index a988f9732..516d6c6d6 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2000, 2001, 2002 Marco Pesenti Gritti
+ *  Copyright (C) 2000-2003 Marco Pesenti Gritti
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,13 +19,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
-#include "ephy-marshal.h"
 #include "ephy-embed.h"
-#include "mozilla-embed-single.h"
 
+#include "ephy-marshal.h"
+#include "mozilla-embed-single.h"
 #include "mozilla-embed.h"
 
 enum
@@ -50,37 +50,31 @@ enum
 	LAST_SIGNAL
 };
 
-static void
-ephy_embed_base_init (gpointer base_class);
-
-struct EphyEmbedPrivate
-{
-	gpointer dummy;
-};
-
 static guint ephy_embed_signals[LAST_SIGNAL] = { 0 };
 
+static void	ephy_embed_base_init (gpointer base_class);
+
 GType
 ephy_embed_get_type (void)
 {
-        static GType ephy_embed_type = 0;
+	static GType ephy_embed_type = 0;
 
-        if (ephy_embed_type == 0)
-        {
-                static const GTypeInfo our_info =
-                {
-                        sizeof (EphyEmbedClass),
-                        ephy_embed_base_init,
-                        NULL,
-                };
-
-                ephy_embed_type = g_type_register_static (G_TYPE_INTERFACE,
+	if (ephy_embed_type == 0)
+	{
+		static const GTypeInfo our_info =
+		{
+			sizeof (EphyEmbedClass),
+			ephy_embed_base_init,
+			NULL,
+		};
+
+		ephy_embed_type = g_type_register_static (G_TYPE_INTERFACE,
 							  "EphyEmbed",
 							  &our_info,
 							  (GTypeFlags)0);
-        }
+	}
 
-        return ephy_embed_type;
+	return ephy_embed_type;
 }
 
 static void
@@ -91,177 +85,177 @@ ephy_embed_base_init (gpointer g_class)
 	if (!initialized)
 	{
 	ephy_embed_signals[NEW_WINDOW] =
-                g_signal_new ("ge_new_window",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, new_window),
-                              NULL, NULL,
-                              ephy_marshal_VOID__POINTER_INT,
+		g_signal_new ("ge_new_window",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, new_window),
+			      NULL, NULL,
+			      ephy_marshal_VOID__POINTER_INT,
 			      G_TYPE_NONE,
-                              2,
-                              G_TYPE_POINTER,
+			      2,
+			      G_TYPE_POINTER,
 			      G_TYPE_INT);
 	ephy_embed_signals[LINK_MESSAGE] =
-                g_signal_new ("ge_link_message",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, link_message),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_link_message",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, link_message),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_STRING);
 	ephy_embed_signals[CONTEXT_MENU] =
-                g_signal_new ("ge_context_menu",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, context_menu),
-                              g_signal_accumulator_true_handled, NULL,
-                              ephy_marshal_BOOLEAN__OBJECT,
-                              G_TYPE_BOOLEAN,
-                              1,
+		g_signal_new ("ge_context_menu",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, context_menu),
+			      g_signal_accumulator_true_handled, NULL,
+			      ephy_marshal_BOOLEAN__OBJECT,
+			      G_TYPE_BOOLEAN,
+			      1,
 			      G_TYPE_OBJECT);
 	ephy_embed_signals[FAVICON] =
-                g_signal_new ("ge_favicon",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, favicon),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_favicon",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, favicon),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_STRING);
 	ephy_embed_signals[JS_STATUS] =
-                g_signal_new ("ge_js_status",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, js_status),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
+		g_signal_new ("ge_js_status",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, js_status),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
 			      G_TYPE_NONE,
-                              1,
+			      1,
 			      G_TYPE_STRING);
 	ephy_embed_signals[LOCATION] =
-                g_signal_new ("ge_location",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, location),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__STRING,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_location",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, location),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__STRING,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_STRING);
 	ephy_embed_signals[TITLE] =
-                g_signal_new ("ge_title",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, title),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
+		g_signal_new ("ge_title",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, title),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
 	ephy_embed_signals[PROGRESS] =
-                g_signal_new ("ge_progress",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, progress),
-                              NULL, NULL,
-                              ephy_marshal_VOID__STRING_INT_INT,
-                              G_TYPE_NONE,
-                              3,
+		g_signal_new ("ge_progress",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, progress),
+			      NULL, NULL,
+			      ephy_marshal_VOID__STRING_INT_INT,
+			      G_TYPE_NONE,
+			      3,
 			      G_TYPE_STRING,
 			      G_TYPE_INT,
 			      G_TYPE_INT);
 	ephy_embed_signals[NET_STATE] =
-                g_signal_new ("ge_net_state",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, net_state),
-                              NULL, NULL,
-                              ephy_marshal_VOID__STRING_INT,
-                              G_TYPE_NONE,
-                              2,
+		g_signal_new ("ge_net_state",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, net_state),
+			      NULL, NULL,
+			      ephy_marshal_VOID__STRING_INT,
+			      G_TYPE_NONE,
+			      2,
 			      G_TYPE_STRING,
 			      G_TYPE_INT);
 	ephy_embed_signals[VISIBILITY] =
-                g_signal_new ("ge_visibility",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, visibility),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__BOOLEAN,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_visibility",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, visibility),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__BOOLEAN,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_BOOLEAN);
 	ephy_embed_signals[DESTROY_BRSR] =
-                g_signal_new ("ge_destroy_brsr",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_FIRST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, destroy_brsr),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__VOID,
-                              G_TYPE_NONE,
-                              0);
+		g_signal_new ("ge_destroy_brsr",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, destroy_brsr),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE,
+			      0);
 	ephy_embed_signals[OPEN_URI] =
-                g_signal_new ("ge_open_uri",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, open_uri),
-                              NULL, NULL,
-                              ephy_marshal_INT__STRING,
-                              G_TYPE_INT,
-                              1,
+		g_signal_new ("ge_open_uri",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, open_uri),
+			      NULL, NULL,
+			      ephy_marshal_INT__STRING,
+			      G_TYPE_INT,
+			      1,
 			      G_TYPE_STRING);
 	ephy_embed_signals[SIZE_TO] =
-                g_signal_new ("ge_size_to",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, size_to),
-                              NULL, NULL,
-                              ephy_marshal_VOID__INT_INT,
-                              G_TYPE_NONE,
-                              2,
+		g_signal_new ("ge_size_to",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, size_to),
+			      NULL, NULL,
+			      ephy_marshal_VOID__INT_INT,
+			      G_TYPE_NONE,
+			      2,
 			      G_TYPE_INT,
 			      G_TYPE_INT);
 	ephy_embed_signals[DOM_MOUSE_CLICK] =
-                g_signal_new ("ge_dom_mouse_click",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_click),
-                              g_signal_accumulator_true_handled, NULL,
-                              ephy_marshal_BOOLEAN__OBJECT,
-                              G_TYPE_BOOLEAN,
-                              1,
+		g_signal_new ("ge_dom_mouse_click",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_click),
+			      g_signal_accumulator_true_handled, NULL,
+			      ephy_marshal_BOOLEAN__OBJECT,
+			      G_TYPE_BOOLEAN,
+			      1,
 			      G_TYPE_POINTER);
 	ephy_embed_signals[DOM_MOUSE_DOWN] =
-                g_signal_new ("ge_dom_mouse_down",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_down),
-                              g_signal_accumulator_true_handled, NULL,
-                              ephy_marshal_BOOLEAN__OBJECT,
-                              G_TYPE_BOOLEAN,
-                              1,
+		g_signal_new ("ge_dom_mouse_down",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, dom_mouse_down),
+			      g_signal_accumulator_true_handled, NULL,
+			      ephy_marshal_BOOLEAN__OBJECT,
+			      G_TYPE_BOOLEAN,
+			      1,
 			      G_TYPE_POINTER);
 	ephy_embed_signals[SECURITY_CHANGE] =
-                g_signal_new ("ge_security_change",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, security_change),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__INT,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_security_change",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, security_change),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__INT,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_INT);
 	ephy_embed_signals[ZOOM_CHANGE] =
-                g_signal_new ("ge_zoom_change",
-                              EPHY_TYPE_EMBED,
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedClass, zoom_change),
-                              NULL, NULL,
-                              g_cclosure_marshal_VOID__FLOAT,
-                              G_TYPE_NONE,
-                              1,
+		g_signal_new ("ge_zoom_change",
+			      EPHY_TYPE_EMBED,
+			      G_SIGNAL_RUN_LAST,
+			      G_STRUCT_OFFSET (EphyEmbedClass, zoom_change),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__FLOAT,
+			      G_TYPE_NONE,
+			      1,
 			      G_TYPE_FLOAT);
 	initialized = TRUE;
 	}
@@ -270,280 +264,224 @@ ephy_embed_base_init (gpointer g_class)
 EphyEmbed *
 ephy_embed_new (GObject *single)
 {
-	if (MOZILLA_IS_EMBED_SINGLE (single))
-	{
-		return EPHY_EMBED (g_object_new
-			(MOZILLA_TYPE_EMBED, NULL));
-	}
-
-	g_assert_not_reached ();
+	g_assert (MOZILLA_IS_EMBED_SINGLE (single));
 
-	return NULL;
+	return EPHY_EMBED (g_object_new (MOZILLA_TYPE_EMBED, NULL));
 }
 
 void
-ephy_embed_get_capabilities (EphyEmbed *embed,
-                               EmbedCapabilities *caps)
-{
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        klass->get_capabilities (embed, caps);
-}
-
-gresult
 ephy_embed_load_url (EphyEmbed *embed,
-                     const char *url)
+		     const char *url)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->load_url (embed, url);
+	klass->load_url (embed, url);
 }
 
-gresult
+void
 ephy_embed_stop_load (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->stop_load (embed);
+	klass->stop_load (embed);
 }
 
-gresult
+gboolean
 ephy_embed_can_go_back (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->can_go_back (embed);
+	return klass->can_go_back (embed);
 }
 
-gresult
+gboolean
 ephy_embed_can_go_forward (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->can_go_forward (embed);
+	return klass->can_go_forward (embed);
 }
 
-gresult
+gboolean
 ephy_embed_can_go_up (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->can_go_up (embed);
+	return klass->can_go_up (embed);
 }
 
-gresult
-ephy_embed_get_go_up_list (EphyEmbed *embed, GSList **l)
+GSList *
+ephy_embed_get_go_up_list (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->get_go_up_list (embed, l);
+	return klass->get_go_up_list (embed);
 }
 
-gresult
+void
 ephy_embed_go_back (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->go_back (embed);
+	klass->go_back (embed);
 }
 
-gresult
+void
 ephy_embed_go_forward (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->go_forward (embed);
+	klass->go_forward (embed);
 }
 
-gresult
+void
 ephy_embed_go_up (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->go_up (embed);
-}
-
-gresult
-ephy_embed_render_data (EphyEmbed *embed,
-                        const char *data,
-                        guint32 len,
-                        const char *base_uri,
-                        const char *mime_type)
-{
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->render_data (embed, data, len, base_uri, mime_type);
+	klass->go_up (embed);
 }
 
-gresult
-ephy_embed_open_stream (EphyEmbed *embed,
-                        const char *base_uri,
-                        const char *mime_type)
-{
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->open_stream (embed, base_uri, mime_type);
-}
-
-gresult
-ephy_embed_append_data (EphyEmbed *embed,
-                        const char *data,
-                        guint32 len)
-{
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->append_data (embed, data, len);
-}
 
-gresult
-ephy_embed_close_stream (EphyEmbed *embed)
+char *
+ephy_embed_get_title (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->close_stream (embed);
+	return klass->get_title (embed);
 }
 
-gresult
-ephy_embed_get_title (EphyEmbed *embed,
-                      char **title)
-{
-	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->get_title (embed, title);
-}
-
-gresult
+char *
 ephy_embed_get_location (EphyEmbed *embed,
-                         gboolean toplevel,
-                         char **location)
+			 gboolean toplevel)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->get_location (embed, toplevel, location);
+	return klass->get_location (embed, toplevel);
 }
 
-gresult
+void
 ephy_embed_reload (EphyEmbed *embed,
-                   EmbedReloadFlags flags)
+		   EmbedReloadFlags flags)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->reload (embed, flags);
+	klass->reload (embed, flags);
 }
 
-gresult
+void
 ephy_embed_zoom_set (EphyEmbed *embed,
-                     float zoom,
-                     gboolean reflow)
+		     float zoom,
+		     gboolean reflow)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->zoom_set (embed, zoom, reflow);
+	klass->zoom_set (embed, zoom, reflow);
 }
 
-gresult
-ephy_embed_zoom_get (EphyEmbed *embed,
-                     float *zoom)
+float
+ephy_embed_zoom_get (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->zoom_get (embed, zoom);
+	return klass->zoom_get (embed);
 }
 
-gresult
-ephy_embed_shistory_count  (EphyEmbed *embed,
-                            int *count)
+int
+ephy_embed_shistory_n_items  (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->shistory_count (embed, count);
+	return klass->shistory_n_items (embed);
 }
 
-gresult
+void
 ephy_embed_shistory_get_nth (EphyEmbed *embed,
-                             int nth,
-                             gboolean is_relative,
-                             char **url,
-                             char **title)
+			     int nth,
+			     gboolean is_relative,
+			     char **url,
+			     char **title)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->shistory_get_nth (embed, nth, is_relative, url, title);
+	klass->shistory_get_nth (embed, nth, is_relative, url, title);
 }
 
-gresult
-ephy_embed_shistory_get_pos (EphyEmbed *embed,
-                             int *pos)
+int
+ephy_embed_shistory_get_pos (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->shistory_get_pos (embed, pos);
+	return klass->shistory_get_pos (embed);
 }
 
-gresult
+void
 ephy_embed_shistory_go_nth (EphyEmbed *embed,
-                            int nth)
+			    int nth)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->shistory_go_nth (embed, nth);
+	klass->shistory_go_nth (embed, nth);
 }
 
-gresult
+void
 ephy_embed_get_security_level (EphyEmbed *embed,
-                               EmbedSecurityLevel *level,
-                               char **description)
+			       EmbedSecurityLevel *level,
+			       char **description)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->get_security_level (embed, level, description);
+	klass->get_security_level (embed, level, description);
 }
 
-gresult
+void
 ephy_embed_find_set_properties  (EphyEmbed *embed,
 				 char *search_string,
 				 gboolean case_sensitive,
 				 gboolean match_word)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->find_set_properties (embed, search_string, case_sensitive, match_word);
+	klass->find_set_properties (embed, search_string, case_sensitive, match_word);
 }
 
-gresult
+gboolean
 ephy_embed_find_next (EphyEmbed *embed,
 		      gboolean backwards)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->find_next (embed, backwards);
+	return klass->find_next (embed, backwards);
 }
 
-gresult
+void
 ephy_embed_activate (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->activate (embed);
+	klass->activate (embed);
 }
 
-gresult
+void
 ephy_embed_set_encoding (EphyEmbed *embed,
 			 const char *encoding)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->set_encoding (embed, encoding);
+	klass->set_encoding (embed, encoding);
 }
 
-gresult
-ephy_embed_get_encoding_info (EphyEmbed *embed,
-			      EphyEncodingInfo **info)
+EphyEncodingInfo *
+ephy_embed_get_encoding_info (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->get_encoding_info (embed, info);
+	return klass->get_encoding_info (embed);
 }
 
-gresult
+void
 ephy_embed_print (EphyEmbed *embed,
-                  EmbedPrintInfo *info)
+		  EmbedPrintInfo *info)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->print (embed, info);
+	klass->print (embed, info);
 }
 
-gresult
+void
 ephy_embed_print_preview_close (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-        return klass->print_preview_close (embed);
+	klass->print_preview_close (embed);
 }
 
-gresult
-ephy_embed_print_preview_num_pages (EphyEmbed *embed, gint *retNum)
+int
+ephy_embed_print_preview_n_pages (EphyEmbed *embed)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->print_preview_num_pages (embed, retNum);
+	return klass->print_preview_n_pages (embed);
 }
 
-gresult
+void
 ephy_embed_print_preview_navigate (EphyEmbed *embed,
-				   EmbedPrintPreviewNavType navType,
-				   gint pageNum)
+				   EmbedPrintPreviewNavType type,
+				   int page)
 {
 	EphyEmbedClass *klass = EPHY_EMBED_GET_CLASS (embed);
-	return klass->print_preview_navigate (embed, navType, pageNum);
+	return klass->print_preview_navigate (embed, type, page);
 }
-