Merge lp:~evfool/midori/lp699970 into lp:midori
Status: | Merged |
---|---|
Approved by: | André Stösel |
Approved revision: | 6582 |
Merged at revision: | 6707 |
Proposed branch: | lp:~evfool/midori/lp699970 |
Merge into: | lp:midori |
Diff against target: |
97 lines (+37/-0) 3 files modified
midori/midori-app.c (+22/-0) midori/midori-tab.vala (+10/-0) midori/midori-view.c (+5/-0) |
To merge this branch: | bzr merge lp:~evfool/midori/lp699970 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
André Stösel | Approve | ||
Cris Dywan | after-feature-freeze | Approve | |
Review via email: mp+208947@code.launchpad.net |
Commit message
This branch registers a handler to the network-changed signal of the GNetworkMonitor (which is already available, as midori already depends on GIO>=2.32.3, and GNetworkMonitor was introduced in 2.32), and in case a network is available (either connected to a network from an unconnected state, or switched to another network) reload all tabs from all browsers of midori.
Description of the change
This branch registers a handler to the network-changed signal of the GNetworkMonitor (which is already available, as midori already depends on GIO>=2.32.3, and GNetworkMonitor was introduced in 2.32), and in case a network is available (either connected to a network from an unconnected state, or switched to another network) reload all tabs from all browsers of midori.
I like the idea; though I think it definitely needs restricting, unconditional reloading would be very painful.
How about adding this to midori-tab.vala tab_set_ load_error (MIDORI_TAB (view), MIDORI_ LOAD_ERROR_ NETWORK) ; web_view_ load_error_ cb view_load_ committed to NONE
enum LoadError { NONE, DELAYED, SECURITY, CRASH, NETWORK }
Set it like
midori_
in webkit_
and reset it in midori_
The other suggested values aren't required for this one, I'm mentioning them for completeness if you'd like to add them as well I wouldn't mind, but just NONE and NETWORK would do.