diff -up ./plugins/gtk/maingui.c.gtkdep ./plugins/gtk/maingui.c
--- ./plugins/gtk/maingui.c.gtkdep	2008-02-28 21:22:55.000000000 +0100
+++ ./plugins/gtk/maingui.c	2010-08-05 20:28:25.919341747 +0200
@@ -227,7 +227,7 @@ static void unflash_window(GtkWidget *wi
 int fe_gui_info(window_t *sess, int info_type) {	/* code from fe-gtk.c */
 	switch (info_type) {
 		case 0:	/* window status */
-			if (!GTK_WIDGET_VISIBLE(GTK_WINDOW(gtk_private_ui(sess)->window)))
+			if (!gtk_widget_get_visible(GTK_WINDOW(gtk_private_ui(sess)->window)))
 				return 2;	/* hidden (iconified or systray) */
 
 #warning "GTK issue."
@@ -513,8 +513,8 @@ void mg_set_topic_tip(session *sess) {
 #endif
 
 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;
 	}
@@ -1534,9 +1534,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);
@@ -1781,7 +1781,7 @@ mg_create_entry(window_t *sess, GtkWidge
 #endif
 	gui->nick_label = but =	gtk_button_new_with_label(gtk_session_target(sess->session));
 	gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE);
-	GTK_WIDGET_UNSET_FLAGS(but, GTK_CAN_FOCUS);
+	gtk_widget_set_can_focus(but, 0);
 	gtk_box_pack_end(GTK_BOX(gui->nick_box), but, 0, 0, 0);
 	g_signal_connect(G_OBJECT(but), "clicked", G_CALLBACK(mg_sessionclick_cb), NULL);
 
diff -up ./plugins/gtk/menu.c.gtkdep ./plugins/gtk/menu.c
--- ./plugins/gtk/menu.c.gtkdep	2008-02-28 21:22:55.000000000 +0100
+++ ./plugins/gtk/menu.c	2010-08-05 20:36:00.774238471 +0200
@@ -166,7 +166,7 @@ static void menu_about(GtkWidget *wid, g
 	gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
 	wid = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
-	GTK_WIDGET_SET_FLAGS(GTK_WIDGET(wid), GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default(GTK_WIDGET(wid), 1);
 	gtk_dialog_add_action_widget(GTK_DIALOG(about), wid, GTK_RESPONSE_OK);
 	gtk_widget_grab_default(wid);