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, 52 insertions, 76 deletions

diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index fe05a11f6..1dd020a59 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -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
@@ -72,29 +72,26 @@ mozilla_embed_single_init (MozillaEmbedSingle *ges);
 static void
 mozilla_embed_single_finalize (GObject *object);
 
-static gresult      
+static void   
 impl_clear_cache (EphyEmbedSingle *shell);
-static gresult          
+static void
 impl_set_offline_mode (EphyEmbedSingle *shell,
 		       gboolean offline);
-static gresult           
+static void
 impl_load_proxy_autoconf (EphyEmbedSingle *shell,
 			  const char* url);
-static gresult
+static GList *
 impl_get_font_list (EphyEmbedSingle *shell,
-		    const char *langGroup,
-		    GList **fontList);
-static gresult           
-impl_list_cookies (EphyEmbedSingle *shell,
-		   GList **cookies);
-static gresult           
+		    const char *langGroup);
+static GList *
+impl_list_cookies (EphyEmbedSingle *shell);
+static void
 impl_remove_cookies (EphyEmbedSingle *shell,
 		     GList *cookies);
-static gresult           
+static GList *
 impl_list_passwords (EphyEmbedSingle *shell,
-		     PasswordType type, 
-		     GList **passwords);
-static gresult           
+		     PasswordType type);
+static void
 impl_remove_passwords (EphyEmbedSingle *shell,
 		       GList *passwords,
 		       PasswordType type);
@@ -531,37 +528,33 @@ mozilla_embed_single_finalize (GObject *object)
 	}
 }
 
-static gresult      
+static void
 impl_clear_cache (EphyEmbedSingle *shell)
 {
 	nsresult rv;
 	
 	nsCOMPtr<nsICacheService> CacheService =
                         do_GetService (NS_CACHESERVICE_CONTRACTID, &rv);
-	if (NS_FAILED(rv)) return G_FAILED;
-
-	CacheService->EvictEntries (nsICache::STORE_ANYWHERE);
-
-	return G_OK;
+	if (NS_SUCCEEDED (rv))
+	{
+		CacheService->EvictEntries (nsICache::STORE_ANYWHERE);
+	}
 }
 
-static gresult          
+static void
 impl_set_offline_mode (EphyEmbedSingle *shell,
 		       gboolean offline)
 {
 	nsresult rv;
 
 	nsCOMPtr<nsIIOService> io = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
-        if (NS_FAILED(rv))
-                return G_FAILED;
-
-        rv = io->SetOffline(offline);
-	if (NS_SUCCEEDED(rv)) return G_FAILED;
-	
-	return G_OK;
+	if (NS_SUCCEEDED (rv))
+	{
+		io->SetOffline(offline);
+	}
 }
 
-static gresult           
+static void
 impl_load_proxy_autoconf (EphyEmbedSingle *shell,
 			  const char* url)
 {
@@ -570,18 +563,15 @@ impl_load_proxy_autoconf (EphyEmbedSingle *shell,
         nsCOMPtr<nsIProtocolProxyService> pps =
                 do_GetService ("@mozilla.org/network/protocol-proxy-service;1",
                                &rv);
-        if (NS_FAILED(rv) || !pps) return G_FAILED;
-
-        rv = pps->ConfigureFromPAC (url);
-	if (NS_FAILED(rv)) return G_FAILED;
-	
-	return G_OK;
+	if (NS_SUCCEEDED (rv))
+	{
+		pps->ConfigureFromPAC (url);
+	}
 }
 
-static gresult
+static GList *
 impl_get_font_list (EphyEmbedSingle *shell,
-		    const char *langGroup,
-		    GList **fontList)
+		    const char *langGroup)
 {
 	nsresult rv;
 	PRUint32 fontCount;
@@ -590,11 +580,11 @@ impl_get_font_list (EphyEmbedSingle *shell,
 
 	nsCOMPtr<nsIFontEnumerator> mozFontEnumerator;
 	mozFontEnumerator = do_CreateInstance("@mozilla.org/gfx/fontenumerator;1", &rv);
-	if(NS_FAILED(rv)) return G_FAILED;
+	if(NS_FAILED(rv)) return NULL;
 
 	rv = mozFontEnumerator->EnumerateFonts (nsnull, nsnull,
 					        &fontCount, &fontArray);
-	if (NS_FAILED (rv)) return G_FAILED;
+	if (NS_FAILED (rv)) return NULL;
 
 	for (PRUint32 i = 0; i < fontCount; i++)
 	{
@@ -607,23 +597,21 @@ impl_get_font_list (EphyEmbedSingle *shell,
 
 	nsMemory::Free (fontArray);
 
-	*fontList = g_list_reverse (l);
-
-	return G_OK;
+	return g_list_reverse (l);
 }
 
-static gresult           
-impl_list_cookies (EphyEmbedSingle *shell,
-		   GList **cookies)
+static GList *
+impl_list_cookies (EphyEmbedSingle *shell)
 {
         nsresult result;
+	GList *cookies = NULL;
 
         nsCOMPtr<nsICookieManager> cookieManager = 
                         do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
         nsCOMPtr<nsISimpleEnumerator> cookieEnumerator;
         result = 
             cookieManager->GetEnumerator (getter_AddRefs(cookieEnumerator));
-        if (NS_FAILED(result)) return G_FAILED;
+        if (NS_FAILED(result)) return NULL;
 	
         PRBool enumResult;
         for (cookieEnumerator->HasMoreElements(&enumResult) ;
@@ -634,7 +622,7 @@ impl_list_cookies (EphyEmbedSingle *shell,
         
                 nsCOMPtr<nsICookie> nsCookie;
                 result = cookieEnumerator->GetNext (getter_AddRefs(nsCookie));
-                if (NS_FAILED(result)) return G_FAILED;
+                if (NS_FAILED(result)) return NULL;
 
                 c = g_new0 (CookieInfo, 1);
 
@@ -663,15 +651,13 @@ impl_list_cookies (EphyEmbedSingle *shell,
 		else
 	                c->expire = g_strdup_printf ("%s",ctime((time_t*)&dateTime));
                 
-                *cookies = g_list_prepend (*cookies, c);
+                cookies = g_list_prepend (cookies, c);
         }       
 
-	*cookies = g_list_reverse (*cookies);
-		
-	return G_OK;
+	return g_list_reverse (cookies);
 }
 
-static gresult           
+static void
 impl_remove_cookies (EphyEmbedSingle *shell,
 		     GList *cookies)
 {
@@ -679,9 +665,8 @@ impl_remove_cookies (EphyEmbedSingle *shell,
 	GList *cl;
         nsCOMPtr<nsICookieManager> cookieManager =
                         do_CreateInstance (NS_COOKIEMANAGER_CONTRACTID);
-	
-        for (cl = g_list_first(cookies) ; cl != NULL ; 
-             cl = g_list_next (cl))
+
+	for (cl = cookies; cl != NULL; cl = cl->next)
         {
                 CookieInfo *c = (CookieInfo *)cl->data;
 
@@ -689,18 +674,15 @@ impl_remove_cookies (EphyEmbedSingle *shell,
                                                 nsDependentCString(c->name),
                                                 nsDependentCString(c->path),
                                                 PR_FALSE);
-                if (NS_FAILED(result)) return G_FAILED;
         };
-
-	return G_OK;
 }
 	
-static gresult           
+static GList *
 impl_list_passwords (EphyEmbedSingle *shell,
-		     PasswordType type, 
-		     GList **passwords)
+		     PasswordType type)
 {
         nsresult result = NS_ERROR_FAILURE;
+	GList *passwords = NULL;
 
         nsCOMPtr<nsIPasswordManager> passwordManager =
                         do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
@@ -711,7 +693,7 @@ impl_list_passwords (EphyEmbedSingle *shell,
         else if (type == PASSWORD_REJECT)
                 result = passwordManager->GetRejectEnumerator 
                                 (getter_AddRefs(passwordEnumerator));
-        if (NS_FAILED(result)) return G_FAILED;      
+        if (NS_FAILED(result)) return NULL;      
 
         PRBool enumResult;
         for (passwordEnumerator->HasMoreElements(&enumResult) ;
@@ -721,7 +703,7 @@ impl_list_passwords (EphyEmbedSingle *shell,
                 nsCOMPtr<nsIPassword> nsPassword;
                 result = passwordEnumerator->GetNext 
                                         (getter_AddRefs(nsPassword));
-                if (NS_FAILED(result)) return G_FAILED;
+                if (NS_FAILED(result)) return NULL;
 
                 PasswordInfo *p = g_new0 (PasswordInfo, 1);
 
@@ -736,15 +718,13 @@ impl_list_passwords (EphyEmbedSingle *shell,
                         p->username = g_strdup(NS_ConvertUCS2toUTF8(unicodeName).get());
                 }
 
-		*passwords = g_list_prepend (*passwords, p);
+		passwords = g_list_prepend (passwords, p);
         }       
 
-	*passwords = g_list_reverse (*passwords);
-
-	return G_OK;
+	return g_list_reverse (passwords);
 }
 
-static gresult           
+static void
 impl_remove_passwords (EphyEmbedSingle *shell,
 		       GList *passwords, 
 		       PasswordType type)
@@ -752,9 +732,9 @@ impl_remove_passwords (EphyEmbedSingle *shell,
 	nsresult result = NS_ERROR_FAILURE;
         nsCOMPtr<nsIPasswordManager> passwordManager =
                         do_CreateInstance (NS_PASSWORDMANAGER_CONTRACTID);
+	GList *l;
 
-        for (GList *l = g_list_first(passwords) ; l !=NULL ; 
-             l = g_list_next(l))
+	for (l = passwords; l != NULL; l = l->next)
         {
                 PasswordInfo *p = (PasswordInfo *)l->data;
                 if (type == PASSWORD_PASSWORD)
@@ -767,9 +747,5 @@ impl_remove_passwords (EphyEmbedSingle *shell,
                         result = passwordManager->RemoveReject
                                         (nsDependentCString(p->host));
                 };
-
-                if (NS_FAILED(result)) return G_FAILED;
         };
-	
-        return G_OK;
 }