[evolution-data-server/gnome-3-8] Bug #386113 - show custom alarm message in pop-up alerts

[Fabiano Fidêncio <ffidencio src gnome org>]

commit 86d11ac2e520cc205e0ead86fd2bde4e2a026270
Author: Fabiano Fidêncio <fidencio redhat com>
Date:   Mon Jul 22 16:31:24 2013 +0200

    Bug #386113 - show custom alarm message in pop-up alerts
    
    Enable this feature only for backends we are completely sure it works.
    Only enabled for local calendars (file backend) for now.

 calendar/backends/file/e-cal-backend-file.c |    6 +++++-
 calendar/libecal/e-cal-util.h               |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index f3d24aa..8454350 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -482,7 +482,11 @@ e_cal_backend_file_get_backend_property (ECalBackendSync *backend,
                                        CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
                                        CAL_STATIC_CAPABILITY_BULK_ADDS ","
                                        CAL_STATIC_CAPABILITY_BULK_MODIFIES ","
-                                       CAL_STATIC_CAPABILITY_BULK_REMOVES);
+                                       CAL_STATIC_CAPABILITY_BULK_REMOVES ","
+                                       /*
+                                        * This capability was added after the 3.8.0 release
+                                        */
+                                       "alarm-description");
        } else if (g_str_equal (prop_name, CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS) ||
                   g_str_equal (prop_name, CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS)) {
                /* A file backend has no particular email address associated
diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h
index 982a752..1496526 100644
--- a/calendar/libecal/e-cal-util.h
+++ b/calendar/libecal/e-cal-util.h
@@ -106,11 +106,11 @@ gboolean  e_cal_util_event_dates_match    (icalcomponent *icalcomp1,
 /**
  * CAL_STATIC_CAPABILITY_NO_ALARM_DESCRIPTION:
  *
- * Flag indicating that the backend does not support alarm description
+ * Flag indicating that the backend supports alarm description
  *
  * Since: 3.8
  */
-#define CAL_STATIC_CAPABILITY_NO_ALARM_DESCRIPTION     "no-alarm-description"
+#define CAL_STATIC_CAPABILITY_ALARM_DESCRIPTION                "alarm-description"
 
 /**
  * CAL_STATIC_CAPABILITY_NO_ALARM_AFTER_START: