From f35ae03a662ed7fb2bc13dc806a15383c72c64d7 Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sat, 8 Feb 2014 09:53:56 -0500
Subject: [PATCH] Build with GTK_DISABLE_DEPRECATED

---
 configure.ac         | 2 +-
 src/fe-gtk/gtkutil.c | 7 ++-----
 win32/hexchat.props  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index ccede768..eed360be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ if test "$gtkfe" = yes ; then
 fi
 
 GUI_LIBS="$GUI_LIBS $GTK_LIBS"
-GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED"
 
 dnl *********************************************************************
 dnl ** MAC_INTEGRATION **************************************************
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 3bb247a2..50a85e2f 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -491,10 +491,6 @@ gtkutil_button (GtkWidget *box, char *stock, char *tip, void *callback,
 		gtk_widget_show (bbox);
 
 		img = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU);
-		if (strcmp (stock, GTK_STOCK_GOTO_LAST) == 0)
-		{
-			gtk_widget_set_usize (img, 10, 6);
-		}
 		gtk_container_add (GTK_CONTAINER (bbox), img);
 		gtk_widget_show (img);
 		gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0);
@@ -521,7 +517,8 @@ GtkWidget *
 gtkutil_entry_new (int max, GtkWidget * box, void *callback,
 						 gpointer userdata)
 {
-	GtkWidget *entry = gtk_entry_new_with_max_length (max);
+	GtkWidget *entry = gtk_entry_new ();
+	gtk_entry_set_max_length (GTK_ENTRY (entry), max);
 	gtk_container_add (GTK_CONTAINER (box), entry);
 	if (callback)
 		g_signal_connect (G_OBJECT (entry), "changed",
diff --git a/win32/hexchat.props b/win32/hexchat.props
index 8f5b6644..8a7ab464 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -17,7 +17,7 @@
 
 		<!-- G_DISABLE_DEPRECATED is unfeasible due to g_completion_* -->
 		<!-- must be buildable with GSEAL_ENABLE in the future, xtext, setup, and chanview-tabs stand in the way --> 
-		<OwnFlags>GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
+		<OwnFlags>GTK_DISABLE_DEPRECATED;GDK_PIXBUF_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;HAVE_STRTOULL;strtoull=_strtoui64;strcasecmp=stricmp;strncasecmp=strnicmp;__inline__=__inline</OwnFlags>
 		<DepsRoot>$(YourDepsPath)\$(PlatformName)</DepsRoot>
 		<GendefPath>$(YourGendefPath)</GendefPath>
 		<MsgfmtPath>$(YourMsgfmtPath)</MsgfmtPath>