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, 7 deletions

diff --git a/src/window-commands.c b/src/window-commands.c
index a07eb7602..e922c3dbc 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -30,9 +30,6 @@
 #include "pdm-dialog.h"
 #include "ephy-bookmarks-editor.h"
 #include "ephy-new-bookmark.h"
-#include "egg-toggle-action.h"
-#include "egg-editable-toolbar.h"
-#include "egg-toolbar-editor.h"
 #include "ephy-file-helpers.h"
 #include "toolbar.h"
 #include "ephy-state.h"
@@ -40,6 +37,8 @@
 #include "ephy-zoom.h"
 #include "prefs-dialog.h"
 #include "ephy-toolbars-model.h"
+#include "egg-editable-toolbar.h"
+#include "egg-toolbar-editor.h"
 
 #include <string.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
@@ -50,6 +49,7 @@
 #include <libgnomeui/gnome-icon-theme.h>
 #include <libgnome/gnome-program.h>
 #include <gtk/gtkeditable.h>
+#include <gtk/gtktoggleaction.h>
 
 enum
 {
@@ -516,7 +516,7 @@ window_cmd_view_bookmarks_bar (GtkAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = GTK_TOGGLE_ACTION (action)->active;
+	active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	current_state = (mask & EMBED_CHROME_BOOKMARKSBARON) > 0;
 
 	if (active != current_state)
@@ -535,7 +535,7 @@ window_cmd_view_toolbar (GtkAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = GTK_TOGGLE_ACTION (action)->active;
+	active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	current_state = (mask & EMBED_CHROME_TOOLBARON) > 0;
 
 	if (active != current_state)
@@ -554,7 +554,7 @@ window_cmd_view_statusbar (GtkAction *action,
 	gboolean current_state;
 
 	mask = ephy_window_get_chrome (window);
-	active = GTK_TOGGLE_ACTION (action)->active;
+	active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
 	current_state = (mask & EMBED_CHROME_STATUSBARON) > 0;
 
 	if (active != current_state)
@@ -568,7 +568,7 @@ void
 window_cmd_view_fullscreen (GtkAction *action,
 			    EphyWindow *window)
 {
-	if (GTK_TOGGLE_ACTION (action)->active)
+	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)))
 	{
 		gtk_window_fullscreen (GTK_WINDOW (window));
 	}