Index: xchat-2.8.6/src/fe-gtk/dccgui.c

===================================================================

--- xchat-2.8.6.orig/src/fe-gtk/dccgui.c

+++ xchat-2.8.6/src/fe-gtk/dccgui.c

@@ -700,7 +700,7 @@ dcc_detail_label (char *text, GtkWidget

 static void

 dcc_exp_cb (GtkWidget *exp, GtkWidget *box)

 {

-	if (GTK_WIDGET_VISIBLE (box))

+	if (gtk_widget_get_visible (box))

 		gtk_widget_hide (box);

 	else

 		gtk_widget_show (box);

Index: xchat-2.8.6/src/fe-gtk/fe-gtk.c

===================================================================

--- xchat-2.8.6.orig/src/fe-gtk/fe-gtk.c

+++ xchat-2.8.6/src/fe-gtk/fe-gtk.c

@@ -819,7 +819,7 @@ fe_gui_info (session *sess, int info_typ

 	switch (info_type)

 	{

 	case 0:	/* window status */

-		if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))

+		if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window)))

 			return 2;	/* hidden (iconified or systray) */

 #if GTK_CHECK_VERSION(2,4,0)

 		if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))

Index: xchat-2.8.6/src/fe-gtk/maingui.c

===================================================================

--- xchat-2.8.6.orig/src/fe-gtk/maingui.c

+++ xchat-2.8.6/src/fe-gtk/maingui.c

@@ -599,7 +599,7 @@ mg_show_generic_tab (GtkWidget *box)

 	int num;

 	GtkWidget *f = NULL;

-	if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))

+	if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))

 		f = current_sess->gui->input_box;

 	num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);

@@ -809,8 +809,8 @@ mg_set_topic_tip (session *sess)

 static void

 mg_hide_empty_pane (GtkPaned *pane)

 {

-	if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&

-		 (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))

+	if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&

+		 (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))

 	{

 		gtk_widget_hide (GTK_WIDGET (pane));

 		return;

@@ -2585,9 +2585,9 @@ mg_rightpane_cb (GtkPaned *pane, GParamS

 {

 	int handle_size;

-/*	if (pane->child1 == NULL || (!GTK_WIDGET_VISIBLE (pane->child1)))

+/*	if (pane->child1 == NULL || (!gtk_widget_get_visible (pane->child1)))

 		return;

-	if (pane->child2 == NULL || (!GTK_WIDGET_VISIBLE (pane->child2)))

+	if (pane->child2 == NULL || (!gtk_widget_get_visible (pane->child2)))

 		return;*/

 	gtk_widget_style_get (GTK_WIDGET (pane), "handle-size", &handle_size, NULL);

Index: xchat-2.8.6/src/fe-gtk/menu.c

===================================================================

--- xchat-2.8.6.orig/src/fe-gtk/menu.c

+++ xchat-2.8.6/src/fe-gtk/menu.c

@@ -1670,7 +1670,7 @@ static gboolean

 menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)

 {

 	/* GTK2.2 behaviour */

-	return GTK_WIDGET_IS_SENSITIVE (widget);

+	return gtk_widget_is_sensitive (widget);

 }

 #endif

Index: xchat-2.8.6/src/fe-gtk/plugin-tray.c

===================================================================

--- xchat-2.8.6.orig/src/fe-gtk/plugin-tray.c

+++ xchat-2.8.6/src/fe-gtk/plugin-tray.c

@@ -457,7 +457,7 @@ tray_toggle_visibility (gboolean force_h

 	if (!win)

 		return FALSE;

-	if (force_hide || GTK_WIDGET_VISIBLE (win))

+	if (force_hide || gtk_widget_get_visible (win))

 	{

 		gtk_window_get_position (win, &x, &y);

 		screen = gtk_window_get_screen (win);