[california/wip/732029-gtk-312: 4/4] Merge branch 'master' into wip/732029-gtk-312

[Jim Nelson <jnelson src gnome org>]

commit 9d726f6c9929312239c51a4dc4419acdda859a4f
Merge: 614fe02 5e63ec6
Author: Jim Nelson <jim yorba org>
Date:   Fri Aug 8 16:11:02 2014 -0700

    Merge branch 'master' into wip/732029-gtk-312
    
    Conflicts:
        src/activator/activator-window.vala
        src/toolkit/toolkit-entry-clear-text-connector.vala

 THANKS                                      |    1 +
 california.doap                             |    6 +-
 src/Makefile.am                             |    1 -
 src/activator/activator-instance-list.vala  |    2 +-
 src/activator/activator-instance.vala       |    2 +-
 src/activator/activator-window.vala         |   37 --------
 src/activator/activator.vala                |   14 +++
 src/application/california-application.vala |    8 --
 src/collection/collection-iterable.vala     |   13 +++
 src/manager/manager-calendar-list.vala      |   39 ++++++++
 src/manager/manager-window.vala             |    1 +
 src/rc/activator-list.ui                    |    2 +-
 src/rc/app-menu.interface                   |    4 -
 src/rc/calendar-manager-list-item.ui        |    2 +
 src/rc/calendar-manager-list.ui             |  126 +++++++++++++++++++++++----
 src/rc/generic-subscribe.ui                 |   47 ++++------
 src/toolkit/toolkit-listbox-model.vala      |   10 ++
 17 files changed, 214 insertions(+), 101 deletions(-)
---
diff --cc src/manager/manager-window.vala
index 65a5d96,fe61b5e..08e3546
--- a/src/manager/manager-window.vala
+++ b/src/manager/manager-window.vala
@@@ -11,17 -11,26 +11,18 @@@ namespace California.Manager 
   */
  
  public class Window : Toolkit.DeckWindow {
 -    private static Manager.Window? instance = null;
 -    
      private CalendarList calendar_list = new CalendarList();
      
 -    private Window(Gtk.Window? parent) {
 -        base (parent, null);
 +    private Window(Gtk.Window? window) {
 +        base (window, null);
          
          deck.add_cards(iterate<Toolkit.Card>(calendar_list).to_array_list());
+         Activator.prepare_deck(deck, null);
      }
      
 -    public static void display(Gtk.Window? parent) {
 -        // only allow one instance at a time
 -        if (instance != null) {
 -            instance.present_with_time(Gdk.CURRENT_TIME);
 -            
 -            return;
 -        }
 +    public static void display(Gtk.Window? window) {
 +        Manager.Window instance = new Manager.Window(window);
          
 -        instance = new Manager.Window(parent);
          instance.show_all();
          instance.run();
          instance.destroy();