← Back to branch summary

~noskcaj/ubuntu/wily/epiphany-browser/merge2

« back to all changes in this revision

Viewing changes to embed/ephy-web-view.h

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher
  • Date: 2013-11-13 11:39:29 UTC
  • mfrom: (105.1.10 sid)
  • Revision ID: package-import@ubuntu.com-20131113113929-1ufk6ama9z3ejgjj
Tags: 3.8.2-4ubuntu1
* Resynchronize on Debian, remaining changes
* debian/patches/07_bookmarks.patch:
  - Ubuntu-specific default bookmarks, borrowed from Firefox
* debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  - update the bookmarks on changes, needed for appmenu to work correctly

Show diffs side-by-side

added added

removed removed

Lines of Context:
embed/ephy-web-view.h
81
81
 
82
82
typedef enum {
83
83
  EPHY_WEB_VIEW_ERROR_PAGE_NETWORK_ERROR,
84
 
  EPHY_WEB_VIEW_ERROR_PAGE_CRASH
 
84
  EPHY_WEB_VIEW_ERROR_PAGE_CRASH,
 
85
  EPHY_WEB_VIEW_ERROR_PROCESS_CRASH
85
86
} EphyWebViewErrorPage;
86
87
 
87
88
struct _EphyWebView
144
145
EphyWebViewNavigationFlags ephy_web_view_get_navigation_flags     (EphyWebView               *view);
145
146
const char *               ephy_web_view_get_status_message       (EphyWebView               *view);
146
147
const char *               ephy_web_view_get_link_message         (EphyWebView               *view);
147
 
gboolean                   ephy_web_view_get_visibility           (EphyWebView               *view);
148
148
void                       ephy_web_view_set_link_message         (EphyWebView               *view,
149
149
                                                                   const char                *link_message);
150
150
void                       ephy_web_view_set_security_level       (EphyWebView               *view,
151
151
                                                                   EphyWebViewSecurityLevel   level);
152
 
void                       ephy_web_view_set_visibility           (EphyWebView               *view,
153
 
                                                                   gboolean                   visibility);
154
152
const char *               ephy_web_view_get_typed_address        (EphyWebView               *view);
155
153
void                       ephy_web_view_set_typed_address        (EphyWebView               *view,
156
154
                                                                   const char                *address);
165
163
const char *               ephy_web_view_get_address              (EphyWebView               *view);
166
164
const char *               ephy_web_view_get_title_composite      (EphyWebView               *view);
167
165
 
 
166
void                       ephy_web_view_set_placeholder          (EphyWebView               *view,
 
167
                                                                   const char                *uri,
 
168
                                                                   const char                *title);
 
169
 
168
170
void                       ephy_web_view_load_error_page          (EphyWebView               *view,
169
171
                                                                   const char                *uri,
170
172
                                                                   EphyWebViewErrorPage       page,