aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2002-05-07 05:41:33 +0800
committerChris Lahey <clahey@src.gnome.org>2002-05-07 05:41:33 +0800
commit77a58ee83cee5799021fedde99c641d52c59db28 (patch)
treeab4c76b62ce638458a1111a244418fa97ebe7302
parent65431a334743819884c494cc05ac2d8a43efff2f (diff)
downloadgsoc2013-evolution-77a58ee83cee5799021fedde99c641d52c59db28.tar.gz
gsoc2013-evolution-77a58ee83cee5799021fedde99c641d52c59db28.tar.zst
gsoc2013-evolution-77a58ee83cee5799021fedde99c641d52c59db28.zip
Change this directory to include the $(VERSION).
2002-05-06 Christopher James Lahey <clahey@ximian.com> * gal/widgets/Makefile.am (imagesdir): Change this directory to include the $(VERSION). * gal/widgets/e-reflow.c (set_empty): Don't switch from utf8 to widget encoding, since EText takes utf8. From art/ChangeLog: 2002-05-06 Christopher James Lahey <clahey@ximian.com> * Makefile.am (imagesdir): Change this directory to include the $(VERSION). svn path=/trunk/; revision=16697
-rw-r--r--widgets/misc/e-reflow.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 6b4ff4a416..051cb3d2ab 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -394,22 +394,19 @@ set_empty(EReflow *reflow)
if (reflow->count == 0) {
if (reflow->empty_text) {
if (reflow->empty_message) {
- char *empty_message = e_utf8_to_gtk_string (GTK_WIDGET (GNOME_CANVAS_ITEM (reflow)->canvas), reflow->empty_message);
gnome_canvas_item_set(reflow->empty_text,
"width", reflow->minimum_width,
- "text", empty_message,
+ "text", reflow->empty_message,
NULL);
e_canvas_item_move_absolute(reflow->empty_text,
reflow->minimum_width / 2,
0);
- g_free (empty_message);
} else {
gtk_object_destroy(GTK_OBJECT(reflow->empty_text));
reflow->empty_text = NULL;
}
} else {
if (reflow->empty_message) {
- char *empty_message = e_utf8_to_gtk_string (GTK_WIDGET (GNOME_CANVAS_ITEM (reflow)->canvas), reflow->empty_message);
reflow->empty_text =
gnome_canvas_item_new(GNOME_CANVAS_GROUP(reflow),
e_text_get_type(),
@@ -420,10 +417,9 @@ set_empty(EReflow *reflow)
"font_gdk", GTK_WIDGET(GNOME_CANVAS_ITEM(reflow)->canvas)->style->font,
"fill_color", "black",
"justification", GTK_JUSTIFY_CENTER,
- "text", empty_message,
+ "text", reflow->empty_message,
"draw_background", FALSE,
NULL);
- g_free (empty_message);
e_canvas_item_move_absolute(reflow->empty_text,
reflow->minimum_width / 2,
0);