callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug #330633

Browse Source 
svn path=/trunk/; revision=32312
This commit is contained in:
Srinivasa Ragavan
2006-07-14 06:36:34 +00:00
parent 8c444c6c0f
commit 48972c2dbe
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/ChangeLog
View File

@ -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

9
calendar/gui/dialogs/event-page.c
View File

@ -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);

8
calendar/gui/e-timezone-entry.c
View File

@ -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);
}