diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-04-27 17:34:11 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-28 20:04:23 +0800 |
| commit | 3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e (patch) | |
| tree | bbf9c71f4e335de9c46848078143e63710d627c3 /e-util | |
| parent | 27def41a24a01da596f585bc826e1c4fff7e1941 (diff) | |
| download | gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar.gz gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar.bz2 gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar.lz gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar.xz gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.tar.zst gsoc2013-evolution-3e2ea94186a231bfdd2f3cb33085b8442a7b6b1e.zip | |
Define .error files correctly and external-editor crash fix
** Fix for bug #561188
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 7 | ||||
| -rw-r--r-- | e-util/e-error.c | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 69db24d87d..77d035cccd 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,10 @@ +2009-04-27 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #561188 + + * e-error.c: (e_error_newv): Do not localize already localized text. + Use default title for empty titles too, not only for NULL titles. + 2009-04-24 Milan Crha <mcrha@redhat.com> ** Fix for bug #572348 diff --git a/e-util/e-error.c b/e-util/e-error.c index da4d034606..7c1248bb7b 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -507,8 +507,8 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) out = g_string_new(""); - if (e->title) { - ee_build_label(out, dgettext(table->translation_domain, e->title), args, FALSE); + if (e->title && *e->title) { + ee_build_label(out, e->title, args, FALSE); gtk_window_set_title((GtkWindow *)dialog, out->str); g_string_truncate(out, 0); } else @@ -517,19 +517,19 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap) if (e->primary) { g_string_append(out, "<span weight=\"bold\" size=\"larger\">"); - ee_build_label(out, dgettext(table->translation_domain, e->primary), args, TRUE); + ee_build_label(out, e->primary, args, TRUE); g_string_append(out, "</span>\n\n"); oerr = g_string_new(""); - ee_build_label(oerr, dgettext(table->translation_domain, e->primary), args, FALSE); + ee_build_label(oerr, e->primary, args, FALSE); perr = g_strdup (oerr->str); g_string_free (oerr, TRUE); } else perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog))); if (e->secondary) { - ee_build_label(out, dgettext(table->translation_domain, e->secondary), args, TRUE); + ee_build_label(out, e->secondary, args, TRUE); oerr = g_string_new(""); - ee_build_label(oerr, dgettext(table->translation_domain, e->secondary), args, TRUE); + ee_build_label(oerr, e->secondary, args, TRUE); serr = g_strdup (oerr->str); g_string_free (oerr, TRUE); } |