aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/e-unicode.c9
-rw-r--r--widgets/table/e-table-header-item.c7
2 files changed, 11 insertions, 5 deletions
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 26ac82db96..d84ed0e683 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -25,6 +25,8 @@
#include <gnome-xml/xmlmemory.h>
#include <stdlib.h>
+#define d(x) x
+
#define FONT_TESTING
#define MAX_DECOMP 8
@@ -326,6 +328,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
new[len++] = uc & 0xff;
}
new[len] = '\0';
+ d(printf("utf8_to_gtk: %s => %s\n", string, new));
return new;
}
@@ -356,6 +359,7 @@ e_utf8_to_gtk_string_sized (GtkWidget *widget, const gchar *string, gint bytes)
*ob = '\0';
+ d(printf("utf8_to_gtk: %s => %s\n", string, new));
return new;
}
@@ -514,7 +518,6 @@ e_utf8_gtk_editable_get_chars (GtkEditable *editable, gint start, gint end)
gchar *s, *u;
s = gtk_editable_get_chars (editable, start, end);
- if (!s) return NULL;
u = e_utf8_from_gtk_string ((GtkWidget *) editable, s);
g_free (s);
return u;
@@ -567,7 +570,7 @@ e_utf8_gtk_menu_item_new_with_label (GtkMenu *menu, const gchar *label)
s = e_utf8_to_gtk_string ((GtkWidget *) menu, label);
w = gtk_menu_item_new_with_label (s);
- if (s) g_free (s);
+ g_free (s);
return w;
}
@@ -2985,7 +2988,7 @@ e_xml_get_translated_utf8_string_prop_by_name (const xmlNode *parent, const xmlC
prop = xmlGetProp ((xmlNode *) parent, prop_name);
if (prop != NULL) {
- ret_val = e_utf8_from_locale_string (prop);
+ ret_val = g_strdup (prop);
xmlFree (prop);
return ret_val;
}
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 12f6c1f9db..35fb279b1c 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -8,20 +8,23 @@
* Copyright 1999, 2000, 2001 Ximian, Inc.
*/
#include <config.h>
+
+#include "e-table-header-item.h"
+
+#include <string.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkdnd.h>
-#include "gal/util/e-i18n.h"
#include <libgnomeui/gnome-canvas.h>
#include <libgnomeui/gnome-canvas-util.h>
#include <libgnomeui/gnome-canvas-polygon.h>
#include <libgnomeui/gnome-canvas-rect-ellipse.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gal/widgets/e-cursors.h"
+#include "gal/util/e-i18n.h"
#include "gal/util/e-xml-utils.h"
#include "gal/widgets/e-canvas.h"
#include "gal/widgets/e-popup-menu.h"
#include "e-table-header.h"
-#include "e-table-header-item.h"
#include "e-table-header-utils.h"
#include "e-table-col-dnd.h"
#include "e-table-defines.h"