File gentoo-0.15.6-fix_deprecated_GTK_macros.patch of Package gentoo

File gentoo-0.15.6-fix_deprecated_GTK_macros.patch of Package gentoo (Revision 11cdabaa8611d55557c2dcf452cfe35e)

Currently displaying revision 11cdabaa8611d55557c2dcf452cfe35e , Show latest

--- src/odmultibutton.c.orig	2009-06-23 22:57:22.000000000 +0200
+++ src/odmultibutton.c	2010-07-21 20:21:44.000000000 +0200
@@ -73,8 +73,8 @@
 		}
 		if(p != NULL)
 		{
-			if(GTK_WIDGET_STATE(widget) != GTK_WIDGET_STATE(p))
-				gtk_widget_set_state(p, GTK_WIDGET_STATE(widget));
+			if(gtk_widget_get_state(widget) != gtk_widget_get_state(p))
+				gtk_widget_set_state(p, gtk_widget_get_state(widget));
 			gtk_widget_show(p);
 			if(gtk_widget_get_parent(p) != NULL)
 				gtk_widget_reparent(p, widget);
@@ -86,7 +86,7 @@
 		}
 		mb->last_index = index;
 	}
-	if(GTK_WIDGET_DRAWABLE(widget))
+	if(gtk_widget_is_drawable(widget))
 		gtk_widget_queue_draw(widget);
 }
 
@@ -144,9 +144,9 @@
 {
 	GtkStateType	state;
 
-	state = GTK_WIDGET_STATE(widget);
+	state = gtk_widget_get_state(widget);
 
-	if(GTK_WIDGET_DRAWABLE(widget) && state != GTK_STATE_ACTIVE)
+	if(gtk_widget_is_drawable(widget) && state != GTK_STATE_ACTIVE)
 	{
 		GtkStyle	*style = gtk_widget_get_style(widget);
 		const guint	EARSIZE = 5;
@@ -209,7 +209,7 @@
 	g_return_if_fail(area != NULL);
 	g_return_if_fail(OD_IS_MULTIBUTTON(widget));
 
-	if(GTK_WIDGET_DRAWABLE(widget))
+	if(gtk_widget_is_drawable(widget))
 	{
 		ODMultiButton	*mb = OD_MULTIBUTTON(widget);
 
@@ -449,7 +449,7 @@
 			od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
 			if(GTK_WIDGET(mb)->parent)
 				gtk_widget_queue_resize(GTK_WIDGET(mb));
-			if(GTK_WIDGET_DRAWABLE(mb))
+			if(gtk_widget_is_drawable(mb))
 				gtk_widget_queue_draw(GTK_WIDGET(mb));
 		}
 	}
--- src/mntent_wrap.c.orig	2009-06-24 22:30:38.000000000 +0200
+++ src/mntent_wrap.c	2010-07-21 20:21:44.000000000 +0200
@@ -24,7 +24,7 @@
 
 /* ----------------------------------------------------------------------------------------- */
 
-#if defined __CYGWIN__ || defined __linux__ || defined __sgi	/* Linux and IRIX implementation. */
+#if defined __CYGWIN__ || defined __linux__ || defined __sgi || defined __GLIBC__	/* Linux and IRIX implementation. */
 
 #include <mntent.h>