diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-02 16:25:03 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2002-11-02 16:25:03 +0800 |
| commit | 9c73777f2268b5bf2622f893e2a3ba7d0f720572 (patch) | |
| tree | f81b79f19b87f84b4429d329b3fc0f9ff7946060 /widgets/misc/e-charset-picker.c | |
| parent | 236c15d106b4e740d4e3996e0649334ca8e13876 (diff) | |
| download | gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.gz gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.tar.zst gsoc2013-evolution-9c73777f2268b5bf2622f893e2a3ba7d0f720572.zip | |
First big sync of my GNOME 2 porting work (incomplete, and still
pretty broken).
Weeeeee!
svn path=/trunk/; revision=18503
Diffstat (limited to 'widgets/misc/e-charset-picker.c')
| -rw-r--r-- | widgets/misc/e-charset-picker.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c index 5c8751149e..f2ffb3a5ef 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -24,18 +24,18 @@ #include "e-charset-picker.h" #include <gal/widgets/e-gui-utils.h> -#include <gal/unicode/gunicode.h> #include <iconv.h> +#include <gtk/gtkvbox.h> #include <gtk/gtklabel.h> #include <gtk/gtkmenuitem.h> #include <gtk/gtkoptionmenu.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-defs.h> -#include <libgnome/gnome-i18n.h> + #include <libgnomeui/gnome-dialog-util.h> -#include <libgnomeui/gnome-stock.h> +#include <libgnome/gnome-i18n.h> + #include <bonobo/bonobo-ui-node.h> #include <bonobo/bonobo-ui-util.h> @@ -240,7 +240,7 @@ e_charset_picker_new (const char *default_charset) { GtkWidget *menu, *item; int def, i; - char *locale_charset; + const char *locale_charset; g_get_charset (&locale_charset); if (!g_strcasecmp (locale_charset, "US-ASCII")) @@ -382,7 +382,8 @@ e_charset_picker_bonobo_ui_populate (BonoboUIComponent *uic, const char *path, const char *default_charset, BonoboUIListenerFn cb, gpointer user_data) { - char *locale_charset, *encoded_label, *label; + char *encoded_label, *label; + const char *locale_charset; GString *menuitems; int def, i; |