--- gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c.orig	2006-10-18 18:37:48.000000000 +0100
+++ gaim-2.0.0beta4/gtk/gtkcellrendererexpander.c	2006-11-03 19:10:47.083709000 +0000
@@ -56,13 +56,13 @@
 						   GdkRectangle               *cell_area,
 						   GdkRectangle               *expose_area,
 						   guint                       flags);
-static gboolean gaim_gtk_cell_renderer_expander_activate  (GtkCellRenderer            *cell,
+static gboolean gaim_gtk_cell_renderer_expander_activate  (GtkCellRenderer            *r,
 						      GdkEvent                   *event,
 						      GtkWidget                  *widget,
-						      const gchar                *path,
-						      GdkRectangle               *background_area,
-						      GdkRectangle               *cell_area,
-						      guint                       flags);
+						      const gchar                *p,
+						      GdkRectangle               *bg,
+						      GdkRectangle               *cell,
+						      GtkCellRendererState        flags);
 static void  gaim_gtk_cell_renderer_expander_finalize (GObject *gobject);
 
 enum {
--- gaim-2.0.0beta4/configure.ac.orig	2006-11-02 22:50:02.516349000 +0000
+++ gaim-2.0.0beta4/configure.ac	2006-11-02 22:50:46.487764000 +0000
@@ -689,9 +689,9 @@
 for i in $STATIC_PRPLS ; do
 	dnl Ugly special case for "libsilcgaim.a":
 	if test "x$i" = "xsilc"; then
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}gaim.a"
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib${i}gaim.a"
 	else
-		STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
+		STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libgaim/protocols/$i/lib$i.a"
 	fi
 	extern_init="$extern_init extern gboolean gaim_init_${i}_plugin();"
 	load_proto="$load_proto gaim_init_${i}_plugin();"