aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/main.c15
2 files changed, 16 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1bd2c7bf33..85f3b7661e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2003-02-26 Hans Petter Jansson <hpj@ximian.com>
+ This makes creating appointments and tasks from the "New" button work.
+
+ * gui/main.c (comp_editor_factory_fn): Doesn't need to take any args.
+ (factory): Add a handler for CompEditorFactory.
+
+2003-02-26 Hans Petter Jansson <hpj@ximian.com>
+
Fixes Ximian #37895.
* gui/e-day-view.c (e_day_view_destroy): g_object_unref () ->
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 592eeb9659..11837a37b3 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -52,11 +52,12 @@
#define FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_Factory"
-#define CALENDAR_COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"
-#define CALENDAR_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_Control"
-#define TASKS_CONTROL_ID "OAFIID:GNOME_Evolution_Tasks_Control"
-#define ITIP_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_iTip_Control"
-#define CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControl"
+#define CALENDAR_COMPONENT_ID "OAFIID:GNOME_Evolution_Calendar_ShellComponent"
+#define CALENDAR_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_Control"
+#define TASKS_CONTROL_ID "OAFIID:GNOME_Evolution_Tasks_Control"
+#define ITIP_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_iTip_Control"
+#define CONFIG_CONTROL_ID "OAFIID:GNOME_Evolution_Calendar_ConfigControl"
+#define COMP_EDITOR_FACTORY_ID "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory"
ECompEditorRegistry *comp_editor_registry = NULL;
@@ -68,7 +69,7 @@ static CompEditorFactory *comp_editor_factory = NULL;
* references a singleton service object.
*/
static BonoboObject *
-comp_editor_factory_fn (BonoboGenericFactory *factory, const char *id, void *data)
+comp_editor_factory_fn (void)
{
if (!comp_editor_factory) {
comp_editor_factory = comp_editor_factory_new ();
@@ -169,6 +170,8 @@ factory (BonoboGenericFactory *factory,
else
return BONOBO_OBJECT (cal_prefs_dialog_new ());
}
+ if (strcmp (component_id, COMP_EDITOR_FACTORY_ID) == 0)
+ return BONOBO_OBJECT (comp_editor_factory_fn ());
g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
return NULL;