From 22bf87253ddffa6a7225ecaad60c15cd0815c974 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@it.gnome.org>
Date: Fri, 25 Apr 2003 11:40:44 +0000
Subject: Update from egg
2003-04-25 Marco Pesenti Gritti <marco@it.gnome.org>
* data/ui/epiphany-toolbar.xml.in:
* lib/egg/Makefile.am:
* lib/egg/egg-editable-toolbar.c:
* lib/egg/egg-editable-toolbar.h:
* lib/egg/egg-menu-merge.c:
* lib/egg/egg-radio-action.c:
* lib/egg/eggmarshalers.c:
* lib/egg/eggmarshalers.h:
* lib/egg/eggmarshalers.list:
* lib/egg/eggtoggletoolbutton.c:
* lib/egg/eggtoggletoolbutton.h:
* lib/egg/eggtoolbar.c:
* lib/egg/eggtoolbar.h:
* lib/egg/eggtoolbutton.c:
* lib/egg/eggtoolbutton.h:
* lib/egg/eggtoolitem.c:
* lib/egg/eggtoolitem.h:
* lib/egg/eggtreemodelfilter.c:
Update from egg
* src/Makefile.am:
* src/ephy-location-action.c: (create_tool_item):
* src/ephy-shell.c: (ephy_shell_init), (ephy_shell_get_bookmarks),
* src/ephy-shell.h:
* src/ephy-window.c: (setup_window), (ephy_window_finalize),
(ephy_window_set_chrome):
* src/toolbar.c: (toolbar_class_init), (toolbar_set_window),
(topic_remove_cb), (bookmark_remove_cb), (toolbar_init),
(toolbar_new):
* src/window-commands.c: (window_cmd_edit_toolbar):
Use the new toolbar editor api. This is incomplete, if you
use bookmarks toolbars please still do not update.
---
lib/egg/egg-editable-toolbar.h | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
(limited to 'lib/egg/egg-editable-toolbar.h')
diff --git a/lib/egg/egg-editable-toolbar.h b/lib/egg/egg-editable-toolbar.h
index f4f8aff64..d528ca4a4 100755
--- a/lib/egg/egg-editable-toolbar.h
+++ b/lib/egg/egg-editable-toolbar.h
@@ -19,11 +19,10 @@
#ifndef EGG_EDITABLE_TOOLBAR_H
#define EGG_EDITABLE_TOOLBAR_H
-#include <glib-object.h>
-#include <glib.h>
-
+#include "egg-toolbars-model.h"
#include "egg-menu-merge.h"
-#include "egg-toolbars-group.h"
+
+#include <gtk/gtkvbox.h>
G_BEGIN_DECLS
@@ -40,37 +39,31 @@ typedef struct EggEditableToolbarClass EggEditableToolbarClass;
typedef struct EggEditableToolbar EggEditableToolbar;
typedef struct EggEditableToolbarPrivate EggEditableToolbarPrivate;
+#define EGG_TOOLBAR_ITEM_TYPE "application/x-toolbar-item"
+
struct EggEditableToolbar
{
- GObject parent_object;
+ GtkVBox parent_object;
EggEditableToolbarPrivate *priv;
};
struct EggEditableToolbarClass
{
- GObjectClass parent_class;
-
- char *(* get_action_name) (EggEditableToolbar *etoolbar,
- const char *drag_type,
- const char *data);
- EggAction *( *get_action) (EggEditableToolbar *etoolbar,
- const char *name);
+ GtkVBoxClass parent_class;
};
GType egg_editable_toolbar_get_type (void);
-EggEditableToolbar *egg_editable_toolbar_new (EggMenuMerge *merge,
- EggToolbarsGroup *group);
-void egg_editable_toolbar_edit (EggEditableToolbar *etoolbar,
- GtkWidget *window);
-void egg_editable_toolbar_show (EggEditableToolbar *etoolbar);
-void egg_editable_toolbar_hide (EggEditableToolbar *etoolbar);
-char *egg_editable_toolbar_get_action_name (EggEditableToolbar *etoolbar,
- const char *drag_type,
- const char *data);
-EggAction *egg_editable_toolbar_get_action (EggEditableToolbar *etoolbar,
+GtkWidget *egg_editable_toolbar_new (EggMenuMerge *merge,
+ EggToolbarsModel *model);
+void egg_editable_toolbar_set_edit_mode (EggEditableToolbar *etoolbar,
+ gboolean mode);
+void egg_editable_toolbar_show (EggEditableToolbar *etoolbar,
+ const char *name);
+void egg_editable_toolbar_hide (EggEditableToolbar *etoolbar,
const char *name);
void egg_editable_toolbar_add_drag_type (EggEditableToolbar *etoolbar,
- const char *drag_type);
+ const char *drag_type,
+ const char *toolbar_name);
G_END_DECLS
--
cgit