[gnome-settings-daemon] updates: Remove the connection-use-wifi key, it's not enabled or available in the GUI
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] updates: Remove the connection-use-wifi key, it's not enabled or available in the GUI
- Date: Fri, 29 Jun 2012 12:15:08 +0000 (UTC)
commit 6c6fc0363393abb4fd69dd0cbe0bf88431b32a51
Author: Richard Hughes <richard hughsie com>
Date: Fri Jun 29 10:32:37 2012 +0100
updates: Remove the connection-use-wifi key, it's not enabled or available in the GUI
And Allan says it's insane...
...ttings-daemon.plugins.updates.gschema.xml.in.in | 7 +------
plugins/updates/gsd-updates-common.h | 1 -
plugins/updates/gsd-updates-refresh.c | 5 -----
3 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
index ff5891d..244673d 100644
--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
@@ -15,15 +15,10 @@
<_summary>Use mobile broadband connections</_summary>
<_description>Use mobile broadband connections such as GSM and CDMA to check for updates.</_description>
</key>
- <key name="connection-use-wifi" type="b">
- <default>true</default>
- <_summary>Use WiFi connections</_summary>
- <_description>Use WiFi (wireless LAN) connections to check for updates. It may be faster to download packages when on a wired connection, and the VPN or proxy required may also only be available on wired connections.</_description>
- </key>
<key name="auto-download-updates" type="b">
<default>false</default>
<_summary>Automatically download updates in the background without confirmation</_summary>
- <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
+ <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and mobile broadband if 'connection-use-mobile' is enabled.</_description>
</key>
<key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
<default>'security'</default>
diff --git a/plugins/updates/gsd-updates-common.h b/plugins/updates/gsd-updates-common.h
index cb83bd0..9501378 100644
--- a/plugins/updates/gsd-updates-common.h
+++ b/plugins/updates/gsd-updates-common.h
@@ -27,7 +27,6 @@ G_BEGIN_DECLS
#define GSD_SETTINGS_AUTO_UPDATE_TYPE "auto-update-type"
#define GSD_SETTINGS_BANNED_FIRMWARE "banned-firmware"
#define GSD_SETTINGS_CONNECTION_USE_MOBILE "connection-use-mobile"
-#define GSD_SETTINGS_CONNECTION_USE_WIFI "connection-use-wifi"
#define GSD_SETTINGS_ENABLE_CHECK_FIRMWARE "enable-check-firmware"
#define GSD_SETTINGS_FORCE_GET_UPDATES_LOGIN "force-get-updates-login"
#define GSD_SETTINGS_FREQUENCY_GET_UPDATES "frequency-get-updates"
diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c
index cb15996..cd794ea 100644
--- a/plugins/updates/gsd-updates-refresh.c
+++ b/plugins/updates/gsd-updates-refresh.c
@@ -399,11 +399,6 @@ convert_network_state (GsdUpdatesRefresh *refresh, PkNetworkEnum state)
return g_settings_get_boolean (refresh->priv->settings,
GSD_SETTINGS_CONNECTION_USE_MOBILE);
- /* check policy */
- if (state == PK_NETWORK_ENUM_WIFI)
- return g_settings_get_boolean (refresh->priv->settings,
- GSD_SETTINGS_CONNECTION_USE_WIFI);
-
/* not recognised */
g_warning ("state unknown: %i", state);
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]