From 8cff9d33070545a1b3d5813f0119a91e7257e609 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 22 Mar 1998 00:07:53 +0000 Subject: Don't respond to drops when grab is in effect. (workaround) Sat Mar 21 19:07:01 1998 Owen Taylor * gtk/testgtk.c (dnd_drop): Don't respond to drops when grab is in effect. (workaround) * gdk/gdkfont.c (gdk_fontset_load): More details on error messages. * gdk/gdk.c: Translate va_list to XVaNestedList instead of just casting it. * gtk/gtkmain.c: Make temporary copy of string returned by setlocale, since it may be changed by subsequent calls. --- gtk/gtkmain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gtk/gtkmain.c') diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 1df42ad341..84385a5082 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -265,7 +265,7 @@ gtk_init (int *argc, * C locale, or were using X's mb functions. (-DX_LOCALE && locale != C) */ - current_locale = setlocale (LC_CTYPE, NULL); + current_locale = g_strdup(setlocale (LC_CTYPE, NULL)); setlocale (LC_CTYPE, "C"); #ifdef X_LOCALE @@ -278,6 +278,7 @@ gtk_init (int *argc, } setlocale (LC_CTYPE, current_locale); + g_free (current_locale); GTK_NOTE(MISC, g_print("%s multi-byte string functions.\n", gtk_use_mb ? "Using" : "Not using")); @@ -1291,9 +1292,7 @@ gtk_invoke_timeout_function (GtkTimeoutFunction *timeoutf) args[0].name = NULL; args[0].type = GTK_TYPE_BOOL; args[0].d.pointer_data = &ret_val; - ((GtkCallbackMarshal)timeoutf->function) (NULL, - timeoutf->data, - 0, args); + timeoutf->marshal (NULL, timeoutf->data, 0, args); return ret_val; } } -- cgit v1.2.1