Fixes #52970

2004-02-04  Rodrigo Moya <rodrigo@ximian.com>

	Fixes #52970

	* idl/evolution-calendar.idl: added back the AlarmNotify interface.

	* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in:
	changed to have the AlarmNotify component be created via a factory.

	* gui/alarm-notify/alarm-notify.[ch]: converted to implement the
	AlarmNotify interface.

	* gui/alarm-notify/notify-main.c (main): register the factory with
	bonobo_generic_factory_new, not the object itself. Removed redundant
	call to bonobo_object_unref. Call e_passwords_shutdown on exit.

	* gui/alarm-notify/config-data.c (config_data_get_calendars_to_load):
	get only the selected calendars/task lists.

svn path=/trunk/; revision=24613

1 files changed, 5 insertions, 22 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 4b956ec93c..84159e562c 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -23,6 +23,7 @@
 #endif
 
 #include <string.h>
+#include <bonobo/bonobo-main.h>
 #include <libecal/e-cal.h>
 #include "alarm-notify.h"
 #include "alarm-queue.h"
@@ -48,27 +49,7 @@ static BonoboObjectClass *parent_class;
 
 
 
-GType
-alarm_notify_get_type (void)
-{
-	static GType type = 0;
-                                                                                
-        if (!type) {
-                static GTypeInfo info = {
-                        sizeof (AlarmNotifyClass),
-                        (GBaseInitFunc) NULL,
-                        (GBaseFinalizeFunc) NULL,
-                        (GClassInitFunc) alarm_notify_class_init,
-                        NULL, NULL,
-                        sizeof (AlarmNotify),
-                        0,
-                        (GInstanceInitFunc) alarm_notify_init
-                };
-                type = g_type_register_static (G_TYPE_OBJECT, "AlarmNotify", &info, 0);
-        }
-
-        return type;
-}
+BONOBO_TYPE_FUNC_FULL(AlarmNotify, GNOME_Evolution_Calendar_AlarmNotify, BONOBO_TYPE_OBJECT, alarm_notify)
 
 /* Class initialization function for the alarm notify service */
 static void
@@ -142,7 +123,9 @@ alarm_notify_new (void)
 {
 	AlarmNotify *an;
 
-	an = g_object_new (TYPE_ALARM_NOTIFY, NULL);
+	an = g_object_new (TYPE_ALARM_NOTIFY,
+			   "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL),
+			   NULL);
 	return an;
 }