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

[Jim Nelson <jnelson src gnome org>]

commit 5cf6aca5044996d916f50c8e0ae64c1a8969283b
Merge: 3e89904 2252d1b
Author: Jim Nelson <jim yorba org>
Date:   Thu Jul 17 14:02:16 2014 -0700

    Merge branch 'master' into wip/732029-gtk-312
    
    Conflicts:
        debian/control

 THANKS                                             |    1 +
 configure.ac                                       |    2 +-
 data/Makefile.am                                   |   10 +-
 ...ornia.appdata.xml => california.appdata.xml.in} |   22 +-
 debian/control                                     |    2 +-
 po/POTFILES.in                                     |    3 +
 po/cs.po                                           |  414 ++++++++----
 po/de.po                                           |  514 ++++++++++-----
 po/es.po                                           |  261 +++++---
 po/hu.po                                           |  687 ++++++++++++++++----
 po/pl.po                                           |  306 +++++++--
 src/Makefile.am                                    |    8 +
 src/activator/activator-instance-list.vala         |    2 +-
 .../activator-google-authenticating-pane.vala      |    7 +-
 .../activator-google-calendar-list-pane.vala       |   17 +-
 .../google/activator-google-login-pane.vala        |    2 +-
 src/activator/webcal/activator-webcal-pane.vala    |   16 +-
 .../backing-calendar-source-subscription.vala      |   94 +++-
 src/backing/backing-calendar-source.vala           |   57 ++-
 src/backing/backing-error.vala                     |    6 +-
 .../backing-eds-calendar-source-subscription.vala  |  195 ++++--
 src/backing/eds/backing-eds-calendar-source.vala   |  121 +++-
 src/backing/eds/backing-eds-store.vala             |    4 +-
 src/calendar/calendar-date.vala                    |   40 +-
 src/calendar/calendar-day-of-month.vala            |   10 +-
 src/calendar/calendar-day-of-week.vala             |   42 +-
 src/calendar/calendar-duration.vala                |   35 -
 src/calendar/calendar-system.vala                  |   19 +-
 src/calendar/calendar-week.vala                    |   16 +
 src/calendar/calendar.vala                         |   23 +-
 src/california-resources.xml                       |    3 +
 src/collection/collection-iterable.vala            |  185 +++++-
 src/collection/collection.vala                     |   14 +
 src/component/component-date-time.vala             |  114 +++-
 src/component/component-details-parser.vala        |  391 ++++++++++-
 src/component/component-event.vala                 |  127 +++-
 src/component/component-instance.vala              |  266 +++++++-
 src/component/component-recurrence-rule.vala       |  586 ++++++++++++++++
 src/component/component.vala                       |  132 ++++-
 src/host/host-create-update-event.vala             |  189 +++++-
 src/host/host-create-update-recurring.vala         |  585 ++++++++++++++++
 src/host/host-main-window.vala                     |   42 +-
 src/host/host-quick-create-event.vala              |   57 +-
 src/host/host-show-event.vala                      |  100 +++-
 src/manager/manager-calendar-list.vala             |    2 +-
 src/rc/create-update-event.ui                      |   66 +--
 src/rc/create-update-recurring.ui                  |  551 +++++++++++++++
 src/rc/show-event.ui                               |  305 ++++++---
 src/tests/tests-calendar-date.vala                 |  110 +++-
 src/tests/tests-iterable.vala                      |   45 ++
 src/tests/tests-quick-add-recurring.vala           |  715 ++++++++++++++++++++
 src/tests/tests-quick-add.vala                     |  115 ++++-
 src/tests/tests-string.vala                        |   18 +
 src/tests/tests.vala                               |    8 +-
 src/toolkit/toolkit-button-connector.vala          |   27 +-
 src/toolkit/toolkit-calendar-popup.vala            |   26 +-
 src/toolkit/toolkit-card.vala                      |   39 +-
 src/toolkit/toolkit-deck.vala                      |   40 +-
 src/toolkit/toolkit-rotating-button-box.vala       |   89 +++
 src/toolkit/toolkit-stack-model.vala               |   16 +-
 src/toolkit/toolkit.vala                           |   38 +
 src/unit-test/unit-test-harness.vala               |   12 +-
 src/util/util-numeric.vala                         |   17 +
 src/util/util-scheduled.vala                       |  195 ++++++
 src/util/util-string.vala                          |    4 +-
 src/view/common/common-events-cell.vala            |   10 +-
 src/view/month/month-grid.vala                     |    5 +-
 src/view/week/week-day-pane.vala                   |   43 +-
 src/view/week/week-grid.vala                       |   10 +-
 vapi/libecal-1.2.vapi                              |   56 +-
 vapi/libecal-1.2/libecal-1.2-custom.vala           |   18 +
 vapi/libecal-1.2/libecal-1.2.metadata              |   56 ++-
 vapi/libical.vapi                                  |   70 +-
 73 files changed, 7116 insertions(+), 1317 deletions(-)
---
diff --cc debian/control
index dbd7af0,aeaf13a..4c3eba4
--- a/debian/control
+++ b/debian/control
@@@ -5,8 -5,8 +5,8 @@@ Maintainer: Jim Nelson <jim yorba org
  Build-Depends: debhelper (>= 8),
   libgee-0.8-dev (>= 0.10.5),
   libglib2.0-dev (>= 2.38.0),
 - libgtk-3-dev (>= 3.10.7),
 + libgtk-3-dev (>= 3.12.3),
-  valac-0.22 (>= 0.21.1),
+  valac (>= 0.22.1),
   intltool,
   libecal1.2-dev (>= 3.8.5),
   libsoup2.4-dev (>= 2.44),
diff --cc src/host/host-main-window.vala
index 1e4dafd,a753a18..00eb985
--- a/src/host/host-main-window.vala
+++ b/src/host/host-main-window.vala
@@@ -353,7 -351,13 +353,11 @@@ public class MainWindow : Gtk.Applicati
              Toolkit.spin_event_loop();
          });
          
+         deck_window.deck.failure.connect((msg) => {
+             Application.instance.error_message(msg);
+         });
+         
          deck_window.show_all();
 -        deck_window.run();
 -        deck_window.destroy();
      }
      
      private void on_quick_create_event() {