aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/dialogs
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/dialogs')
-rw-r--r--calendar/gui/dialogs/task-editor.c50
1 files changed, 23 insertions, 27 deletions
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 1aa484399f..b21de4bd32 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -695,61 +695,57 @@ task_editor_focus (TaskEditor *tedit)
raise_and_focus (priv->app);
}
+#warning this is duplicated function from ../event-editor.c
/* Creates an appropriate title for the task editor dialog */
static char *
make_title_from_comp (CalComponent *comp)
{
- const char *summary;
+ char *title;
+ const char *type_string;
CalComponentVType type;
CalComponentText text;
if (!comp)
return g_strdup (_("Edit Task"));
- cal_component_get_summary (comp, &text);
- if (text.value)
- summary = text.value;
- else
- summary = _("No summary");
-
-
type = cal_component_get_vtype (comp);
switch (type) {
case CAL_COMPONENT_EVENT:
- return g_strdup_printf (_("Appointment - %s"), summary);
-
+ type_string = _("Appointment - %s");
+ break;
case CAL_COMPONENT_TODO:
- return g_strdup_printf (_("Task - %s"), summary);
-
+ type_string = _("Task - %s");
+ break;
case CAL_COMPONENT_JOURNAL:
- return g_strdup_printf (_("Journal entry - %s"), summary);
-
+ type_string = _("Journal entry - %s");
+ break;
default:
g_message ("make_title_from_comp(): Cannot handle object of type %d", type);
return NULL;
}
+
+ cal_component_get_summary (comp, &text);
+ if (text.value) {
+ char *summary;
+ summary = e_utf8_to_locale_string (text.value);
+ title = g_strdup_printf (type_string, summary);
+ g_free (summary);
+ } else
+ title = g_strdup_printf (type_string, _("No summary"));
+
+ return title;
}
/* Sets the event editor's window title from a calendar component */
static void
set_title_from_comp (TaskEditor *tedit, CalComponent *comp)
{
- TaskEditorPrivate *priv;
- char *title, *tmp;
-
- priv = tedit->priv;
+ TaskEditorPrivate *priv = tedit->priv;
+ char *title;
title = make_title_from_comp (comp);
- tmp = e_utf8_to_gtk_string (priv->app, title);
+ gtk_window_set_title (GTK_WINDOW (priv->app), title);
g_free (title);
-
- if (tmp) {
- gtk_window_set_title (GTK_WINDOW (priv->app), tmp);
- g_free (tmp);
- } else {
- g_message ("set_title_from_comp(): Could not convert the title from UTF8");
- gtk_window_set_title (GTK_WINDOW (priv->app), "");
- }
}
/* Fills the widgets with default values */