aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/dialogs/calendar-setup.c9
2 files changed, 11 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1753233db9..bc5a1a8bca 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2008-03-27 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #517492
+
+ * gui/dialogs/calendar-setup.c: (calendar_setup_edit_calendar),
+ (calendar_setup_edit_task_list), (calendar_setup_edit_memo_list):
+ Set proper dialog caption with New or Properties.
+
+2008-03-27 Milan Crha <mcrha@redhat.com>
+
** Fix for bug #438613
* calendar.error.xml: New message "prompt-read-only-cal-editor".
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 3f6bcf4e45..26461060c4 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -474,10 +474,7 @@ calendar_setup_edit_calendar (struct _GtkWindow *parent, ESource *source, ESourc
target->source_type = E_CAL_SOURCE_TYPE_EVENT;
e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
- if (source)
- sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Calendar Properties"));
- else
- sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Calendar"));
+ sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Calendar Properties") : _("New Calendar"));
/* forces initial validation */
if (!sdialog->original_source)
@@ -533,7 +530,7 @@ calendar_setup_edit_task_list (struct _GtkWindow *parent, ESource *source)
target->source_type = E_CAL_SOURCE_TYPE_TODO;
e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
- sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("Task List Properties"));
+ sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Task List Properties") : _("New Task List"));
/* forces initial validation */
if (!sdialog->original_source)
@@ -589,7 +586,7 @@ calendar_setup_edit_memo_list (struct _GtkWindow *parent, ESource *source)
target->source_type = E_CAL_SOURCE_TYPE_JOURNAL;
e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
- sdialog->window = e_config_create_window ((EConfig *)ec, NULL, _("New Memo List"));
+ sdialog->window = e_config_create_window ((EConfig *)ec, NULL, source ? _("Memo List Properties") : _("New Memo List"));
/* forces initial validation */
if (!sdialog->original_source)