Merge lp:~kalikiana/midori/appprivacy into lp:midori
Proposed by
Cris Dywan
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | André Stösel | ||||
Approved revision: | 6282 | ||||
Merged at revision: | 6288 | ||||
Proposed branch: | lp:~kalikiana/midori/appprivacy | ||||
Merge into: | lp:midori | ||||
Diff against target: |
143 lines (+46/-37) 3 files modified
midori/midori-frontend.c (+12/-10) midori/midori-preferences.c (+3/-0) midori/midori-websettings.c (+31/-27) |
||||
To merge this branch: | bzr merge lp:~kalikiana/midori/appprivacy | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
André Stösel | Approve | ||
Review via email:
|
Commit message
Add privacy preferences in web app mode
To post a comment you must log in.
There is an issue with the "app" object (if you change some settings):
** (midori4:3734): CRITICAL **: katze_object_ get_object: assertion `G_IS_OBJECT (object)' failed
Program received signal SIGTRAP, Trace/breakpoint trap. libglib- 2.0.so. 0 libglib- 2.0.so. 0 libglib- 2.0.so. 0 get_object (object= object@ entry=0x0, property= property@ entry=0x482f2c "extensions") at ../katze/ katze-utils. c:1209 settings_ save_to_ file (settings= settings@ entry=0x862b10, app=0x0, filename= filename@ entry=0x1076440 "/home/ andre/. local/share/ midori/ apps/0d31a7f58f 9a80b737cb71387 2090cc6/ config" , error@entry= 0x7fffffffcbb8) at ../midori/ midori- websettings. c:1486 midori- session. c:353
0x00007ffff78dcd4d in g_logv () from /usr/lib/
(gdb) bt
#0 0x00007ffff78dcd4d in g_logv () from /usr/lib/
#1 0x00007ffff78dcf32 in g_log () from /usr/lib/
#2 0x000000000042a50a in katze_object_
#3 0x00000000004596b2 in midori_
error=
#4 0x000000000044c86d in settings_notify_cb (settings=0x862b10, pspec=<optimized out>, app=0x0) at ../midori/