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

[Jim Nelson <jnelson src gnome org>]

commit 614fe026e0ef4eded4d0a468d57f0b3454b1df33
Merge: 614d8b7 58d95ec
Author: Jim Nelson <jim yorba org>
Date:   Fri Aug 8 11:44:01 2014 -0700

    Merge branch 'master' into wip/732029-gtk-312
    
    Conflicts:
        src/Makefile.am

 configure.ac                                       |   13 ++
 data/org.yorba.california.gschema.xml              |    4 +-
 po/POTFILES.in                                     |    7 +-
 po/POTFILES.skip                                   |    8 +-
 po/es.po                                           |  121 ++++++++++++--------
 po/sl.po                                           |    2 +-
 src/Makefile.am                                    |   26 +++--
 src/activator/activator.vala                       |    5 +-
 .../caldav/caldav-activator-instance.vala          |   27 +++++
 src/activator/caldav/caldav-subscribe.vala         |   31 +++++
 .../generic-subscribe.vala}                        |   48 +++++----
 ...-google.vala => google-activator-instance.vala} |   14 +-
 ...g-pane.vala => google-authenticating-pane.vala} |    8 +-
 ...st-pane.vala => google-calendar-list-pane.vala} |    6 +-
 ...ogle-login-pane.vala => google-login-pane.vala} |   15 +--
 ...-webcal.vala => webcal-activator-instance.vala} |   14 +--
 src/activator/webcal/webcal-subscribe.vala         |   31 +++++
 src/application/california-settings.vala           |   15 +++-
 src/calendar/calendar-first-of-week.vala           |    9 ++-
 src/calendar/calendar-system.vala                  |   82 ++++++++++++-
 src/california-resources.xml                       |    6 +-
 src/host/host-create-update-event.vala             |    7 +-
 src/host/host-date-time-widget.vala                |   23 +++-
 src/host/host-quick-create-event.vala              |    4 +-
 .../{webcal-subscribe.ui => generic-subscribe.ui}  |   64 ++++++++---
 src/rc/google-calendar-list.ui                     |    6 +-
 src/rc/google-login.ui                             |   17 ++-
 src/toolkit/toolkit-button-connector.vala          |   12 +-
 .../toolkit-entry-clear-text-connector.vala        |   30 ++++--
 src/util/util-uri.vala                             |   24 +---
 src/view/week/week-day-pane.vala                   |   39 ++++++-
 vapi/langinfo.vapi                                 |  100 ++++++++++++++++
 32 files changed, 619 insertions(+), 199 deletions(-)
---
diff --cc src/Makefile.am
index f3006d1,6dde145..4dfa1eb
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -203,6 -207,14 +208,10 @@@ if ENABLE_UNIT
  california_OPTIONAL_VALAFLAGS += --define ENABLE_UNITY
  endif
  
 -if IS_GTK_312
 -california_OPTIONAL_VALAFLAGS += --define GTK_312
 -endif
 -
+ if HAVE__NL_TIME_FIRST_WEEKDAY
+ california_OPTIONAL_VALAFLAGS += --define HAVE__NL_TIME_FIRST_WEEKDAY
+ endif
+ 
  california_VALAFLAGS = \
        --fatal-warnings --debug --enable-checking --vapidir $(top_srcdir)/vapi --target-glib=2.38 \
        --enable-deprecated \
diff --cc src/toolkit/toolkit-entry-clear-text-connector.vala
index 410ee32,da881ee..d38f04c
--- a/src/toolkit/toolkit-entry-clear-text-connector.vala
+++ b/src/toolkit/toolkit-entry-clear-text-connector.vala
@@@ -12,20 -12,32 +12,32 @@@ namespace California.Toolkit 
   */
  
  public class EntryClearTextConnector : BaseObject {
-     public Gtk.Entry entry { get; private set; }
+     private Gee.HashMap<Gtk.Entry, Binding> entries = new Gee.HashMap<Gtk.Entry, Binding>();
      
-     private Binding text_binding;
+     public EntryClearTextConnector() {
+     }
+     
+     ~EntryClearTextConnector() {
+         traverse_safely<Gtk.Entry>(entries.keys).iterate(disconnect_from);
+     }
      
-     public EntryClearTextConnector(Gtk.Entry entry) {
-         this.entry = entry;
+     public void connect_to(Gtk.Entry entry) {
+         if (entries.has_key(entry))
+             return;
          
-         text_binding = entry.bind_property("text", entry, "secondary-icon-name", BindingFlags.SYNC_CREATE,
+         Binding binding = entry.bind_property("text", entry, "secondary-icon-name", 
BindingFlags.SYNC_CREATE,
              transform_text_to_icon_name);
          entry.icon_release.connect(on_entry_icon_released);
+         
+         entries.set(entry, binding);
      }
      
-     ~EntryClearTextConnector() {
-         text_binding.unref();
+     public void disconnect_from(Gtk.Entry entry) {
+         Binding binding;
+         if (!entries.unset(entry, out binding))
+             return;
+         
 -        binding.unbind();
++        California.BaseObject.unbind_property(ref binding);
          entry.icon_release.disconnect(on_entry_icon_released);
      }