From c2beffd03405e6db4295afd6c2982388b808cb2e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@it.gnome.org>
Date: Mon, 20 Jan 2003 18:57:20 +0000
Subject: Merge eog-menu-api branch

2003-01-20  Marco Pesenti Gritti  <marco@it.gnome.org>

	* Merge eog-menu-api branch
---
 src/ephy-window.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/ephy-window.h')

diff --git a/src/ephy-window.h b/src/ephy-window.h
index 315cd8cca..10712e3ff 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -20,13 +20,11 @@
 #define EPHY_WINDOW_H
 
 #include "ephy-embed.h"
-#include "ephy-embed-persist.h"
-#include "ephy-embed-popup-bw.h"
 #include "ephy-dialog.h"
 #include "ephy-notebook.h"
 #include <glib-object.h>
 #include <glib.h>
-#include <bonobo/bonobo-window.h>
+#include <gtk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
@@ -44,16 +42,16 @@ typedef struct Toolbar Toolbar;
 
 struct EphyWindow
 {
-        BonoboWindow parent;
+        GtkWindow parent;
         EphyWindowPrivate *priv;
 
 	/* Public to toolbar and statusbar, dont use outside */
-	GObject *ui_component;
+	GObject *ui_merge;
 };
 
 struct EphyWindowClass
 {
-        BonoboWindowClass parent_class;
+        GtkWindowClass parent_class;
 };
 
 typedef enum
@@ -123,8 +121,6 @@ EphyTab		 *ephy_window_get_active_tab	  (EphyWindow *window);
 
 EphyEmbed	 *ephy_window_get_active_embed	  (EphyWindow *window);
 
-EphyEmbedPopupBW *ephy_window_get_popup_factory   (EphyWindow *window);
-
 GList		 *ephy_window_get_tabs		  (EphyWindow *window);
 
 Toolbar		 *ephy_window_get_toolbar	  (EphyWindow *window);
-- 
cgit v1.2.3