diff options
| -rw-r--r-- | calendar/ChangeLog | 10 | ||||
| -rw-r--r-- | calendar/gui/dialogs/delete-comp.c | 31 | ||||
| -rw-r--r-- | calendar/gui/event-editor.c | 6 |
3 files changed, 26 insertions, 21 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 70195341ef..afea681130 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,13 @@ +2001-04-11 Gediminas Paulauskas <menesis@delfi.lt> + + Display fixes, thanks to Kjartan for finding these. + + * gui/event-editor.c: use simple (not e_utf8_) gtk_clist_append for + strings which are never in utf-8. + * dialogs/delete-comp.c (delete_component_dialog): convert only + summary from utf-8 to gtk charset. Translated values are in correct + craset already. + 2001-04-04 Kjartan Maraas <kmaraas@gnome.org> * gui/calendar-commands.c: Fix headers. diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index bd70f6b261..f24c3493fb 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -62,29 +62,31 @@ delete_component_dialog (CalComponent *comp, GtkWidget *widget) vtype = cal_component_get_vtype (comp); cal_component_get_summary (comp, &summary); + tmp = e_utf8_to_gtk_string (widget, summary.value); + switch (vtype) { case CAL_COMPONENT_EVENT: - if (summary.value) + if (tmp) str = g_strdup_printf (_("Are you sure you want to delete the appointment " - "`%s'?"), summary.value); + "`%s'?"), tmp); else str = g_strdup (_("Are you sure you want to delete this " "untitled appointment?")); break; case CAL_COMPONENT_TODO: - if (summary.value) + if (tmp) str = g_strdup_printf (_("Are you sure you want to delete the task " - "`%s'?"), summary.value); + "`%s'?"), tmp); else str = g_strdup (_("Are you sure you want to delete this " "untitled task?")); break; case CAL_COMPONENT_JOURNAL: - if (summary.value) + if (tmp) str = g_strdup_printf (_("Are you sure you want to delete the journal entry " - "`%s'?"), summary.value); + "`%s'?"), tmp); else str = g_strdup (_("Are you sure want to delete this " "untitled journal entry?")); @@ -95,19 +97,12 @@ delete_component_dialog (CalComponent *comp, GtkWidget *widget) return FALSE; } - tmp = e_utf8_to_gtk_string (widget, str); + dialog = gnome_question_dialog_modal (str, NULL, NULL); + g_free (tmp); g_free (str); - if (tmp) { - dialog = gnome_question_dialog_modal (tmp, NULL, NULL); - g_free (tmp); - - if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) - return TRUE; - else - return FALSE; - } else { - g_message ("delete_component_dialog(): Could not convert the string from UTF8"); + if (gnome_dialog_run (GNOME_DIALOG (dialog)) == GNOME_YES) + return TRUE; + else return FALSE; - } } diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 314835c2c5..352858acb8 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -3022,7 +3022,7 @@ append_reminder (EventEditor *ee, CalComponentAlarm *alarm, ReminderStatus statu clist = GTK_CLIST (priv->reminder_list); c[0] = get_alarm_string (alarm); - i = e_utf8_gtk_clist_append (clist, c); + i = gtk_clist_append (clist, c); rdata = g_new (ReminderData, 1); rdata->status = status; @@ -3144,7 +3144,7 @@ append_exception (EventEditor *ee, time_t t) gtk_signal_handler_block_by_data (GTK_OBJECT (clist), ee); c[0] = get_exception_string (t); - i = e_utf8_gtk_clist_append (clist, c); + i = gtk_clist_append (clist, c); gtk_clist_set_row_data (clist, i, tt); @@ -3195,7 +3195,7 @@ recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee) t = gtk_clist_get_row_data (clist, sel); *t = e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_exception_date)); - e_utf8_gtk_clist_set_text (clist, sel, 0, get_exception_string (*t)); + gtk_clist_set_text (clist, sel, 0, get_exception_string (*t)); preview_recur (ee); } |