From 5b0123fa8c29309a96687953e3ed73908c11110b Mon Sep 17 00:00:00 2001 From: "berkeviktor@aol.com" Date: Wed, 29 Sep 2010 21:57:26 +0200 Subject: [PATCH] use G_DISABLE_DEPRECATED --- src/makeinc.skel | 2 +- xchat-wdk.patch | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/makeinc.skel b/src/makeinc.skel index bd6fea8d..3d4cb287 100644 --- a/src/makeinc.skel +++ b/src/makeinc.skel @@ -1,6 +1,6 @@ CC = cl LINK = link -CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 +CFLAGS = $(CFLAGS) /Ox /c /MD /MP2 /W0 /nologo /DWIN32 /DG_DISABLE_CAST_CHECKS /DG_DISABLE_DEPRECATED /Dstrcasecmp=stricmp /Dstrncasecmp=strnicmp /Dstrtoull=_strtoui64 /DHAVE_STRTOULL -DUSE_IPV6 CFLAGS = $(CFLAGS) -Ic:\mozilla-build\build\xchat-wdk\plugins CPPFLAGS = /c /MD /W0 /nologo /DWIN32 LDFLAGS = /subsystem:windows /nologo diff --git a/xchat-wdk.patch b/xchat-wdk.patch index 226f13d7..52f472ad 100644 --- a/xchat-wdk.patch +++ b/xchat-wdk.patch @@ -784,6 +784,31 @@ diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanlist.c xchat-wdk/src #include #include +diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/chanview-tabs.c xchat-wdk/src/fe-gtk/chanview-tabs.c +--- xchat-wdk.orig/src/fe-gtk/chanview-tabs.c 2005-11-21 05:25:39 +0000 ++++ xchat-wdk/src/fe-gtk/chanview-tabs.c 2010-09-29 19:52:34 +0000 +@@ -144,8 +144,8 @@ + for (i = adj->value; ((i > new_value) && (tab_left_is_moving)); i -= 0.1) + { + gtk_adjustment_set_value (adj, i); +- while (g_main_pending ()) +- g_main_iteration (TRUE); ++ while (g_main_context_pending (NULL)) ++ g_main_context_iteration (NULL, TRUE); + } + + gtk_adjustment_set_value (adj, new_value); +@@ -191,8 +191,8 @@ + for (i = adj->value; ((i < new_value) && (tab_right_is_moving)); i += 0.1) + { + gtk_adjustment_set_value (adj, i); +- while (g_main_pending ()) +- g_main_iteration (TRUE); ++ while (g_main_context_pending (NULL)) ++ g_main_context_iteration (NULL, TRUE); + } + + gtk_adjustment_set_value (adj, new_value); diff -ruN --strip-trailing-cr xchat-wdk.orig/src/fe-gtk/editlist.c xchat-wdk/src/fe-gtk/editlist.c --- xchat-wdk.orig/src/fe-gtk/editlist.c 2006-03-13 08:33:45 +0000 +++ xchat-wdk/src/fe-gtk/editlist.c 2010-09-28 14:38:39 +0000