diff options
| -rw-r--r-- | calendar/gui/control-factory.c | 1 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 5 | ||||
| -rw-r--r-- | calendar/gui/evolution-calendar-control.c | 1 | ||||
| -rw-r--r-- | calendar/gui/tasks-control.c | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c index 32b596dde3..8788a19c58 100644 --- a/calendar/gui/control-factory.c +++ b/calendar/gui/control-factory.c @@ -127,6 +127,7 @@ calendar_properties_init (GnomeCalendar *gcal, BonoboControl *control) 0); bonobo_control_set_properties (control, pbag); + bonobo_object_unref (BONOBO_OBJECT (pbag)); } /* Callback factory function for calendar controls */ diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 5e7df6b35c..473e033709 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -1038,13 +1038,14 @@ e_itip_control_factory (BonoboGenericFactory *Factory, void *closure) /* create a property bag */ prop_bag = bonobo_property_bag_new ( get_prop, set_prop, priv ); - bonobo_control_set_properties (control, prop_bag); - bonobo_property_bag_add (prop_bag, "from_address", FROM_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL, "from_address", 0 ); bonobo_property_bag_add (prop_bag, "my_address", MY_ADDRESS_ARG_ID, BONOBO_ARG_STRING, NULL, "my_address", 0 ); + bonobo_control_set_properties (control, prop_bag); + bonobo_object_unref (BONOBO_OBJECT (prop_bag)); + bonobo_control_set_automerge (control, TRUE); stream = bonobo_persist_stream_new (pstream_load, pstream_save, diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c index 7ebe2b5f8e..273c68533c 100644 --- a/calendar/gui/evolution-calendar-control.c +++ b/calendar/gui/evolution-calendar-control.c @@ -132,6 +132,7 @@ calendar_properties_init (GnomeCalendar *gcal) 0); bonobo_control_set_property_bag (gcal->control, gcal->properties); + bonobo_object_unref (BONOBO_OBJECT (pbag)); } diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index eb99241262..d3154de0d6 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -109,6 +109,7 @@ tasks_control_properties_init (BonoboControl *control, 0); bonobo_control_set_properties (control, pbag); + bonobo_object_unref (BONOBO_OBJECT (pbag)); } |