[epiphany] Merge ephy permissions gschema into main gschema

[Michael Catanzaro <mcatanzaro src gnome org>]

commit f13c8dc865741e5c92a72520f41b5f9b59412bf1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat Feb 4 13:14:39 2017 -0600

    Merge ephy permissions gschema into main gschema
    
    There's no real good reason to have it in a separate file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=778156

 data/Makefile.am                                |    2 +-
 data/org.gnome.epiphany.gschema.xml             |   33 +++++++++++++++++++++
 data/org.gnome.epiphany.permissions.gschema.xml |   35 -----------------------
 lib/ephy-permissions-manager.c                  |    2 +-
 po/POTFILES.in                                  |    1 -
 5 files changed, 35 insertions(+), 38 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 77c4753..69e841c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,7 +10,7 @@ $(desktop_DATA): $(desktop_in_files)
 gsettings_ENUM_NAMESPACE = org.gnome.Epiphany
 gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h
 
-gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml org.gnome.epiphany.permissions.gschema.xml
+gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml
 @GSETTINGS_RULES@
 
 appstream_in_files = org.gnome.Epiphany.appdata.xml.in
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index 36d0eaf..70c4d82 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -5,6 +5,7 @@
                <child schema="org.gnome.Epiphany.web" name="web"/>
                <child schema="org.gnome.Epiphany.state" name="state"/>
                <child schema="org.gnome.Epiphany.lockdown" name="lockdown"/>
+               <child schema="org.gnome.Epiphany.permissions" name="permissions"/>
                <key type="b" name="enable-caret-browsing">
                        <default>false</default>
                        <summary>Browse with caret</summary>
@@ -239,4 +240,36 @@
                        <default>false</default>
                </key>
        </schema>
+       <enum id="org.gnome.Epiphany.Permission">
+               <value nick="undecided" value="-1"/>
+               <value nick="deny" value="0"/>
+               <value nick="allow" value="1"/>
+       </enum>
+       <schema id="org.gnome.Epiphany.permissions" gettext-domain="">
+               <key name="audio-device-permission" enum="org.gnome.Epiphany.Permission">
+                       <default>'undecided'</default>
+                       <summary>Decision to apply when microphone permission is requested for this 
host</summary>
+                       <description>This option is used to save whether a given host has been given 
permission to access the user’s microphone. The “undecided” default means the browser needs to ask the user 
for permission, while “allow” and “deny” tell it to automatically make the decision upon 
request.</description>
+               </key>
+               <key name="geolocation-permission" enum="org.gnome.Epiphany.Permission">
+                       <default>'undecided'</default>
+                       <summary>Decision to apply when geolocation permission is requested for this 
host</summary>
+                       <description>This option is used to save whether a given host has been given 
permission to access the user’s location. The “undecided” default means the browser needs to ask the user for 
permission, while “allow” and “deny” tell it to automatically make the decision upon request.</description>
+               </key>
+               <key name="notifications-permission" enum="org.gnome.Epiphany.Permission">
+                       <default>'undecided'</default>
+                       <summary>Decision to apply when notification permission is requested for this 
host</summary>
+                       <description>This option is used to save whether a given host has been given 
permission to show notifications. The “undecided” default means the browser needs to ask the user for 
permission, while “allow” and “deny” tell it to automatically make the decision upon request.</description>
+               </key>
+               <key name="save-password-permission" enum="org.gnome.Epiphany.Permission">
+                       <default>'undecided'</default>
+                       <summary>Decision to apply when save password permission is requested for this 
host</summary>
+                       <description>This option is used to save whether a given host has been given 
permission to save passwords. The “undecided” default means the browser needs to ask the user for permission, 
while “allow” and “deny” tell it to automatically make the decision upon request.</description>
+               </key>
+               <key name="video-device-permission" enum="org.gnome.Epiphany.Permission">
+                       <default>'undecided'</default>
+                       <summary>Decision to apply when webcam permission is requested for this host</summary>
+                       <description>This option is used to save whether a given host has been given 
permission to access the user’s webcam. The “undecided” default means the browser needs to ask the user for 
permission, while “allow” and “deny” tell it to automatically make the decision upon request.</description>
+               </key>
+       </schema>
 </schemalist>
diff --git a/lib/ephy-permissions-manager.c b/lib/ephy-permissions-manager.c
index f653988..454efc7 100644
--- a/lib/ephy-permissions-manager.c
+++ b/lib/ephy-permissions-manager.c
@@ -131,7 +131,7 @@ ephy_permissions_manager_get_settings_for_origin (EphyPermissionsManager *manage
                                  webkit_security_origin_get_host (security_origin),
                                  webkit_security_origin_get_port (security_origin));
 
-  settings = g_settings_new_with_backend_and_path ("org.gnome.Epiphany.Permissions", backend, origin_path);
+  settings = g_settings_new_with_backend_and_path ("org.gnome.Epiphany.permissions", backend, origin_path);
   g_free (trimmed_protocol);
   g_free (origin_path);
   g_object_unref (backend);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 27ea50f..27c53a7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,6 @@
 data/org.gnome.Epiphany.appdata.xml.in
 data/org.gnome.Epiphany.desktop.in
 data/org.gnome.epiphany.gschema.xml
-data/org.gnome.epiphany.permissions.gschema.xml
 embed/ephy-about-handler.c
 embed/ephy-download.c
 embed/ephy-embed.c