diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 9 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0801c062f4..72e1c21696 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,12 @@ +2005-11-16 Irene Huang <Irene.Huang@sun.com> + + * gui/dialogs/cal-prefs-dialog.c: + (cal_prefs_dialog_url_add_clicked): Use strcmp instead of !=. + (cal_prefs_dialog_url_remove_clicked): + When new a dialog of confirm, set parent to + PREFS_WINDOW (dialog_data->page) + instead of using PREFS_WINDOW (dialog_data). + 2005-11-14 Srinivasa Ragavan <sragavan@novell.com> reviewed by: Chenthill Palanisamy <pchenthill@novell.com> diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index e2e57643b9..94eae52a37 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -90,7 +90,7 @@ static void show_fb_config (DialogData *dialog_data); GtkWidget *cal_prefs_dialog_create_time_edit (void); -#define PREFS_WINDOW(dialog_data) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (dialog_data), GTK_TYPE_WINDOW)) +#define PREFS_WINDOW(dialog_data) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (dialog_data->page), GTK_TYPE_WINDOW)) /** * cal_prefs_dialog_new: @@ -634,7 +634,7 @@ cal_prefs_dialog_url_add_clicked (GtkWidget *button, DialogData *dialog_data) dialog_data->url_editor = url_editor_dialog_new (dialog_data, url); - if (url->location != "") { + if (strcmp (url->location, "")) { gtk_list_store_append(GTK_LIST_STORE (model), &iter); gtk_list_store_set (GTK_LIST_STORE(model), &iter, URL_LIST_ENABLED_COLUMN, |