preferences: remove location sources preferences
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 2 Sep 2013 12:45:32 +0000 (14:45 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 3 Sep 2013 10:11:42 +0000 (12:11 +0200)
Not used anymore with Geoclue 2.

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

data/empathy.convert
data/org.gnome.Empathy.gschema.xml
libempathy/empathy-gsettings.h
src/empathy-preferences.c
src/empathy-preferences.ui

index eabc9e4..e1e2ac2 100644 (file)
@@ -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
 
index 9267cf8..f695431 100644 (file)
@@ -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>
index 6f6fb3c..5256ec0 100644 (file)
@@ -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"
index e37bc74..c05058b 100644 (file)
@@ -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");
 
index 6e146d3..9aa204f 100644 (file)
             <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>