diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 18 | ||||
| -rw-r--r-- | calendar/conduits/calendar/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/conduits/todo/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 8 | ||||
| -rw-r--r-- | calendar/gui/itip-bonobo-control.c | 6 |
5 files changed, 27 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 57c238949e..8774dabca9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,21 @@ +2003-06-12 Jack Jia <jack.jia@sun.com> + + * gui/e-itip-control.c + (struct _EItipControlPrivate): switch the "view_only" arg to be an + int. + (init): ditto. + (e_itip_control_set_view_only): ditto. + (e_itip_control_get_view_only): ditto. + + * gui/itip-bonobo-control.c + (get_prop): switch BONOBO_ARG_SET_BOOLEAN to BONOBO_ARG_SET_INT. + (set_prop): switch BONOBO_ARG_GET_BOOLEAN to BONOBO_ARG_GET_INT. + (itip_bonobo_control_new): switch BONOBO_ARG_BOOLEAN to + BONOBO_ARG_INT. + + Function "bonobo_property_bag_client_set_value_gboolean" can not + work on solaris. + 2003-06-10 Bolian Yin <bolian.yin@sun.com> Fixes #44682, Shift+F10 to active popup menu on day/week view diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index ef68e17fcf..84efaaa23e 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -23,7 +23,7 @@ libecalendar_conduit_la_LIBADD = \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libwombat/libwombat-static.la \ - $(top_builddir)/e-util/libeconduit-static.la \ + $(top_builddir)/e-util/libeconduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-calendar.conduit: e-calendar.conduit.in Makefile diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 5ddc2b7c4e..43e3c5940b 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -23,7 +23,7 @@ libetodo_conduit_la_LIBADD = \ $(top_builddir)/libversit/libversit.la \ $(top_builddir)/libical/src/libical/libical-static.la \ $(top_builddir)/libwombat/libwombat-static.la \ - $(top_builddir)/e-util/libeconduit-static.la \ + $(top_builddir)/e-util/libeconduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) e-todo.conduit: e-todo.conduit.in Makefile diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 25a673c217..7ecd6f85a7 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -84,7 +84,7 @@ struct _EItipControlPrivate { gchar *delegator_address; gchar *delegator_name; gchar *my_address; - gboolean view_only; + gint view_only; gboolean destroyed; }; @@ -356,7 +356,7 @@ init (EItipControl *itip) priv->delegator_address = NULL; priv->delegator_name = NULL; priv->my_address = NULL; - priv->view_only = FALSE; + priv->view_only = 0; /* Html Widget */ priv->html = gtk_html_new (); @@ -1728,7 +1728,7 @@ e_itip_control_get_from_address (EItipControl *itip) } void -e_itip_control_set_view_only (EItipControl *itip, gboolean view_only) +e_itip_control_set_view_only (EItipControl *itip, gint view_only) { EItipControlPrivate *priv; @@ -1737,7 +1737,7 @@ e_itip_control_set_view_only (EItipControl *itip, gboolean view_only) priv->view_only = view_only; } -gboolean +gint e_itip_control_get_view_only (EItipControl *itip) { EItipControlPrivate *priv; diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c index 3f020afce4..1a0769ccec 100644 --- a/calendar/gui/itip-bonobo-control.c +++ b/calendar/gui/itip-bonobo-control.c @@ -199,7 +199,7 @@ get_prop (BonoboPropertyBag *bag, BONOBO_ARG_SET_STRING (arg, e_itip_control_get_from_address (itip)); break; case VIEW_ONLY_ARG_ID: - BONOBO_ARG_SET_BOOLEAN (arg, e_itip_control_get_view_only (itip)); + BONOBO_ARG_SET_INT (arg, e_itip_control_get_view_only (itip)); break; } } @@ -218,7 +218,7 @@ set_prop ( BonoboPropertyBag *bag, e_itip_control_set_from_address (itip, BONOBO_ARG_GET_STRING (arg)); break; case VIEW_ONLY_ARG_ID: - e_itip_control_set_view_only (itip, BONOBO_ARG_GET_BOOLEAN (arg)); + e_itip_control_set_view_only (itip, BONOBO_ARG_GET_INT (arg)); break; } } @@ -240,7 +240,7 @@ itip_bonobo_control_new (void) prop_bag = bonobo_property_bag_new (get_prop, set_prop, itip); 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, "view_only", VIEW_ONLY_ARG_ID, BONOBO_ARG_BOOLEAN, NULL, + bonobo_property_bag_add (prop_bag, "view_only", VIEW_ONLY_ARG_ID, BONOBO_ARG_INT, NULL, "view_only", 0 ); bonobo_control_set_properties (control, bonobo_object_corba_objref (BONOBO_OBJECT (prop_bag)), NULL); |