preferences: remove location sources preferences

Not used anymore with Geoclue 2.

https://bugzilla.gnome.org/show_bug.cgi?id=706627

diff --git a/data/empathy.convert b/data/empathy.convert
index eabc9e488ca868c28fb26292320eb898039bd445..e1e2ac299cfa1c12f5388ea5973ce4241bea8d29 100644 (file)
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -54,8 +54,5 @@ close-main-window = /apps/empathy/hints/close_main_window
   
 [org.gnome.Empathy.location]
 publish = /apps/empathy/location/publish
-resource-network = /apps/empathy/location/resource_network
-resource-cell = /apps/empathy/location/resource_cell
-resource-gps = /apps/empathy/location/resource_gps
 reduce-accuracy = /apps/empathy/location/reduce_accuracy
 

diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index 9267cf848fd685fb684c76aacd7a5e6922ddb3c6..f695431afdd633d84fe9a75c7ffca8863db01a61 100644 (file)
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -256,21 +256,6 @@ present them to the user immediately.</description>
       <summary>Empathy can publish the user's location</summary>
       <description>Whether Empathy can publish the user's location to their contacts.</description>
     </key>
-    <key name="resource-network" type="b">
-      <default>true</default>
-      <summary>Empathy can use the network to guess the location</summary>
-      <description>Whether Empathy can use the network to guess the location.</description>
-    </key>
-    <key name="resource-cell" type="b">
-      <default>true</default>
-      <summary>Empathy can use the cellular network to guess the location</summary>
-      <description>Whether Empathy can use the cellular network to guess the location.</description>
-    </key>
-    <key name="resource-gps" type="b">
-      <default>false</default>
-      <summary>Empathy can use the GPS to guess the location</summary>
-      <description>Whether Empathy can use the GPS to guess the location.</description>
-    </key>
     <key name="reduce-accuracy" type="b">
       <default>true</default>
       <summary>Empathy should reduce the location's accuracy</summary>

diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 6f6fb3cf2409ac0cf4ed43d484420a1bcdadf546..5256ec0b3e15f0c9e59caa0844f10ba3bdc51a2b 100644 (file)
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -83,9 +83,6 @@ G_BEGIN_DECLS
 
 #define EMPATHY_PREFS_LOCATION_SCHEMA EMPATHY_PREFS_SCHEMA ".location"
 #define EMPATHY_PREFS_LOCATION_PUBLISH             "publish"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK    "resource-network"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_CELL       "resource-cell"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_GPS        "resource-gps"
 #define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     "reduce-accuracy"
 
 #define EMPATHY_PREFS_LOGGER_SCHEMA "org.freedesktop.Telepathy.Logger"

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index e37bc74753138c362179777c2aa373e5bf9e8b25..c05058b8d7ab5e04669c8246ce77d8220fcb006f 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -190,12 +190,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences,
 
        BIND_ACTIVE (loc, LOCATION_PUBLISH,
                     "checkbutton_location_publish");
-       BIND_ACTIVE (loc, LOCATION_RESOURCE_NETWORK,
-                    "checkbutton_location_resource_network");
-       BIND_ACTIVE (loc, LOCATION_RESOURCE_CELL,
-                    "checkbutton_location_resource_cell");
-       BIND_ACTIVE (loc, LOCATION_RESOURCE_GPS,
-                    "checkbutton_location_resource_gps");
        BIND_ACTIVE (loc, LOCATION_REDUCE_ACCURACY,
                     "checkbutton_location_reduce_accuracy");
 

diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index 6e146d35cc6788971e5e64ae95e3fb6c6ac08f51..9aa204fe7d9a587adb42f886afcacde17edd7d3a 100644 (file)
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -833,94 +833,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkFrame" id="frame5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkBox" id="vbox5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_gps">
-                        <property name="label" translatable="yes">_GPS</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_cell">
-                        <property name="label" translatable="yes">_Cellphone</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_network">
-                        <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Location sources:</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="position">4</property>