summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Michael Brummer <jan.brummer@tabos.org>2021-01-09 19:03:39 +0100
committerJan-Michael Brummer <jan.brummer@tabos.org>2021-01-10 14:18:29 +0000
commit8ea78db67689f5e565fabfb2c6168fad281465c2 (patch)
tree5ba2baadc0f44d8b5fbd9092c57c8bf437bf8d03
parentb00ef4c948d68cf0d43b94557e449f0dcb1300e6 (diff)
downloadepiphany-8ea78db67689f5e565fabfb2c6168fad281465c2.tar.gz
Rename mobile-capable to show-navigation-buttons
Fixes: https://gitlab.gnome.org/GNOME/epiphany/-/issues/1300
-rw-r--r--data/org.gnome.epiphany.gschema.xml6
-rw-r--r--lib/ephy-prefs.h10
-rw-r--r--lib/ephy-web-app-utils.c2
-rw-r--r--src/ephy-action-bar-start.c2
-rw-r--r--src/ephy-header-bar.c2
5 files changed, 11 insertions, 11 deletions
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index ba787d52f..5badc3006 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -247,10 +247,10 @@
<summary>Web application additional URLs</summary>
<description>The list of URLs that should be opened by the web application</description>
</key>
- <key type="b" name="mobile-capable">
+ <key type="b" name="show-navigation-buttons">
<default>false</default>
- <summary>WebApp is mobile capable</summary>
- <description>Whether to show buttons for navigation.</description>
+ <summary>Show navigation buttons in WebApp</summary>
+ <description>Whether to show buttons for navigation in WebApp.</description>
</key>
<key type="b" name="run-in-background">
<default>false</default>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 5bd35efc3..9b1a8545c 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -193,11 +193,11 @@ static const char * const ephy_prefs_web_schema[] = {
#define EPHY_PREFS_SYNC_TOKEN_SERVER "sync-token-server"
#define EPHY_PREFS_SYNC_ACCOUNTS_SERVER "sync-accounts-server"
-#define EPHY_PREFS_WEB_APP_SCHEMA "org.gnome.Epiphany.webapp"
-#define EPHY_PREFS_WEB_APP_ADDITIONAL_URLS "additional-urls"
-#define EPHY_PREFS_WEB_APP_MOBILE_CAPABLE "mobile-capable"
-#define EPHY_PREFS_WEB_APP_RUN_IN_BACKGROUND "run-in-background"
-#define EPHY_PREFS_WEB_APP_SYSTEM "system"
+#define EPHY_PREFS_WEB_APP_SCHEMA "org.gnome.Epiphany.webapp"
+#define EPHY_PREFS_WEB_APP_ADDITIONAL_URLS "additional-urls"
+#define EPHY_PREFS_WEB_APP_SHOW_NAVIGATION_BUTTONS "show-navigation-buttons"
+#define EPHY_PREFS_WEB_APP_RUN_IN_BACKGROUND "run-in-background"
+#define EPHY_PREFS_WEB_APP_SYSTEM "system"
static struct {
const char *schema;
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index 48997774f..5f80c5db5 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -802,7 +802,7 @@ ephy_web_application_initialize_settings (const char *profile_dir
g_free (path);
if (options & EPHY_WEB_APPLICATION_MOBILE_CAPABLE)
- g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_MOBILE_CAPABLE, TRUE);
+ g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_SHOW_NAVIGATION_BUTTONS, TRUE);
if (options & EPHY_WEB_APPLICATION_SYSTEM)
g_settings_set_boolean (web_app_settings, EPHY_PREFS_WEB_APP_SYSTEM, TRUE);
diff --git a/src/ephy-action-bar-start.c b/src/ephy-action-bar-start.c
index 816dc5da3..e55105fcd 100644
--- a/src/ephy-action-bar-start.c
+++ b/src/ephy-action-bar-start.c
@@ -566,7 +566,7 @@ ephy_action_bar_start_constructed (GObject *object)
if (ephy_profile_dir_is_web_application ()) {
GtkWidget *navigation_box = ephy_action_bar_start_get_navigation_box (action_bar_start);
- g_settings_bind (EPHY_SETTINGS_WEB_APP, EPHY_PREFS_WEB_APP_MOBILE_CAPABLE, navigation_box, "visible", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN);
+ g_settings_bind (EPHY_SETTINGS_WEB_APP, EPHY_PREFS_WEB_APP_SHOW_NAVIGATION_BUTTONS, navigation_box, "visible", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN);
}
}
diff --git a/src/ephy-header-bar.c b/src/ephy-header-bar.c
index c0fd583c0..ddf1bf69e 100644
--- a/src/ephy-header-bar.c
+++ b/src/ephy-header-bar.c
@@ -336,7 +336,7 @@ ephy_header_bar_constructed (GObject *object)
if (ephy_profile_dir_is_web_application ()) {
GtkWidget *navigation_box = ephy_action_bar_start_get_navigation_box (header_bar->action_bar_start);
- g_settings_bind (EPHY_SETTINGS_WEB_APP, EPHY_PREFS_WEB_APP_MOBILE_CAPABLE, navigation_box, "visible", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN);
+ g_settings_bind (EPHY_SETTINGS_WEB_APP, EPHY_PREFS_WEB_APP_SHOW_NAVIGATION_BUTTONS, navigation_box, "visible", G_SETTINGS_BIND_GET | G_SETTINGS_BIND_INVERT_BOOLEAN);
}
}