diff options
| -rw-r--r-- | calendar/ChangeLog | 20 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-editor.c | 10 | ||||
| -rw-r--r-- | calendar/gui/event-editor.c | 28 | ||||
| -rw-r--r-- | calendar/pcs/query.c | 4 |
4 files changed, 53 insertions, 9 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0e9fe4d0b4..8b063690a9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,23 @@ +2001-04-17 Federico Mena Quintero <federico@ximian.com> + + * gui/event-editor.c (init_widgets): Connect to the "changed" + signal of the categories entry so that they will be applied + correctly. + (EventEditorPrivate): Added fields for the contacts button and + entry. + (init_widgets): Disable the contacts widgets as we do not support + them yet. + (get_widgets): Get the contacts widgets. + + * gui/dialogs/task-editor.c (get_widgets): Get the contacts + button, which was missing. + (init_widgets): Disable the contacts widgets as we do not support + them yet. + + * pcs/query.c (matches_text_list): Use e_utf8_strstrcasedecomp() + instead of plain e_utf8_strstrcase(). + (matches_summary): Likewise. + 2001-04-17 JP Rosevear <jpr@ximian.com> * cal-util/cal-component.c (cal_component_alarm_set_action): the diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 30e5987eea..1aa484399f 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -82,7 +82,9 @@ typedef struct { GtkWidget *classification_private; GtkWidget *classification_confidential; + GtkWidget *contacts_btn; GtkWidget *contacts; + GtkWidget *categories_btn; GtkWidget *categories; @@ -379,7 +381,9 @@ get_widgets (TaskEditor *tedit) priv->classification_private = GW ("classification-private"); priv->classification_confidential = GW ("classification-confidential"); + priv->contacts_btn = GW ("contacts-button"); priv->contacts = GW ("contacts"); + priv->categories_btn = GW ("categories-button"); priv->categories = GW ("categories"); @@ -399,6 +403,7 @@ get_widgets (TaskEditor *tedit) && priv->classification_private && priv->classification_confidential && priv->description + && priv->contacts_btn && priv->contacts && priv->categories_btn && priv->categories @@ -465,6 +470,11 @@ init_widgets (TaskEditor *tedit) /* Button clicks */ gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked", GTK_SIGNAL_FUNC (categories_clicked), tedit); + + /* FIXME: we do not support these fields yet, so we disable them */ + + gtk_widget_set_sensitive (priv->contacts_btn, FALSE); + gtk_widget_set_sensitive (priv->contacts, FALSE); } static void diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 352858acb8..07fe04d992 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -141,6 +141,9 @@ struct _EventEditorPrivate { GtkWidget *classification_private; GtkWidget *classification_confidential; + GtkWidget *contacts; + GtkWidget *contacts_btn; + GtkWidget *categories; GtkWidget *categories_btn; @@ -965,8 +968,11 @@ get_widgets (EventEditor *ee) priv->classification_private = GW ("classification-private"); priv->classification_confidential = GW ("classification-confidential"); - priv->categories = GW ("categories"); + priv->contacts_btn = GW ("contacts-button"); + priv->contacts = GW ("contacts"); + priv->categories_btn = GW ("categories-button"); + priv->categories = GW ("categories"); priv->reminder_summary = GW ("reminder-summary"); priv->reminder_starting_date = GW ("reminder-starting-date"); @@ -1015,6 +1021,10 @@ get_widgets (EventEditor *ee) && priv->classification_public && priv->classification_private && priv->classification_confidential + && priv->contacts_btn + && priv->contacts + && priv->categories_btn + && priv->categories && priv->reminder_summary && priv->reminder_starting_date && priv->reminder_list @@ -1242,15 +1252,19 @@ init_widgets (EventEditor *ee) GTK_SIGNAL_FUNC (field_changed), ee); gtk_signal_connect (GTK_OBJECT (priv->description), "changed", GTK_SIGNAL_FUNC (field_changed), ee); - gtk_signal_connect (GTK_OBJECT (priv->classification_public), - "toggled", + gtk_signal_connect (GTK_OBJECT (priv->classification_public), "toggled", GTK_SIGNAL_FUNC (field_changed), ee); - gtk_signal_connect (GTK_OBJECT (priv->classification_private), - "toggled", + gtk_signal_connect (GTK_OBJECT (priv->classification_private), "toggled", GTK_SIGNAL_FUNC (field_changed), ee); - gtk_signal_connect (GTK_OBJECT (priv->classification_confidential), - "toggled", + gtk_signal_connect (GTK_OBJECT (priv->classification_confidential), "toggled", GTK_SIGNAL_FUNC (field_changed), ee); + gtk_signal_connect (GTK_OBJECT (priv->categories), "changed", + GTK_SIGNAL_FUNC (field_changed), ee); + + /* FIXME: we do not support these fields yet, so we disable them */ + + gtk_widget_set_sensitive (priv->contacts_btn, FALSE); + gtk_widget_set_sensitive (priv->contacts, FALSE); } static const int classification_map[] = { diff --git a/calendar/pcs/query.c b/calendar/pcs/query.c index 48e77d216a..ed391ee667 100644 --- a/calendar/pcs/query.c +++ b/calendar/pcs/query.c @@ -513,7 +513,7 @@ matches_text_list (GSList *text_list, const char *str) text = l->data; g_assert (text->value != NULL); - if (e_utf8_strstrcase (text->value, str) != NULL) { + if (e_utf8_strstrcasedecomp (text->value, str) != NULL) { matches = TRUE; break; } @@ -561,7 +561,7 @@ matches_summary (CalComponent *comp, const char *str) if (!text.value) return FALSE; - return e_utf8_strstrcase (text.value, str) != NULL; + return e_utf8_strstrcasedecomp (text.value, str) != NULL; } /* Returns whether any text field in a component matches the specified string */ |