Commit 50b1a5a9 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Use g_get_charset() instead of g_get_codeset().

Mon Jul  3 17:08:14 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
	Use g_get_charset() instead of g_get_codeset().

	* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
	Comment out some strdup'ing functions to keep timj
	happy until we finish fighting this out.
parent 01212ce1
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
Mon Jul 3 17:08:14 2000 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale):
Use g_get_charset() instead of g_get_codeset().
* gtk/gtkframe.[ch] gtkframe.h gtk/gtktextmark.h:
Comment out some strdup'ing functions to keep timj
happy until we finish fighting this out.
Mon Jul 3 14:24:16 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkwidget.c (gtk_widget_draw): Ignore calls with
......
......@@ -150,11 +150,14 @@ gdk_font_charset_for_locale ()
{ "ISO-8859-7", "iso8859-7" },
{ "ISO-8859-8", "iso8859-8" },
{ "ISO-8859-9", "iso8859-9" },
{ "UTF-8", "iso8859-1" }
};
char *codeset = g_get_codeset ();
char *codeset;
char *result = NULL;
int i;
g_get_charset (&codeset);
for (i=0; i < G_N_ELEMENTS (charset_map); i++)
if (strcmp (charset_map[i][0], codeset) == 0)
......@@ -163,8 +166,6 @@ gdk_font_charset_for_locale ()
break;
}
g_free (codeset);
if (result)
return g_strdup (result);
else
......
......@@ -72,6 +72,12 @@ static void gtk_frame_real_compute_child_allocation (GtkFrame *frame,
static GtkBinClass *parent_class = NULL;
/* Here until I convince timj about memory management behavior
*/
gchar * gtk_frame_get_label (GtkFrame *frame);
gchar * gtk_label_get_text (GtkLabel *label);
GtkType
gtk_frame_get_type (void)
{
......
......@@ -72,7 +72,8 @@ GtkType gtk_frame_get_type (void);
GtkWidget* gtk_frame_new (const gchar *label);
void gtk_frame_set_label (GtkFrame *frame,
const gchar *label);
gchar * gtk_frame_get_label (GtkFrame *frame);
/* Temporarily commented out until memory management behavior is figured out */
/* gchar * gtk_frame_get_label (GtkFrame *frame); */
void gtk_frame_set_label_widget (GtkFrame *frame,
GtkWidget *title_widget);
void gtk_frame_set_label_align (GtkFrame *frame,
......
......@@ -72,7 +72,7 @@ GtkType gtk_label_get_type (void);
GtkWidget *gtk_label_new (const char *str);
void gtk_label_set_text (GtkLabel *label,
const char *str);
gchar * gtk_label_get_text (GtkLabel *label);
/* Temporarily commented out until memory management behavior is figured out *//* gchar * gtk_label_get_text (GtkLabel *label); */
void gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype);
void gtk_label_set_pattern (GtkLabel *label,
......
......@@ -13,7 +13,8 @@ void gtk_text_mark_set_visible (GtkTextMark *mark,
gboolean setting);
gboolean gtk_text_mark_is_visible (GtkTextMark *mark);
char * gtk_text_mark_get_name (GtkTextMark *mark);
/* Temporarily commented out until memory management behavior is figured out */
/* char * gtk_text_mark_get_name (GtkTextMark *mark); */
#ifdef __cplusplus
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment