aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGediminas Paulauskas <menesis@delfi.lt>2001-04-11 04:55:52 +0800
committerGediminas Paulauskas <menesis@src.gnome.org>2001-04-11 04:55:52 +0800
commit0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14 (patch)
tree48ffe33cefbe5ae8413de5a5fc0094683a7a23a4
parenteee943f21ebc92e70cec963950c2fc0a29cab544 (diff)
downloadgsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar.gz
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar.bz2
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar.lz
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar.xz
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.tar.zst
gsoc2013-evolution-0b90b0b1e8ffd8a9cbed8d9618bf9e8731681a14.zip
i18n fixes.
i18n fixes. 2001-04-10 Gediminas Paulauskas <menesis@delfi.lt> * gal/widgets/e-unicode.c (e_utf8_*_*_string): if (!string) return NULL; to avoid crashes in strlen(NULL). TODO: need g_strlen which does that. 2001-04-10 Gediminas Paulauskas <menesis@delfi.lt> * e-table.c (et_real_construct): convert click_to_add_message locale->utf8. svn path=/trunk/; revision=9214
-rw-r--r--widgets/misc/e-unicode.c4
-rw-r--r--widgets/table/e-table.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 4d78d17788..fe16cb2102 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -283,6 +283,7 @@ e_utf8_from_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes
gchar *
e_utf8_from_gtk_string (GtkWidget *widget, const gchar *string)
{
+ if (!string) return NULL;
return e_utf8_from_gtk_string_sized (widget, string, strlen (string));
}
@@ -357,6 +358,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
gchar *
e_utf8_to_gtk_string (GtkWidget *widget, const gchar *string)
{
+ if (!string) return NULL;
return e_utf8_to_gtk_string_sized (widget, string, strlen (string));
}
@@ -416,6 +418,7 @@ e_utf8_from_locale_string_sized (const gchar *string, gint bytes)
gchar *
e_utf8_from_locale_string (const gchar *string)
{
+ if (!string) return NULL;
return e_utf8_from_locale_string_sized (string, strlen (string));
}
@@ -480,6 +483,7 @@ e_utf8_to_locale_string_sized (const gchar *string, gint bytes)
gchar *
e_utf8_to_locale_string (const gchar *string)
{
+ if (!string) return NULL;
return e_utf8_to_locale_string_sized (string, strlen (string));
}
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index febdfec56a..636b3f59b6 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -965,7 +965,7 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
ete = e_table_extras_new();
e_table->use_click_to_add = specification->click_to_add;
- e_table->click_to_add_message = g_strdup (gettext (specification->click_to_add_message));
+ e_table->click_to_add_message = e_utf8_from_locale_string (gettext (specification->click_to_add_message));
e_table->horizontal_draw_grid = specification->horizontal_draw_grid;
e_table->vertical_draw_grid = specification->vertical_draw_grid;
e_table->draw_focus = specification->draw_focus;