aboutsummaryrefslogtreecommitdiffstats
path: root/lib/egg/egg-toolbar-editor.h
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@src.gnome.org>2003-08-30 01:17:42 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2003-08-30 01:17:42 +0800
commit07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4 (patch)
treeffa40aa822515f159aa944d613b711bc921e6522 /lib/egg/egg-toolbar-editor.h
parent322e9bc21fbd27e9ee920b1908d04ba4302381df (diff)
downloadgsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.gz
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.tar.zst
gsoc2013-epiphany-07f0c900d6ade15ceb7ef418aa0ea7dabd1909c4.zip
Part of gtk 2.3 port, changelog too long to paste it
Diffstat (limited to 'lib/egg/egg-toolbar-editor.h')
-rwxr-xr-xlib/egg/egg-toolbar-editor.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/egg/egg-toolbar-editor.h b/lib/egg/egg-toolbar-editor.h
index b351fcb89..72f58f449 100755
--- a/lib/egg/egg-toolbar-editor.h
+++ b/lib/egg/egg-toolbar-editor.h
@@ -20,8 +20,8 @@
#define EGG_TOOLBAR_EDITOR_H
#include <gtk/gtkvbox.h>
+#include <gtk/gtkuimanager.h>
-#include "egg-menu-merge.h"
#include "egg-toolbars-model.h"
G_BEGIN_DECLS
@@ -52,7 +52,7 @@ struct EggToolbarEditorClass
GType egg_toolbar_editor_get_type (void);
-GtkWidget *egg_toolbar_editor_new (EggMenuMerge *merge,
+GtkWidget *egg_toolbar_editor_new (GtkUIManager *merge,
EggToolbarsModel *model);
void egg_toolbar_editor_load_actions (EggToolbarEditor *editor,
const char *xml_file);