[monkey-bubble: 466/753] Made this compile again.

[Sven Herzberg <herzi src gnome org>]

commit 481214840eef36be8c58146cefffa0207d0fd6a3
Author: Martin Baulig <martin src gnome org>
Date:   Thu Jun 14 17:53:48 2001 +0000

    Made this compile again.

 libgnomeui/gnome-mdi-child.c |    2 +-
 libgnomeui/gnome-mdi.c       |   13 ++++++-------
 libgnomeui/gnome-mdi.h       |    2 +-
 libgnomeui/gnome-mdiP.h      |    2 +-
 libgnomeui/gnome-pouch.c     |    5 ++++-
 5 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/libgnomeui/gnome-mdi-child.c b/libgnomeui/gnome-mdi-child.c
index 2c3eae9..b7bb699 100644
--- a/libgnomeui/gnome-mdi-child.c
+++ b/libgnomeui/gnome-mdi-child.c
@@ -29,7 +29,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "gnome-app.h"
+#include <libgnomeui/gnome-app.h>
 #include "gnome-macros.h"
 #include "gnome-mdi-child.h"
 #include "gnome-mdi.h"
diff --git a/libgnomeui/gnome-mdi.c b/libgnomeui/gnome-mdi.c
index 1583dc2..f15705f 100644
--- a/libgnomeui/gnome-mdi.c
+++ b/libgnomeui/gnome-mdi.c
@@ -34,10 +34,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-preferences.h>
-#include "gnome-app.h"
-#include "gnome-cursors.h"
-#include "gnome-dock-layout.h"
-#include "gnome-stock.h"
+#include <libgnomeui/gnome-app.h>
+#include <bonobo/bonobo-dock-layout.h>
 #include "gnome-pouch.h"
 #include "gnome-roo.h"
 #include "gnome-macros.h"
@@ -340,8 +338,9 @@ gnome_mdi_view_changed (GnomeMDI *mdi, GtkWidget *old_view)
 		/* insert the new toolbar */
 		if(child->priv->toolbar_template &&
 		   (ui_info = copy_ui_info_tree(child->priv->toolbar_template)) != NULL) {
-			toolbar = gtk_toolbar_new(GTK_ORIENTATION_HORIZONTAL,
-									  GTK_TOOLBAR_BOTH);
+			toolbar = gtk_toolbar_new();
+			gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
+			gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
 			gnome_app_fill_toolbar_with_data(GTK_TOOLBAR(toolbar), ui_info,
 											 app->accel_group, child);
 			gnome_mdi_child_add_toolbar(child, app, GTK_TOOLBAR(toolbar));
@@ -678,7 +677,7 @@ book_motion (GtkWidget *widget, GdkEventMotion *e, gpointer data)
 	mdi = GNOME_MDI(data);
 
 	if(!drag_cursor)
-		drag_cursor = gnome_stock_cursor_new(GNOME_STOCK_CURSOR_FLEUR);
+		drag_cursor = gdk_cursor_new(GDK_FLEUR);
 
 	if(e->window == widget->window) {
 		mdi->priv->in_drag = TRUE;
diff --git a/libgnomeui/gnome-mdi.h b/libgnomeui/gnome-mdi.h
index c6f036b..dc85e39 100644
--- a/libgnomeui/gnome-mdi.h
+++ b/libgnomeui/gnome-mdi.h
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "gnome-app.h"
+#include <libgnomeui/gnome-app.h>
 #include "gnome-mdi-child.h"
 
 G_BEGIN_DECLS
diff --git a/libgnomeui/gnome-mdiP.h b/libgnomeui/gnome-mdiP.h
index 7d8814f..565b95d 100644
--- a/libgnomeui/gnome-mdiP.h
+++ b/libgnomeui/gnome-mdiP.h
@@ -33,7 +33,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include "gnome-app.h"
+#include <libgnomeui/gnome-app.h>
 
 #include "gnome-mdi.h"
 #include "gnome-mdi-child.h"
diff --git a/libgnomeui/gnome-pouch.c b/libgnomeui/gnome-pouch.c
index a6a7a84..9fa28a4 100644
--- a/libgnomeui/gnome-pouch.c
+++ b/libgnomeui/gnome-pouch.c
@@ -31,7 +31,6 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-app.h>
 #include <libgnomeui/gnome-app-helper.h>
-#include <libgnomeui/gnome-popup-menu.h>
 #include "gnome-pouch.h"
 #include "gnome-roo.h"
 #include "gnome-pouchP.h"
@@ -229,9 +228,11 @@ gnome_pouch_button_press(GtkWidget *w, GdkEventButton *e)
 		}
 	}
 	else if(e->button == 3 && pouch->priv->popup_menu) {
+#ifdef FIXME
 		/* popup a menu */
 		gnome_popup_menu_do_popup(pouch->priv->popup_menu, NULL, NULL,
 								  e, pouch, GTK_WIDGET(pouch));
+#endif
 		set_active_items(pouch);
 		return TRUE;
 	}
@@ -887,7 +888,9 @@ gnome_pouch_enable_popup_menu(GnomePouch *pouch, gboolean enable)
 	g_return_if_fail(GNOME_IS_POUCH(pouch));
 
 	if(enable && pouch->priv->popup_menu == NULL) {
+#ifdef FIXME
 		pouch->priv->popup_menu = gnome_popup_menu_new(popup_menu);
+#endif
 		for(i = 0; i < 2; i++)
 			pouch->priv->oitem[i] = GTK_CHECK_MENU_ITEM(orientation_list[i].widget);
 		for(i = 0; i < 4; i++)