Complete gtk 2.3 port. It doesnt run here but it could be my env.

2003-08-30  Marco Pesenti Gritti  <marco@gnome.org>

        * src/ephy-encoding-menu.c: (ephy_encoding_menu_verb_cb):
        * src/ephy-favicon-action.c: (create_tool_item):
        * src/ephy-favicon-action.h:
        * src/ephy-favorites-menu.c: (ephy_favorites_menu_clean):
        * src/ephy-go-action.c: (create_tool_item), (create_menu_proxy_cb):
        * src/ephy-go-action.h:
        * src/ephy-history-window.c: (ephy_history_window_construct):
        * src/ephy-location-action.c: (ephy_location_action_get_widget):
        * src/ephy-location-action.h:
        * src/ephy-navigation-action.c:
        * src/ephy-navigation-action.h:
        * src/ephy-spinner-action.c: (create_tool_item),
        (item_parent_set_cb):
        * src/ephy-spinner-action.h:
        * src/ephy-tab.c: (ephy_tab_init):
        * src/ephy-tabs-menu.c: (ephy_tabs_menu_clean),
        (tab_set_action_accelerator), (ephy_tabs_menu_update):
        * src/ephy-window.c: (ephy_window_state_event_cb), (setup_window),
        (update_layout_toggles):
        * src/popup-commands.c:
        * src/ppview-toolbar.c: (ppview_toolbar_set_window),
        (ppview_toolbar_init):
        * src/toolbar.c: (toolbar_activate_location):
        * src/window-commands.c: (window_cmd_view_bookmarks_bar),
        (window_cmd_view_toolbar), (window_cmd_view_statusbar),
        (window_cmd_view_fullscreen):

        Complete gtk 2.3 port. It doesnt run here but it could be
        my env.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 8a45be281..6e44952d6 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -22,12 +22,11 @@
 
 #include "ephy-encoding-menu.h"
 #include "ephy-string.h"
-#include "egg-menu-merge.h"
 #include "ephy-shell.h"
 #include "ephy-debug.h"
 
 #include <bonobo/bonobo-i18n.h>
-
+#include <gtk/gtkuimanager.h>
 #include <string.h>
 
 /**
@@ -186,16 +185,19 @@ ephy_encoding_menu_verb_cb (GtkAction *action,
 {
 	EphyWindow *window;
 	EphyEmbed *embed;
-	gchar *encoding;
+	const char *encoding;
+	const char *action_name;
 
 	window = menu->priv->window;
 
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
 
-	if (strncmp (action->name, "Encoding", 8) == 0)
+	action_name = gtk_action_get_name (action);
+
+	if (strncmp (action_name, "Encoding", 8) == 0)
 	{
-		encoding = action->name + 8;
+		encoding = action_name + 8;
 
 		LOG ("Switching to encoding %s", encoding)