Merge from master

1 files changed, 29 insertions, 4 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 3256e39780..3b5402b4a6 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -39,6 +39,8 @@
 
 #define APPLICATION_ID "org.gnome.EvolutionAlarmNotify"
 
+#define APPLICATION_ID "org.gnome.EvolutionAlarmNotify"
+
 struct _AlarmNotifyPrivate {
 	/* Mapping from EUri's to LoadedClient structures */
 	/* FIXME do we need per source type uri hashes? or perhaps we
@@ -55,7 +57,13 @@ typedef struct {
 	GList *removals;
 } ProcessRemovalsData;
 
-G_DEFINE_TYPE (AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION)
+/* Forward Declarations */
+static void	alarm_notify_initable_init	(GInitableIface *interface);
+
+G_DEFINE_TYPE_WITH_CODE (
+	AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION,
+	G_IMPLEMENT_INTERFACE (
+		G_TYPE_INITABLE, alarm_notify_initable_init))
 
 static void
 process_removal_in_hash (const gchar *uri,
@@ -264,6 +272,15 @@ alarm_notify_activate (GApplication *application)
 	 * if there are no handlers connected to this signal. */
 }
 
+static gboolean
+alarm_notify_initable (GInitable *initable,
+                       GCancellable *cancellable,
+                       GError **error)
+{
+	/* XXX Just return TRUE for now.  We'll have use for this soon. */
+	return TRUE;
+}
+
 static void
 alarm_notify_class_init (AlarmNotifyClass *class)
 {
@@ -281,6 +298,13 @@ alarm_notify_class_init (AlarmNotifyClass *class)
 }
 
 static void
+alarm_notify_initable_init (GInitableIface *interface)
+{
+	/* XXX Awkward name since we're missing an 'E' prefix. */
+	interface->init = alarm_notify_initable;
+}
+
+static void
 alarm_notify_init (AlarmNotify *an)
 {
 	gint ii;
@@ -317,10 +341,11 @@ alarm_notify_get_selected_calendars (AlarmNotify *an)
  * Returns: a newly-created #AlarmNotify
  **/
 AlarmNotify *
-alarm_notify_new (void)
+alarm_notify_new (GCancellable *cancellable,
+                  GError **error)
 {
-	return g_object_new (
-		TYPE_ALARM_NOTIFY,
+	return g_initable_new (
+		TYPE_ALARM_NOTIFY, cancellable, error,
 		"application-id", APPLICATION_ID, NULL);
 }