diff options
author | Christian Persch <chpe@cvs.gnome.org> | 2003-11-05 07:26:31 +0800 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2003-11-05 07:26:31 +0800 |
commit | f2d0b1b1266b3bd92916dc23019af6322d510f77 (patch) | |
tree | 1838153d12e732513d0e2bbe9ceb44bb6a784afd /embed/ephy-embed-single.c | |
parent | 359950ec9266be580ab6bb599e59a05919c7c42a (diff) | |
download | gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.gz gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.zst gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.zip |
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.
Diffstat (limited to 'embed/ephy-embed-single.c')
-rw-r--r-- | embed/ephy-embed-single.c | 113 |
1 files changed, 53 insertions, 60 deletions
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 7c82b6000..c09a0defa 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003 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 @@ -60,27 +60,27 @@ ephy_embed_single_get_type (void) { static GType ephy_embed_single_type = 0; - if (ephy_embed_single_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (EphyEmbedSingleClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) ephy_embed_single_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EphyEmbedSingle), - 0, /* n_preallocs */ - (GInstanceInitFunc) ephy_embed_single_init - }; - - ephy_embed_single_type = g_type_register_static (G_TYPE_OBJECT, + if (ephy_embed_single_type == 0) + { + static const GTypeInfo our_info = + { + sizeof (EphyEmbedSingleClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) ephy_embed_single_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (EphyEmbedSingle), + 0, /* n_preallocs */ + (GInstanceInitFunc) ephy_embed_single_init + }; + + ephy_embed_single_type = g_type_register_static (G_TYPE_OBJECT, "EphyEmbedSingle", &our_info, 0); - } + } - return ephy_embed_single_type; + return ephy_embed_single_type; } static void @@ -91,15 +91,15 @@ ephy_embed_single_class_init (EphyEmbedSingleClass *klass) parent_class = (GObjectClass *) g_type_class_peek_parent (klass); ephy_embed_single_signals[NEW_WINDOW] = - g_signal_new ("new_window_orphan", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EphyEmbedSingleClass, new_window), - NULL, NULL, - ephy_marshal_VOID__POINTER_INT, - G_TYPE_NONE, - 2, - G_TYPE_POINTER, + g_signal_new ("new_window_orphan", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (EphyEmbedSingleClass, new_window), + NULL, NULL, + ephy_marshal_VOID__POINTER_INT, + G_TYPE_NONE, + 2, + G_TYPE_POINTER, G_TYPE_INT); g_type_class_add_private (object_class, sizeof(EphyEmbedSinglePrivate)); @@ -116,75 +116,72 @@ ephy_embed_single_init (EphyEmbedSingle *ges) ges->priv->favicon_cache = NULL; } -gresult +void ephy_embed_single_clear_cache (EphyEmbedSingle *shell) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->clear_cache (shell); + klass->clear_cache (shell); } -gresult +void ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell, gboolean offline) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->set_offline_mode (shell, offline); + klass->set_offline_mode (shell, offline); } -gresult +void ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell, const char* url) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->load_proxy_autoconf (shell, url); + klass->load_proxy_autoconf (shell, url); } -gresult +GList * ephy_embed_single_get_font_list (EphyEmbedSingle *shell, - const char *langGroup, - GList **fontList) + const char *langGroup) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->get_font_list (shell, langGroup, fontList); + return klass->get_font_list (shell, langGroup); } -gresult -ephy_embed_single_list_cookies (EphyEmbedSingle *shell, - GList **cookies) +GList * +ephy_embed_single_list_cookies (EphyEmbedSingle *shell) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->list_cookies (shell, cookies); + return klass->list_cookies (shell); } -gresult +void ephy_embed_single_remove_cookies (EphyEmbedSingle *shell, GList *cookies) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->remove_cookies (shell, cookies); + klass->remove_cookies (shell, cookies); } -gresult +GList * ephy_embed_single_list_passwords (EphyEmbedSingle *shell, - PasswordType type, - GList **passwords) + PasswordType type) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->list_passwords (shell, type, passwords); + return klass->list_passwords (shell, type); } -gresult +void ephy_embed_single_remove_passwords (EphyEmbedSingle *shell, - GList *passwords, - PasswordType type) + GList *passwords, + PasswordType type) { EphyEmbedSingleClass *klass = EPHY_EMBED_SINGLE_GET_CLASS (shell); - return klass->remove_passwords (shell, passwords, type); + klass->remove_passwords (shell, passwords, type); } -gresult +void ephy_embed_single_free_cookies (EphyEmbedSingle *shell, - GList *cookies) + GList *cookies) { GList *l; @@ -202,13 +199,11 @@ ephy_embed_single_free_cookies (EphyEmbedSingle *shell, } g_list_free (cookies); - - return G_OK; } -gresult +void ephy_embed_single_free_passwords (EphyEmbedSingle *shell, - GList *passwords) + GList *passwords) { GList *l; @@ -221,6 +216,4 @@ ephy_embed_single_free_passwords (EphyEmbedSingle *shell, } g_list_free (passwords); - - return G_OK; } |