sync with trunk

3 files changed, 91 insertions, 14 deletions

diff --git a/src/date-time.cpp b/src/date-time.cpp
index e6d99cd..432d877 100644
--- a/src/date-time.cpp
+++ b/src/date-time.cpp
@@ -85,9 +85,15 @@ GDateTime* DateTime::get() const
 
 std::string DateTime::format(const std::string& fmt) const
 {
-    const auto str = g_date_time_format(get(), fmt.c_str());
-    std::string ret = str;
-    g_free(str);
+    std::string ret;
+
+    gchar* str = g_date_time_format(get(), fmt.c_str());
+    if (str)
+    {
+        ret = str;
+        g_free(str);
+    }
+
     return ret;
 }
 
diff --git a/src/planner-eds.cpp b/src/planner-eds.cpp
index 8bf4665..8eeca43 100644
--- a/src/planner-eds.cpp
+++ b/src/planner-eds.cpp
@@ -26,6 +26,7 @@
 #include <libecal/libecal.h>
 #include <libedataserver/libedataserver.h>
 
+#include <algorithm> // std::sort()
 #include <map>
 #include <set>
 
@@ -408,11 +409,17 @@ private:
         ***  walk through the sources to build the appointment list
         **/
 
-        std::shared_ptr<Task> main_task(new Task(this, func), [](Task* task){
+        auto task_deleter = [](Task* task){
+            // give the caller the (sorted) finished product
+            auto& a = task->appointments;
+            std::sort(a.begin(), a.end(), [](const Appointment& a, const Appointment& b){return a.begin < b.begin;});
+            task->func(a);
+            // we're done; delete the task
             g_debug("time to delete task %p", (void*)task);
-            task->func(task->appointments);
             delete task;
-        });
+        };
+
+        std::shared_ptr<Task> main_task(new Task(this, func), task_deleter);
 
         for (auto& kv : m_clients)
         {
@@ -517,8 +524,11 @@ private:
         e_cal_client_get_attachment_uris_finish(E_CAL_CLIENT(client), res, &uris, &error);
         if (error != nullptr)
         {
-            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED) &&
+                !g_error_matches(error, E_CLIENT_ERROR, E_CLIENT_ERROR_NOT_SUPPORTED))
+            {
                 g_warning("Error getting appointment uris: %s", error->message);
+            }
 
             g_error_free(error);
         }
diff --git a/src/snap.cpp b/src/snap.cpp
index f2d075a..5cf6063 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -27,6 +27,9 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
+#include <set>
+#include <string>
+
 #define ALARM_SOUND_FILENAME "/usr/share/sounds/ubuntu/stereo/phone-incoming-call.ogg"
 
 namespace unity {
@@ -169,12 +172,57 @@ void on_snap_dismiss(NotifyNotification*, gchar* /*action*/, gpointer gdata)
     data->dismiss(data->appointment);
 }
 
+void on_snap_closed(NotifyNotification*, gpointer)
+{
+    stop_alarm_sound();
+}
+
 void snap_data_destroy_notify(gpointer gdata)
 {
      delete static_cast<SnapData*>(gdata);
 }
 
-void show_snap_decision(SnapData* data)
+std::set<std::string> get_server_caps()
+{
+    std::set<std::string> caps_set;
+    auto caps_gl = notify_get_server_caps();
+    for(auto l=caps_gl; l!=nullptr; l=l->next)
+        caps_set.insert((const char*)l->data);
+    g_list_free_full(caps_gl, g_free);
+    return caps_set;
+}
+
+typedef enum
+{
+    // just a bubble... no actions, no audio
+    NOTIFY_MODE_BUBBLE,
+
+    // a snap decision popup dialog + audio
+    NOTIFY_MODE_SNAP
+}
+NotifyMode;
+
+NotifyMode get_notify_mode()
+{
+    static NotifyMode mode;
+    static bool mode_inited = false;
+
+    if (G_UNLIKELY(!mode_inited))
+    {
+        const auto caps = get_server_caps();
+
+        if (caps.count("actions"))
+            mode = NOTIFY_MODE_SNAP;
+        else
+            mode = NOTIFY_MODE_BUBBLE;
+
+        mode_inited = true;
+    }
+
+    return mode;
+}
+
+void show_notification (SnapData* data, NotifyMode mode)
 {
     const Appointment& appointment = data->appointment;
 
@@ -184,10 +232,14 @@ void show_snap_decision(SnapData* data)
     const gchar* icon_name = "alarm-clock";
 
     auto nn = notify_notification_new(title, body.c_str(), icon_name);
-    notify_notification_set_hint_string(nn, "x-canonical-snap-decisions", "true");
-    notify_notification_set_hint_string(nn, "x-canonical-private-button-tint", "true");
-    notify_notification_add_action(nn, "show", _("Show"), on_snap_show, data, nullptr);
-    notify_notification_add_action(nn, "dismiss", _("Dismiss"), on_snap_dismiss, data, nullptr);
+    if (mode == NOTIFY_MODE_SNAP)
+    {
+        notify_notification_set_hint_string(nn, "x-canonical-snap-decisions", "true");
+        notify_notification_set_hint_string(nn, "x-canonical-private-button-tint", "true");
+        notify_notification_add_action(nn, "show", _("Show"), on_snap_show, data, nullptr);
+        notify_notification_add_action(nn, "dismiss", _("Dismiss"), on_snap_dismiss, data, nullptr);
+        g_signal_connect(G_OBJECT(nn), "closed", G_CALLBACK(on_snap_closed), data);
+    }
     g_object_set_data_full(G_OBJECT(nn), "snap-data", data, snap_data_destroy_notify);
 
     GError * error = nullptr;
@@ -215,8 +267,17 @@ void notify(const Appointment& appointment,
     data->show = show;
     data->dismiss = dismiss;
 
-    play_alarm_sound();
-    show_snap_decision(data);
+    switch (get_notify_mode())
+    {
+        case NOTIFY_MODE_BUBBLE:
+            show_notification(data, NOTIFY_MODE_BUBBLE);
+            break;
+
+        default:
+            show_notification(data, NOTIFY_MODE_SNAP);
+            play_alarm_sound();
+            break;
+     }
 }
 
 } // unnamed namespace