diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/eventedit.c | 5 | ||||
| -rw-r--r-- | calendar/gui/eventedit.c | 5 |
3 files changed, 15 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 09636d0f9f..616db438da 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +1999-12-10 Russell Steinthal <rms39@columbia.edu> + + * eventedit.c (ee_create_ae): Fix sensitivity bug when used to + create default alarm box (widgets in that box should always be + sensitive, even if the enabled checkbutton is not set) + 1999-12-08 Eskil Heyn Olsen <deity@eskil.dk> * calendar-conduit-control-applet.c (setSettings): Capplets now @@ -22,6 +28,7 @@ * Makefile.am (Conduits_second_DATA): Also install .desktop files for conduit capplets in the gnome/apps menu dir. +>>>>>>> 1.252 1999-12-04 Eskil Heyn Olsen <deity@eskil.dk> * Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST. diff --git a/calendar/eventedit.c b/calendar/eventedit.c index 057c2652d2..5b45674d00 100644 --- a/calendar/eventedit.c +++ b/calendar/eventedit.c @@ -385,7 +385,10 @@ ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType t break; } - ee_alarm_setting (alarm, alarm->enabled); + if (control_sens) + ee_alarm_setting (alarm, alarm->enabled); + else + ee_alarm_setting (alarm, TRUE); } static GtkWidget * diff --git a/calendar/gui/eventedit.c b/calendar/gui/eventedit.c index 057c2652d2..5b45674d00 100644 --- a/calendar/gui/eventedit.c +++ b/calendar/gui/eventedit.c @@ -385,7 +385,10 @@ ee_create_ae (GtkTable *table, char *str, CalendarAlarm *alarm, enum AlarmType t break; } - ee_alarm_setting (alarm, alarm->enabled); + if (control_sens) + ee_alarm_setting (alarm, alarm->enabled); + else + ee_alarm_setting (alarm, TRUE); } static GtkWidget * |