1
=== modified file 'data/com.ubuntu.geoip.gschema.xml.in'
2
--- data/com.ubuntu.geoip.gschema.xml.in	2013-10-14 19:53:57 +0000
3
+++ data/com.ubuntu.geoip.gschema.xml.in	2018-02-23 15:56:38 +0000
4
@@ -1,7 +1,7 @@
5
1
<schemalist>
1
<schemalist>
6
2
  <schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/">
2
  <schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/">
7
3
    <key name="geoip-url" type="s">
3
    <key name="geoip-url" type="s">
9
4
      <default>"http://geoip.ubuntu.com/lookup"</default>
4
      <default>"https://geoip.ubuntu.com/lookup"</default>
10
5
      <_summary>URL used to get information about the IP</_summary>
5
      <_summary>URL used to get information about the IP</_summary>
11
6
      <_description>URL of a service that can be contacted and returns an XML file containing location information about the requestor's IP address.</_description>
6
      <_description>URL of a service that can be contacted and returns an XML file containing location information about the requestor's IP address.</_description>
12
7
    </key>
7
    </key>
13
8
8
14
=== modified file 'src/ubuntu-geoip-provider.c'
15
--- src/ubuntu-geoip-provider.c	2013-07-19 11:55:56 +0000
16
+++ src/ubuntu-geoip-provider.c	2018-02-23 15:56:38 +0000
17
@@ -721,7 +721,7 @@
18
721
	if (provider->priv->settings != NULL) {
721
	if (provider->priv->settings != NULL) {
19
722
		url = g_settings_get_string(provider->priv->settings, GEOIP_URL);
722
		url = g_settings_get_string(provider->priv->settings, GEOIP_URL);
20
723
	} else {
723
	} else {
22
724
		url = g_strdup("http://geoip.ubuntu.com/lookup");
724
		url = g_strdup("https://geoip.ubuntu.com/lookup");
23
725
	}
725
	}
24
726
	g_debug("Using GeoIP URL: %s", url);
726
	g_debug("Using GeoIP URL: %s", url);
25
727
727
Status:	Merged
Approved by:	Jeremy Bícha on 2018-02-23
Approved revision:	44
Merged at revision:	44
Proposed branch:	lp:~jbicha/ubuntu-geoip/https
Merge into:	lp:ubuntu-geoip
Diff against target:	24 lines (+2/-2) 2 files modified data/com.ubuntu.geoip.gschema.xml.in (+1/-1) src/ubuntu-geoip-provider.c (+1/-1)
To merge this branch:	bzr merge lp:~jbicha/ubuntu-geoip/https
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu GeoIP Team		2018-02-23	Pending
Review via email: mp+339419@code.launchpad.net
1	=== modified file 'data/com.ubuntu.geoip.gschema.xml.in'
2	--- data/com.ubuntu.geoip.gschema.xml.in 2013-10-14 19:53:57 +0000
3	+++ data/com.ubuntu.geoip.gschema.xml.in 2018-02-23 15:56:38 +0000
4	@@ -1,7 +1,7 @@
5	1	<schemalist>	1	<schemalist>
6	2	<schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/">	2	<schema id="com.ubuntu.geoip" path="/com/ubuntu/geoip/">
7	3	<key name="geoip-url" type="s">	3	<key name="geoip-url" type="s">
9	4	<default>"http://geoip.ubuntu.com/lookup"</default>	4	<default>"https://geoip.ubuntu.com/lookup"</default>
10	5	<_summary>URL used to get information about the IP</_summary>	5	<_summary>URL used to get information about the IP</_summary>
11	6	<_description>URL of a service that can be contacted and returns an XML file containing location information about the requestor's IP address.</_description>	6	<_description>URL of a service that can be contacted and returns an XML file containing location information about the requestor's IP address.</_description>
12	7	</key>	7	</key>
13	8		8
14	=== modified file 'src/ubuntu-geoip-provider.c'
15	--- src/ubuntu-geoip-provider.c 2013-07-19 11:55:56 +0000
16	+++ src/ubuntu-geoip-provider.c 2018-02-23 15:56:38 +0000
17	@@ -721,7 +721,7 @@
18	721	if (provider->priv->settings != NULL) {	721	if (provider->priv->settings != NULL) {
19	722	url = g_settings_get_string(provider->priv->settings, GEOIP_URL);	722	url = g_settings_get_string(provider->priv->settings, GEOIP_URL);
20	723	} else {	723	} else {
22	724	url = g_strdup("http://geoip.ubuntu.com/lookup");	724	url = g_strdup("https://geoip.ubuntu.com/lookup");
23	725	}	725	}
24	726	g_debug("Using GeoIP URL: %s", url);	726	g_debug("Using GeoIP URL: %s", url);
25	727		727