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.

4 files changed, 25 insertions, 28 deletions

diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 70097f76c..28d32b564 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -238,7 +238,7 @@ prefs_dialog_show_page (PrefsDialog *pd,
 	gtk_notebook_set_current_page (GTK_NOTEBOOK (pd->priv->notebook), id);
 }
 
-static void 
+static void
 prefs_dialog_show_help (PrefsDialog *pd)
 {
 	GError *err;
@@ -258,17 +258,17 @@ prefs_dialog_show_help (PrefsDialog *pd)
 	{
 		GtkWidget *err_dialog;
 		err_dialog = gtk_message_dialog_new (
-				GTK_WINDOW (pd), 
-				GTK_DIALOG_DESTROY_WITH_PARENT, 
-				GTK_MESSAGE_ERROR, 
+				GTK_WINDOW (pd),
+				GTK_DIALOG_DESTROY_WITH_PARENT,
+				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_CLOSE,
-				_("Could not display help: %s"), 
+				_("Could not display help: %s"),
 				  err->message);
 
-		g_signal_connect (G_OBJECT (err_dialog), "response", 
+		g_signal_connect (G_OBJECT (err_dialog), "response",
 				G_CALLBACK (gtk_widget_destroy),
 				NULL);
-		gtk_window_set_resizable (GTK_WINDOW (err_dialog), 
+		gtk_window_set_resizable (GTK_WINDOW (err_dialog),
 				FALSE);
 		gtk_widget_show (err_dialog);
 		g_error_free (err);
@@ -278,18 +278,15 @@ prefs_dialog_show_help (PrefsDialog *pd)
 static void
 prefs_dialog_response_cb (GtkDialog *dialog, gint response_id, gpointer data)
 {
-	GError *err;
-	
 	if (response_id == GTK_RESPONSE_CLOSE)
 	{
 		gtk_widget_destroy (GTK_WIDGET(dialog));
-	} 
+	}
 	else if (response_id == GTK_RESPONSE_HELP)
 	{
 		PrefsDialog *pd = (PrefsDialog *)data;
-		prefs_dialog_show_help (pd);	
+		prefs_dialog_show_help (pd);
 	}
-		
 }
 
 static void
diff --git a/src/toolbar.c b/src/toolbar.c
index 1f5e41cc0..146282058 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -35,7 +35,7 @@
 #include "ephy-string.h"
 #include "ephy-debug.h"
 #include "ephy-new-bookmark.h"
-#include "ephy-toolbars-group.h"
+#include "egg-toolbars-group.h"
 #include "ephy-stock-icons.h"
 
 #include <string.h>
@@ -96,7 +96,7 @@ toolbar_get_type (void)
                         (GInstanceInitFunc) toolbar_init
                 };
 
-                toolbar_type = g_type_register_static (EPHY_EDITABLE_TOOLBAR_TYPE,
+                toolbar_type = g_type_register_static (EGG_EDITABLE_TOOLBAR_TYPE,
 						       "Toolbar",
 						       &our_info, 0);
         }
@@ -134,7 +134,7 @@ get_bookmark_action (Toolbar *t, EphyBookmarks *bookmarks, gulong id, const char
 }
 
 static char *
-toolbar_get_action_name (EphyEditableToolbar *etoolbar,
+toolbar_get_action_name (EggEditableToolbar *etoolbar,
 		         const char *drag_type,
 			 const char *data)
 {
@@ -201,7 +201,7 @@ toolbar_get_action_name (EphyEditableToolbar *etoolbar,
 }
 
 static EggAction *
-toolbar_get_action (EphyEditableToolbar *etoolbar,
+toolbar_get_action (EggEditableToolbar *etoolbar,
 		    const char *name)
 {
 	Toolbar *t = TOOLBAR (etoolbar);
@@ -211,7 +211,7 @@ toolbar_get_action (EphyEditableToolbar *etoolbar,
 
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 
-	action = EPHY_EDITABLE_TOOLBAR_CLASS
+	action = EGG_EDITABLE_TOOLBAR_CLASS
 			(parent_class)->get_action (etoolbar, name);
 	if (action)
 	{
@@ -248,10 +248,10 @@ static void
 toolbar_class_init (ToolbarClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	EphyEditableToolbarClass *eet_class;
+	EggEditableToolbarClass *eet_class;
 
         parent_class = g_type_class_peek_parent (klass);
-	eet_class = EPHY_EDITABLE_TOOLBAR_CLASS (klass);
+	eet_class = EGG_EDITABLE_TOOLBAR_CLASS (klass);
 
         object_class->finalize = toolbar_finalize;
 	object_class->set_property = toolbar_set_property;
@@ -397,7 +397,7 @@ toolbar_set_window (Toolbar *t, EphyWindow *window)
 static void
 toolbar_init (Toolbar *t)
 {
-	static EphyToolbarsGroup *group = NULL;
+	static EggToolbarsGroup *group = NULL;
 
         t->priv = g_new0 (ToolbarPrivate, 1);
 
@@ -410,8 +410,8 @@ toolbar_init (Toolbar *t)
 		char *user;
 
 		user = g_build_filename (ephy_dot_dir (), "toolbar.xml", NULL);
-		group = ephy_toolbars_group_new ();
-		ephy_toolbars_group_set_source
+		group = egg_toolbars_group_new ();
+		egg_toolbars_group_set_source
 			(group, ephy_file ("epiphany-toolbar.xml"), user);
 		g_free (user);
 	}
diff --git a/src/toolbar.h b/src/toolbar.h
index 0aa096e41..9f4404b8a 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -19,7 +19,7 @@
 #ifndef TOOLBAR_H
 #define TOOLBAR_H
 
-#include "ephy-editable-toolbar.h"
+#include "egg-editable-toolbar.h"
 #include "ephy-window.h"
 
 #include <glib-object.h>
@@ -39,13 +39,13 @@ typedef struct ToolbarPrivate ToolbarPrivate;
 
 struct Toolbar
 {
-        EphyEditableToolbar parent_object;
+        EggEditableToolbar parent_object;
         ToolbarPrivate *priv;
 };
 
 struct ToolbarClass
 {
-        EphyEditableToolbarClass parent_class;
+        EggEditableToolbarClass parent_class;
 };
 
 GType         toolbar_get_type			(void);
diff --git a/src/window-commands.c b/src/window-commands.c
index 6d65a04c6..f9e5ecf72 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -35,7 +35,7 @@
 #include "ephy-bookmarks-editor.h"
 #include "ephy-new-bookmark.h"
 #include "egg-toggle-action.h"
-#include "ephy-editable-toolbar.h"
+#include "egg-editable-toolbar.h"
 #include "toolbar.h"
 
 #include <string.h>
@@ -663,8 +663,8 @@ window_cmd_edit_toolbar (EggAction *action,
 
 	toolbar = ephy_window_get_toolbar (window);
 
-	ephy_editable_toolbar_edit (EPHY_EDITABLE_TOOLBAR (toolbar),
-				    GTK_WIDGET (window));
+	egg_editable_toolbar_edit (EGG_EDITABLE_TOOLBAR (toolbar),
+				   GTK_WIDGET (window));
 }
 
 void