diff options
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 9 | ||||
| -rw-r--r-- | calendar/gui/e-timezone-entry.c | 8 |
3 files changed, 21 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index b801b4cb9c..37963bafc8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2006-07-14 Arvind <sa.phoenix@gmail.com> + + ** Fix for bug#330633 + * gui/dialogs/event-page.c : Enabled save button when the timezone + is changed from an existing meeting/appointment + + * gui/e-timezone-entry.c : prevented the shrinking of the timezone + field when the timezone is set to the default timezone + 2006-06-14 Ushveen Kaur <kushveen@novell.com> ** Fixes bug #329772 diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 19ff6a60a3..7834c2b37e 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -513,6 +513,9 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD start_zone); event_page_set_show_timezone (epage, calendar_config_get_show_timezone() & !all_day_event); + /*unblock the endtimezone widget*/ + g_signal_handlers_unblock_matched (priv->end_timezone, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage); + gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->start_timezone), epage); @@ -2521,7 +2524,8 @@ start_timezone_changed_cb (GtkWidget *widget, gpointer data) if (priv->sync_timezones) { zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone)); priv->updating = TRUE; - e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->end_timezone), zone); + /*the earlier method caused an infinite recursion*/ + priv->end_timezone=priv->start_timezone; gtk_widget_show_all (priv->end_timezone); priv->updating = FALSE; } @@ -2988,6 +2992,9 @@ init_widgets (EventPage *epage) /* emit signal when the group is changed */ g_signal_connect((priv->source_selector),"changed",G_CALLBACK(field_changed_cb),epage); + /*call the field_changed_cb when the timezone is changed*/ + g_signal_connect((priv->start_timezone), "changed",G_CALLBACK (field_changed_cb), epage); + /* Set the default timezone, so the timezone entry may be hidden. */ zone = calendar_config_get_icaltimezone (); e_timezone_entry_set_default_timezone (E_TIMEZONE_ENTRY (priv->start_timezone), zone); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index e708a03618..04ee657f92 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -329,10 +329,10 @@ e_timezone_entry_set_entry (ETimezoneEntry *tentry) gtk_entry_set_text (GTK_ENTRY (priv->entry), name_buffer); - if (!priv->default_zone || (priv->zone != priv->default_zone)) - gtk_widget_show (priv->entry); - else - gtk_widget_hide (priv->entry); + /* do we need to hide the timezone entry at all? i know this overrules the previous case of hiding the timezone + * entry field when we select the default timezone + */ + gtk_widget_show (priv->entry); g_free (name_buffer); } |