diff -Nru gmidimon/src/Makefile gmidimon-gtk-2.0/src/Makefile --- gmidimon/src/Makefile 2002-12-14 17:42:33.000000000 -0500 +++ gmidimon-gtk-2.0/src/Makefile 2005-08-18 19:48:25.000000000 -0400 @@ -58,14 +58,14 @@ PRE_UNINSTALL = : POST_UNINSTALL = : CC = gcc -GTK_CFLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include GTK_CONFIG = /usr/bin/gtk-config GTK_LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -MAKEINFO = /home/sam/gmidimon/missing makeinfo +MAKEINFO = makeinfo PACKAGE = gmidimon VERSION = 0.1 -INCLUDES = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include +INCLUDES = -I/usr/include/gtk-2.0 -I/usr/include/cairo -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include bin_PROGRAMS = gmidimon @@ -73,7 +73,7 @@ gmidimon_SOURCES = main.c interface.c interface.h callbacks.c callbacks.h midisupport.c midisupport.h -gmidimon_LDADD = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm +gmidimon_LDADD = -L/usr/lib -L/usr/X11R6/lib -rdynamic -lgmodule -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -ldl -lXi -lXext -lX11 -lm mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = diff -Nru gmidimon/src/interface.c gmidimon-gtk-2.0/src/interface.c --- gmidimon/src/interface.c 2002-12-14 17:08:40.000000000 -0500 +++ gmidimon-gtk-2.0/src/interface.c 2005-08-18 19:44:33.000000000 -0400 @@ -60,7 +60,7 @@ gtk_container_add (GTK_CONTAINER (mainwindow), vbox1); //toolbar - toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_TEXT); + toolbar = gtk_toolbar_new (); gtk_widget_ref (toolbar); gtk_object_set_data_full (GTK_OBJECT (mainwindow), "toolbar", toolbar, (GtkDestroyNotify) gtk_widget_unref);