Commit 646b41b256114ddef593d7ffe17dd59cfcd6baf9 - midori

+2

-2

extensions/delayed-load.vala less more

140	140	item.ref();
141	141
142	142	int64 delay = item.get_meta_integer ("delay");
143		if (delay == -2 && view.can_reload ()) {
	143	if (delay == -2 && view.progress < 1.0) {
144	144	this.schedule_reload (browser, view);
145	145	}
146	146	}

163	163	if (this.timeout != 0)
164	164	this.tasks.set (browser, new TabShaker (browser));
165	165
166		if (view.can_reload ())
	166	if (view.progress < 1.0)
167	167	this.schedule_reload (browser, view);
168	168
169	169	return false;

+0

-9

midori/midori-browser.c less more

328	328	_action_set_sensitive (browser, "AddSpeedDial", !midori_view_is_blank (view));
329	329	_action_set_sensitive (browser, "BookmarkAdd", !midori_view_is_blank (view));
330	330	_action_set_sensitive (browser, "SaveAs", midori_view_can_save (view));
331		_action_set_sensitive (browser, "Print", midori_view_can_print (view));
332	331	_action_set_sensitive (browser, "ZoomIn", midori_view_can_zoom_in (view));
333	332	_action_set_sensitive (browser, "ZoomOut", midori_view_can_zoom_out (view));
334	333	_action_set_sensitive (browser, "ZoomNormal",

337	336	midori_view_can_view_source (view));
338	337	_action_set_sensitive (browser, "SourceView",
339	338	midori_view_can_view_source (view));
340		_action_set_sensitive (browser, "Find",
341		midori_view_can_find (view));
342		_action_set_sensitive (browser, "FindNext",
343		midori_view_can_find (view));
344		_action_set_sensitive (browser, "FindPrevious",
345		midori_view_can_find (view));
346		midori_findbar_set_can_find (MIDORI_FINDBAR (browser->find),
347		midori_view_can_find (view));
348	339
349	340	action = _action_by_name (browser, "NextForward");
350	341	if (midori_view_can_go_forward (view))

+0

-13

midori/midori-view.c less more

5570	5570	return unique_filename;
5571	5571	}
5572	5572
5573		#define can_do(what) \
5574		gboolean \
5575		midori_view_can_##what (MidoriView* view) \
5576		{ \
5577		g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); \
5578		\
5579		return view->web_view != NULL; \
5580		}
5581
5582		can_do (reload)
5583		can_do (print)
5584		can_do (find)
5585
5586	5573	/**
5587	5574	* midori_view_reload:
5588	5575	* @view: a #MidoriView

+0

-9

midori/midori-view.h less more

182	182	midori_view_set_zoom_level (MidoriView* view,
183	183	gfloat zoom_level);
184	184
185		gboolean
186		midori_view_can_reload (MidoriView* view);
187
188	185	void
189	186	midori_view_reload (MidoriView* view,
190	187	gboolean from_cache);

217	214
218	215	const gchar*
219	216	midori_view_get_next_page (MidoriView* view);
220
221		gboolean
222		midori_view_can_print (MidoriView* view);
223	217
224	218	void
225	219	midori_view_print (MidoriView* view);

234	228	midori_view_save_source (MidoriView* view,
235	229	const gchar* uri,
236	230	const gchar* outfile);
237
238		gboolean
239		midori_view_can_find (MidoriView* view);
240	231
241	232	void
242	233	midori_view_unmark_text_matches (MidoriView* view);

+0

-2

midori/midori.vapi less more

143	143	public Gtk.Label get_proxy_tab_label ();
144	144	public Katze.Item get_proxy_item ();
145	145	public bool can_view_source ();
146		public bool can_find ();
147	146	public void search_text (string text, bool case_sensitive, bool forward);
148	147	public void mark_text_matches (string text, bool case_sensitive);
149	148	public void set_highlight_text_matches (bool highlight);

151	150	public Gdk.Pixbuf get_snapshot (int width, int height);
152	151	public unowned WebKit.WebView get_web_view ();
153	152	public void populate_popup (Gtk.Menu menu, bool manual);
154		public bool can_reload ();
155	153	public void reload (bool from_cache);
156	154
157	155	public string uri { get; }