diff -ru fbpanel-2.2/image.c fbpanel-2.2.gtk2/image.c
--- fbpanel-2.2/image.c	2003-09-09 16:49:44.000000000 +0200
+++ fbpanel-2.2.gtk2/image.c	2003-10-25 20:03:22.000000000 +0200
@@ -77,7 +77,7 @@
     gtk_widget_show(img->mainw);
     gtk_signal_connect(GTK_OBJECT(img->mainw), "expose_event",
           GTK_SIGNAL_FUNC(gtk_widget_queue_draw), NULL);
-    gp = gdk_pixbuf_new_from_file(fname);
+    gp = gdk_pixbuf_new_from_file(fname,NULL);
     if (!gp) {
         g_warning("image: can't read image %s\n", fname);
         wid = gtk_label_new("?");
diff -ru fbpanel-2.2/launchbar.c fbpanel-2.2.gtk2/launchbar.c
--- fbpanel-2.2/launchbar.c	2003-09-09 16:49:44.000000000 +0200
+++ fbpanel-2.2.gtk2/launchbar.c	2003-10-25 20:03:34.000000000 +0200
@@ -107,7 +107,7 @@
 
 
     // button
-    gp = gdk_pixbuf_new_from_file(fname);
+    gp = gdk_pixbuf_new_from_file(fname,NULL);
     if (!gp) {
         g_warning("launchbar: can't read image %s\n", fname);
         button = gtk_button_new_with_label("?");
diff -ru fbpanel-2.2/Makefile fbpanel-2.2.gtk2/Makefile
--- fbpanel-2.2/Makefile	2003-09-16 20:20:18.000000000 +0200
+++ fbpanel-2.2.gtk2/Makefile	2003-10-25 20:20:11.000000000 +0200
@@ -1,6 +1,6 @@
 CC = gcc
-LIBS = `gdk-pixbuf-config --libs`  `gtk-config --libs` -lXpm -lXmu
-INCS = `gdk-pixbuf-config --cflags` `gtk-config --cflags`
+LIBS =  $(shell pkg-config gtk+-2.0 --libs) -L/usr/X11R6/lib -lXpm -lXmu 
+INCS =  $(shell pkg-config gtk+-2.0 --cflags)
 
 SRC = panel.c misc.c plugin.c separator.c image.c launchbar.c \
 	dclock.c wincmd.c test.c taskbar.c gtkhtbar.c gtkvtbar.c \
diff -ru fbpanel-2.2/taskbar.c fbpanel-2.2.gtk2/taskbar.c
--- fbpanel-2.2/taskbar.c	2003-09-09 16:49:44.000000000 +0200
+++ fbpanel-2.2.gtk2/taskbar.c	2003-10-25 20:07:44.000000000 +0200
@@ -292,7 +292,8 @@
         } else {
             if (tk->focused) {
                 //tk->iconified = 1;
-                XIconifyWindow (GDK_DISPLAY(), tk->win, gdk_screen);
+                XIconifyWindow (GDK_DISPLAY(), tk->win, 
+                        gdk_screen_get_number(gdk_screen_get_default()));
                 DBG("iconify %x\n", tk->win);
             } else {
                 XRaiseWindow (GDK_DISPLAY(), tk->win);
@@ -848,7 +849,7 @@
         }
     }
     //TODO
-    gp = gdk_pixbuf_new_from_file(fname);
+    gp = gdk_pixbuf_new_from_file(fname,NULL);
     if (!gp) {
         ERR( "taskbar: can't read pixmap %s\n", fname);
         g_free(fname);
diff -ru fbpanel-2.2/wincmd.c fbpanel-2.2.gtk2/wincmd.c
--- fbpanel-2.2/wincmd.c	2003-09-09 16:49:44.000000000 +0200
+++ fbpanel-2.2.gtk2/wincmd.c	2003-10-25 20:06:53.000000000 +0200
@@ -108,7 +108,8 @@
             continue;
         }
         if (action)
-            XIconifyWindow(GDK_DISPLAY(), win[i], gdk_screen);
+            XIconifyWindow(GDK_DISPLAY(), win[i], 
+                    gdk_screen_get_number(gdk_screen_get_default()));
         else
             XMapWindow (GDK_DISPLAY(), win[i]);
         DBG("ok\n");
@@ -199,7 +200,7 @@
             goto error;
         }
     }
-    gp = gdk_pixbuf_new_from_file(fname);
+    gp = gdk_pixbuf_new_from_file(fname,NULL);
     if (!gp) {
         g_warning("wincmd: can't read image %s\n", fname);
         button = gtk_button_new_with_label("wc");