[gnome-contacts] Contacts.ListPane: revert split between all and main contacts

[Erick Pérez Castellanos <erickpc src gnome org>]

commit 6e8656ec552891f00bbe4ac2892c619e14029a90
Author: Erick Pérez Castellanos <erick red gmail com>
Date:   Thu Aug 15 12:56:31 2013 -0400

    Contacts.ListPane: revert split between all and main contacts
    
    We finally decide this can be confusing, eventually we will
    migrate to a per account subsets

 src/app-menu.ui             |   13 -------------
 src/contacts-app.vala       |   10 ----------
 src/contacts-list-pane.vala |   13 ++++---------
 3 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/src/app-menu.ui b/src/app-menu.ui
index dfa85c5..b51a646 100644
--- a/src/app-menu.ui
+++ b/src/app-menu.ui
@@ -1,19 +1,6 @@
 <interface>
   <menu id="app-menu">
     <section>
-      <attribute name="label" translatable="yes">View</attribute>
-      <item>
-       <attribute name="action">app.view_subset</attribute>
-       <attribute name="target">main</attribute>
-       <attribute name="label" translatable="yes">Main contacts</attribute>
-      </item>
-      <item>
-       <attribute name="action">app.view_subset</attribute>
-       <attribute name="target">all</attribute>
-       <attribute name="label" translatable="yes">All contacts</attribute>
-      </item>
-    </section>
-    <section>
       <item>
        <attribute name="action">app.change_book</attribute>
        <attribute name="label" translatable="yes">_Change Address Book...</attribute>
diff --git a/src/contacts-app.vala b/src/contacts-app.vala
index 0b1ceb8..842155e 100644
--- a/src/contacts-app.vala
+++ b/src/contacts-app.vala
@@ -223,16 +223,6 @@ public class Contacts.App : Gtk.Application {
     this.add_action (action);
     this.add_accelerator ("<Primary>n", "app.new_contact", null);
 
-    var view_action = new GLib.SimpleAction.stateful ("view_subset", VariantType.STRING, settings.get_value 
("view-subset"));
-    this.add_action (view_action);
-    settings.changed["view-subset"].connect (() => {
-        view_action.set_state (settings.get_value ("view-subset"));
-        list_pane.refilter ();
-      });
-    view_action.activate.connect ((act, parameter) => {
-        settings.set_value ("view-subset", parameter);
-      });
-
     var builder = load_ui ("app-menu.ui");
     set_app_menu ((MenuModel)builder.get_object ("app-menu"));
 
diff --git a/src/contacts-list-pane.vala b/src/contacts-list-pane.vala
index 7535097..2df5245 100644
--- a/src/contacts-list-pane.vala
+++ b/src/contacts-list-pane.vala
@@ -50,15 +50,10 @@ public class Contacts.ListPane : Frame {
 
     contacts_view.set_filter_values (values);
 
-    var subset = App.app.settings.get_enum ("view-subset");
-    if (subset == View.Subset.MAIN) {
-      if (values == null)
-       contacts_view.set_show_subset (View.Subset.MAIN);
-      else
-       contacts_view.set_show_subset (View.Subset.ALL_SEPARATED);
-    } else {
-       contacts_view.set_show_subset (View.Subset.ALL);
-    }
+    if (values == null)
+      contacts_view.set_show_subset (View.Subset.ALL);
+    else
+      contacts_view.set_show_subset (View.Subset.ALL_SEPARATED);
   }
 
   private bool filter_entry_changed_timeout () {