aboutsummaryrefslogtreecommitdiffstats
path: root/embed/ephy-embed-single.h
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 /embed/ephy-embed-single.h
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 'embed/ephy-embed-single.h')
-rw-r--r--embed/ephy-embed-single.h120
1 files changed, 57 insertions, 63 deletions
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index e45b99cad..598ccdfd3 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -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
@@ -47,17 +47,17 @@ typedef struct EphyEmbedSinglePrivate EphyEmbedSinglePrivate;
typedef enum
{
- modeOpen = 0,
- modeSave = 1,
- modeGetFolder =2
+ modeOpen = 0,
+ modeSave = 1,
+ modeGetFolder =2
} FilePickerMode;
typedef struct
{
- /* description of the file format */
- gchar *description;
- /* tipical sufixes, NULL terminated */
- gchar **extensions;
+ /* description of the file format */
+ gchar *description;
+ /* tipical sufixes, NULL terminated */
+ gchar **extensions;
} FileFormat;
/**
@@ -66,11 +66,11 @@ typedef struct
typedef struct
{
gchar *domain;
- gchar *name;
- gchar *value;
- gchar *path;
- gchar *secure;
- gchar *expire;
+ gchar *name;
+ gchar *value;
+ gchar *path;
+ gchar *secure;
+ gchar *expire;
} CookieInfo;
/**
@@ -78,8 +78,8 @@ typedef struct
*/
typedef struct
{
- gchar *host;
- gchar *username;
+ gchar *host;
+ gchar *username;
} PasswordInfo;
/**
@@ -87,8 +87,8 @@ typedef struct
*/
typedef enum
{
- PASSWORD_PASSWORD,
- PASSWORD_REJECT
+ PASSWORD_PASSWORD,
+ PASSWORD_REJECT
} PasswordType;
typedef enum
@@ -100,77 +100,71 @@ typedef enum
struct EphyEmbedSingle
{
GObject parent;
- EphyEmbedSinglePrivate *priv;
+ EphyEmbedSinglePrivate *priv;
};
struct EphyEmbedSingleClass
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
/* Signals */
void (* new_window) (EphyEmbedSingle *shell,
- EphyEmbed **new_embed,
+ EphyEmbed **new_embed,
EmbedChromeMask chromemask);
/* Methods */
- gresult (* clear_cache) (EphyEmbedSingle *shell);
- gresult (* set_offline_mode) (EphyEmbedSingle *shell,
- gboolean offline);
- gresult (* load_proxy_autoconf) (EphyEmbedSingle *shell,
- const char* url);
- gresult (* show_java_console) (EphyEmbedSingle *shell);
- gresult (* show_js_console) (EphyEmbedSingle *shell);
- gresult (* get_font_list) (EphyEmbedSingle *shell,
- const char *langGroup,
- GList **fontList);
- gresult (* list_cookies) (EphyEmbedSingle *shell,
- GList **cokies);
- gresult (* remove_cookies) (EphyEmbedSingle *shell,
- GList *cookies);
- gresult (* list_passwords) (EphyEmbedSingle *shell,
- PasswordType type,
- GList **passwords);
- gresult (* remove_passwords) (EphyEmbedSingle *shell,
- GList *passwords,
- PasswordType type);
+ void (* clear_cache) (EphyEmbedSingle *shell);
+ void (* set_offline_mode) (EphyEmbedSingle *shell,
+ gboolean offline);
+ void (* load_proxy_autoconf) (EphyEmbedSingle *shell,
+ const char* url);
+ void (* show_java_console) (EphyEmbedSingle *shell);
+ void (* show_js_console) (EphyEmbedSingle *shell);
+ GList * (* get_font_list) (EphyEmbedSingle *shell,
+ const char *langGroup);
+ GList * (* list_cookies) (EphyEmbedSingle *shell);
+ void (* remove_cookies) (EphyEmbedSingle *shell,
+ GList *cookies);
+ GList * (* list_passwords) (EphyEmbedSingle *shell,
+ PasswordType type);
+ void (* remove_passwords) (EphyEmbedSingle *shell,
+ GList *passwords,
+ PasswordType type);
};
-GType ephy_embed_single_get_type (void);
+GType ephy_embed_single_get_type (void);
-gresult ephy_embed_single_clear_cache (EphyEmbedSingle *shell);
+void ephy_embed_single_clear_cache (EphyEmbedSingle *shell);
-gresult ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell,
- gboolean offline);
+void ephy_embed_single_set_offline_mode (EphyEmbedSingle *shell,
+ gboolean offline);
-gresult ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell,
- const char* url);
+void ephy_embed_single_load_proxy_autoconf (EphyEmbedSingle *shell,
+ const char* url);
-gresult ephy_embed_single_get_font_list (EphyEmbedSingle *shell,
- const char *langGroup,
- GList **fontList);
+GList *ephy_embed_single_get_font_list (EphyEmbedSingle *shell,
+ const char *langGroup);
/* Cookies */
-gresult ephy_embed_single_list_cookies (EphyEmbedSingle *shell,
- GList **cookies);
+GList *ephy_embed_single_list_cookies (EphyEmbedSingle *shell);
-gresult ephy_embed_single_remove_cookies (EphyEmbedSingle *shell,
- GList *cookies);
+void ephy_embed_single_remove_cookies (EphyEmbedSingle *shell,
+ GList *cookies);
-gresult ephy_embed_single_free_cookies (EphyEmbedSingle *shell,
- GList *cookies);
+void ephy_embed_single_free_cookies (EphyEmbedSingle *shell,
+ GList *cookies);
/* Passwords */
-gresult ephy_embed_single_list_passwords (EphyEmbedSingle *shell,
- PasswordType type,
- GList **passwords);
+GList *ephy_embed_single_list_passwords (EphyEmbedSingle *shell,
+ PasswordType type);
-gresult ephy_embed_single_free_passwords (EphyEmbedSingle *shell,
- GList *passwords);
+void ephy_embed_single_free_passwords (EphyEmbedSingle *shell,
+ GList *passwords);
-gresult ephy_embed_single_remove_passwords (EphyEmbedSingle *shell,
- GList *passwords,
- PasswordType type);
+void ephy_embed_single_remove_passwords (EphyEmbedSingle *shell,
+ GList *passwords,
+ PasswordType type);
G_END_DECLS