Merge lp:~elementary-apps/midori/packaging-granite-defaults-update into lp:~midori/midori/packaging-granite

Proposed by Danielle Foré
Status: Merged
Merged at revision: 44
Proposed branch: lp:~elementary-apps/midori/packaging-granite-defaults-update
Merge into: lp:~midori/midori/packaging-granite
Diff against target: 44 lines (+12/-4)
2 files modified
Ubuntu-config (+10/-2)
rules (+2/-2)
To merge this branch: bzr merge lp:~elementary-apps/midori/packaging-granite-defaults-update
Reviewer Review Type Date Requested Status
Cody Garver Pending
Review via email: mp+260664@code.launchpad.net

Commit message

update default settings

Description of the change

* Enable spell check
* Set window default size to same as Files
* Set search to Google
* Add Home to default toolbar and re-organize items
* Accept cookies from "3rd party" sites (fixes federated logins)
* Enable "Domain keys" extension (adds ctrl + enter shortcut)

To post a comment you must log in.
43. By Cody Garver

Merge in lp:~elementary-os/elementaryos/default-settings-trusty

44. By Cody Garver

Add upstream flag to lsb_release commands

45. By Cody Garver

Merge in trunk

46. By Cody Garver

Minor clean up

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Ubuntu-config'
2--- Ubuntu-config 2012-06-22 08:31:07 +0000
3+++ Ubuntu-config 2015-06-06 22:29:58 +0000
4@@ -1,10 +1,18 @@
5 [settings]
6 default-font-family=Droid Sans
7-homepage=http://elementaryos.org/
8+enable-spell-checking=true
9+enable-webgl=true
10+homepage=http://start.elementary.io/
11 text-editor=gnome-text-editor %F
12 show-statusbar=false
13 close-buttons-left=true
14-toolbar-items=Back,Forward,ReloadStop,BookmarkAdd,Location,TabNew,CompactMenu,
15+first-party-cookies-only=false
16+toolbar-items=Back,Forward,ReloadStop,Homepage,Location,BookmarkAdd,CompactMenu,
17+toolbar-style=MIDORI_TOOLBAR_ICONS
18+last-window-width=1000
19+last-window-height=680
20+location-entry-search=https://www.google.com/search?q=%s
21
22 [extensions]
23 libformhistory.so=true
24+libdomain-keys.so=true
25
26=== modified file 'rules'
27--- rules 2014-08-07 23:14:35 +0000
28+++ rules 2015-06-06 22:29:58 +0000
29@@ -11,13 +11,13 @@
30 LIBWEBKIT_PKG=$(shell dpkg-query -p libwebkitgtk-3.0-dev | grep Depends | sed -r 's/.*(libwebkitgtk[^ ]+).*/\1/')
31 #LIBWEBKIT_PKG="libwebkitgtk-3.0-0"
32 GTKLAUNCHER=$(shell dpkg-query -L $(LIBWEBKIT_PKG) | grep GtkLauncher)
33-DISTRO=$(shell lsb_release -is)
34+DISTRO=$(shell lsb_release -isu)
35 CONFIG_FILE=debian/config/$(DISTRO).h
36 ifneq (0, $(shell test -e $(CONFIG_FILE); echo "$$?"))
37 DISTRO=Debian
38 endif
39
40-DEBIAN_DIST_VERSION:= $(shell lsb_release -sr)
41+DEBIAN_DIST_VERSION:= $(shell lsb_release -sru)
42 CONFIGURE_FLAGS=
43 # libzeitgeist-dev on Oneiric is too old
44 ifeq (,$(11.10,$(DEBIAN_DIST_VERSION)))

Subscribers

People subscribed via source and target branches