aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-tab.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2003-11-05 07:26:31 +0800
committerChristian Persch <chpe@src.gnome.org>2003-11-05 07:26:31 +0800
commitf2d0b1b1266b3bd92916dc23019af6322d510f77 (patch)
tree1838153d12e732513d0e2bbe9ceb44bb6a784afd /src/ephy-tab.c
parent359950ec9266be580ab6bb599e59a05919c7c42a (diff)
downloadgsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar
gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.gz
gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.bz2
gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.lz
gsoc2013-epiphany-f2d0b1b1266b3bd92916dc23019af6322d510f77.tar.xz
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 'src/ephy-tab.c')
-rw-r--r--src/ephy-tab.c31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 5da504146..144546f0c 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -610,8 +610,7 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
EphyHistory *history;
EphyNode *host;
GValue value = { 0, };
- float zoom = 1.0, current_zoom = 1.0;
- gresult rv;
+ float zoom = 1.0, current_zoom;
history = ephy_embed_shell_get_global_history
(EPHY_EMBED_SHELL (ephy_shell));
@@ -624,8 +623,8 @@ ephy_tab_address_cb (EphyEmbed *embed, const char *address, EphyTab *tab)
g_value_unset (&value);
}
- rv = ephy_embed_zoom_get (embed, &current_zoom);
- if (rv == G_OK && zoom != current_zoom)
+ current_zoom = ephy_embed_zoom_get (embed);
+ if (zoom != current_zoom)
{
tab->priv->setting_zoom = TRUE;
ephy_embed_zoom_set (embed, zoom, FALSE);
@@ -648,20 +647,22 @@ ephy_tab_zoom_changed_cb (EphyEmbed *embed, float zoom, EphyTab *tab)
return;
}
- ephy_embed_get_location (embed, TRUE, &address);
+ address = ephy_embed_get_location (embed, TRUE);
if (address_has_web_scheme (address))
{
EphyHistory *history;
EphyNode *host;
GValue value = { 0, };
- float zoom = 1.0;
-
history = ephy_embed_shell_get_global_history
(EPHY_EMBED_SHELL (ephy_shell));
host = ephy_history_get_host (history, address);
- if (host != NULL && ephy_embed_zoom_get (embed, &zoom) == G_OK)
+ if (host != NULL)
{
+ float zoom;
+
+ zoom = ephy_embed_zoom_get (embed);
+
g_value_init (&value, G_TYPE_FLOAT);
g_value_set_float (&value, zoom);
ephy_node_set_property
@@ -678,7 +679,7 @@ ephy_tab_title_cb (EphyEmbed *embed, EphyTab *tab)
{
char *title;
- ephy_embed_get_title (embed, &title);
+ title = ephy_embed_get_title (embed);
ephy_tab_set_title (tab, title);
@@ -1008,8 +1009,8 @@ ephy_tab_dom_mouse_click_cb (EphyEmbed *embed,
g_assert (EPHY_IS_EMBED_EVENT(event));
- ephy_embed_event_get_event_type (event, &type);
- ephy_embed_event_get_context (event, &context);
+ type = ephy_embed_event_get_event_type (event);
+ context = ephy_embed_event_get_context (event);
if (type == EPHY_EMBED_EVENT_MOUSE_BUTTON2
&& (context & EMBED_CONTEXT_LINK))
@@ -1181,17 +1182,17 @@ ephy_tab_update_navigation_flags (EphyTab *tab)
embed = tab->priv->embed;
- if (ephy_embed_can_go_up (embed) == G_OK)
+ if (ephy_embed_can_go_up (embed))
{
flags |= TAB_NAV_UP;
}
- if (ephy_embed_can_go_back (embed) == G_OK)
+ if (ephy_embed_can_go_back (embed))
{
flags |= TAB_NAV_BACK;
}
- if (ephy_embed_can_go_forward (embed) == G_OK)
+ if (ephy_embed_can_go_forward (embed))
{
flags |= TAB_NAV_FORWARD;
}
@@ -1248,7 +1249,7 @@ ephy_tab_set_title (EphyTab *tab, const char *new_title)
GnomeVFSURI *uri = NULL;
char *address;
- ephy_embed_get_location (tab->priv->embed, TRUE, &address);
+ address = ephy_embed_get_location (tab->priv->embed, TRUE);
if (address)
{