Use EggEditableToolbar. Update to latest versions (not EggMenuMerge, we

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

	* lib/egg/Makefile.am:
	* lib/egg/egg-accel-dialog.c:
	* lib/egg/egg-action-group.c:
	* lib/egg/egg-action.c:
	* lib/egg/egg-editable-toolbar.c:
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-radio-action.c:
	* lib/egg/egg-toggle-action.c:
	* lib/egg/egg-toolbars-group.c:
	* lib/egg/egg-toolbars-group.h:
	* lib/egg/eggintl.h:
	* lib/egg/eggtoolbar.c:
	* lib/egg/eggtoolbutton.c:
	* lib/egg/update-from-egg.sh:

	Use EggEditableToolbar.
	Update to latest versions (not EggMenuMerge, we still need patches).

	WARNING: it's no more possible to drag bookmarks in the toolbar,
	if you depend on that feature please wait the weekend to update cvs.

	* lib/egg/egg-markup.c:
	* lib/egg/egg-markup.h:

	Remove, not used.

	* lib/widgets/Makefile.am:
	* lib/widgets/ephy-editable-toolbar.c:
	* lib/widgets/ephy-editable-toolbar.h:
	* lib/widgets/ephy-toolbars-group.c:
	* lib/widgets/ephy-toolbars-group.h:

	Remove.

	* src/prefs-dialog.c: (prefs_dialog_show_help),
	(prefs_dialog_response_cb):

	Fix a warning.

	* src/toolbar.c: (toolbar_get_type), (toolbar_get_action_name),
	(toolbar_get_action), (toolbar_class_init), (toolbar_init):
	* src/toolbar.h:
	* src/window-commands.c: (window_cmd_edit_toolbar):

	Update to use the egg api.

1 files changed, 0 insertions, 75 deletions

diff --git a/lib/widgets/ephy-editable-toolbar.h b/lib/widgets/ephy-editable-toolbar.h
deleted file mode 100755
index 68e6f39b5..000000000
--- a/lib/widgets/ephy-editable-toolbar.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  Copyright (C) 2003 Marco Pesenti Gritti
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef EPHY_EDITABLE_TOOLBAR_H
-#define EPHY_EDITABLE_TOOLBAR_H
-
-#include <glib-object.h>
-#include <glib.h>
-#include "egg-menu-merge.h"
-
-G_BEGIN_DECLS
-
-typedef struct EphyEditableToolbarClass EphyEditableToolbarClass;
-
-#define EPHY_EDITABLE_TOOLBAR_TYPE             (ephy_editable_toolbar_get_type ())
-#define EPHY_EDITABLE_TOOLBAR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EPHY_EDITABLE_TOOLBAR_TYPE, EphyEditableToolbar))
-#define EPHY_EDITABLE_TOOLBAR_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EPHY_EDITABLE_TOOLBAR_TYPE, EphyEditableToolbarClass))
-#define IS_EPHY_EDITABLE_TOOLBAR(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EPHY_EDITABLE_TOOLBAR_TYPE))
-#define IS_EPHY_EDITABLE_TOOLBAR_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), EPHY_EDITABLE_TOOLBAR_TYPE))
-#define EPHY_EDITABLE_TOOLBAR_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), EPHY_EDITABLE_TOOLBAR_TYPE, EphyEditableToolbarClass))
-
-
-typedef struct EphyEditableToolbar EphyEditableToolbar;
-typedef struct EphyEditableToolbarPrivate EphyEditableToolbarPrivate;
-
-struct EphyEditableToolbar
-{
-        GObject parent_object;
-        EphyEditableToolbarPrivate *priv;
-};
-
-struct EphyEditableToolbarClass
-{
-        GObjectClass parent_class;
-
-	char      * (* get_action_name) (EphyEditableToolbar *etoolbar,
-					 const char *drag_type,
-					 const char *data);
-	EggAction * (* get_action)	(EphyEditableToolbar *etoolbar,
-					 const char *name);
-};
-
-GType			ephy_editable_toolbar_get_type		(void);
-
-EphyEditableToolbar    *ephy_editable_toolbar_new		(EggMenuMerge *merge);
-
-void			ephy_editable_toolbar_edit		(EphyEditableToolbar *etoolbar,
-								 GtkWidget *window);
-
-char                   *ephy_editable_toolbar_get_action_name	(EphyEditableToolbar *etoolbar,
-								 const char *drag_type,
-								 const char *data);
-
-EggAction              *ephy_editable_toolbar_get_action	(EphyEditableToolbar *etoolbar,
-								 const char *name);
-
-
-G_END_DECLS
-
-#endif