More constification.

2005-04-19  Christian Persch  <chpe@cvs.gnome.org>

	* lib/egg/egg-editable-toolbar.c: (create_dock):
	* lib/egg/egg-toolbar-editor.c: (editor_create_item),
	(update_editor_sheet):
	* lib/ephy-file-helpers.c: (ephy_file):
	* lib/widgets/ephy-location-entry.c:
	(ephy_location_entry_construct_contents):
	* lib/widgets/ephy-node-view.c: (ephy_node_view_enable_drag_dest),
	(ephy_node_view_enable_drag_source):
	* lib/widgets/ephy-node-view.h:
	* src/ephy-encoding-menu.c: (ephy_encoding_menu_set_window):
	* src/ephy-history-window.c: (ephy_history_window_construct):
	* src/ephy-main.c:
	* src/ephy-notebook.c: (ephy_notebook_init),
	(ephy_notebook_add_tab):
	* src/ppview-toolbar.c:
	* src/window-commands.c: (window_cmd_help_about):

	More constification.

6 files changed, 27 insertions, 34 deletions

diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 37ddd6337..a687d0421 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -345,21 +345,19 @@ ephy_encoding_menu_automatic_cb (GtkAction *action, EphyEncodingMenu *menu)
 	ephy_embed_set_encoding (embed, "");
 }
 
-static GtkActionEntry menu_entries [] =
+static const GtkActionEntry menu_entries [] =
 {
 	{ "ViewEncodingOther", NULL, N_("_Other..."), NULL,
 	  N_("Other encodings"),
 	  G_CALLBACK (ephy_encoding_menu_view_dialog_cb) }
 };
-static guint n_menu_entries = G_N_ELEMENTS (menu_entries);
 
-static GtkToggleActionEntry toggle_menu_entries [] =
+static const GtkToggleActionEntry toggle_menu_entries [] =
 {
 	{ "ViewEncodingAutomatic", NULL, N_("_Automatic"), NULL,
 	  N_("Use the encoding specified by the document"),
 	  G_CALLBACK (ephy_encoding_menu_automatic_cb), FALSE }
 };
-static const guint n_toggle_menu_entries = G_N_ELEMENTS (toggle_menu_entries);
 
 static void
 ephy_encoding_menu_set_window (EphyEncodingMenu *menu, EphyWindow *window)
@@ -380,9 +378,9 @@ ephy_encoding_menu_set_window (EphyEncodingMenu *menu, EphyWindow *window)
 	menu->priv->action_group = action_group;
 
 	gtk_action_group_add_actions (action_group, menu_entries,
-				      n_menu_entries, menu);
+				      G_N_ELEMENTS (menu_entries), menu);
 	gtk_action_group_add_toggle_actions (action_group, toggle_menu_entries,
-                                    	     n_toggle_menu_entries, menu);
+                                    	     G_N_ELEMENTS (toggle_menu_entries), menu);
 
 	/* add actions for the existing encodings */
 	encodings = ephy_encodings_get_all (menu->priv->encodings);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index e499a19f8..0fe345ad1 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -68,13 +68,12 @@
 #include "ephy-node-common.h"
 #include "ephy-node-view.h"
 
-static GtkTargetEntry page_drag_types [] =
+static const GtkTargetEntry page_drag_types [] =
 {
         { EPHY_DND_URL_TYPE,        0, 0 },
         { EPHY_DND_URI_LIST_TYPE,   0, 1 },
         { EPHY_DND_TEXT_TYPE,       0, 2 }
 };
-static int n_page_drag_types = G_N_ELEMENTS (page_drag_types);
 
 static void ephy_history_window_class_init (EphyHistoryWindowClass *klass);
 static void ephy_history_window_init (EphyHistoryWindow *editor);
@@ -159,7 +158,7 @@ enum
 
 static GObjectClass *parent_class = NULL;
 
-static GtkActionEntry ephy_history_ui_entries [] = {
+static const GtkActionEntry ephy_history_ui_entries [] = {
 	/* Toplevel */
 	{ "File", NULL, N_("_File") },
 	{ "Edit", NULL, N_("_Edit") },
@@ -209,7 +208,6 @@ static GtkActionEntry ephy_history_ui_entries [] = {
 	  N_("Display credits for the web browser creators"),
 	  G_CALLBACK (window_cmd_help_about) },
 };
-static guint ephy_history_ui_n_entries = G_N_ELEMENTS (ephy_history_ui_entries);
 
 enum
 {
@@ -218,7 +216,7 @@ enum
 	VIEW_TITLE_AND_ADDRESS
 };
 
-static GtkRadioActionEntry ephy_history_radio_entries [] =
+static const GtkRadioActionEntry ephy_history_radio_entries [] =
 {
 	/* View Menu */
 	{ "ViewTitle", NULL, N_("_Title"), NULL,
@@ -229,7 +227,6 @@ static GtkRadioActionEntry ephy_history_radio_entries [] =
 	  N_("Show both the title and address columns"),
 	  VIEW_TITLE_AND_ADDRESS } 
 };
-static guint ephy_history_n_radio_entries = G_N_ELEMENTS (ephy_history_radio_entries);
 
 static void
 confirmation_dialog_response_cb (GtkWidget *dialog,
@@ -1208,12 +1205,12 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	action_group = gtk_action_group_new ("PopupActions");
 	gtk_action_group_set_translation_domain (action_group, NULL);
 	gtk_action_group_add_actions (action_group, ephy_history_ui_entries,
-				      ephy_history_ui_n_entries, editor);
+				      G_N_ELEMENTS (ephy_history_ui_entries), editor);
 
 	details_value = get_details_value ();
 	gtk_action_group_add_radio_actions (action_group,
 					    ephy_history_radio_entries,
-					    ephy_history_n_radio_entries,
+					    G_N_ELEMENTS (ephy_history_radio_entries),
 					    details_value,
 					    G_CALLBACK (cmd_view_columns), 
 					    editor);
@@ -1262,7 +1259,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 						  NULL);
 	ephy_node_view_enable_drag_source (EPHY_NODE_VIEW (sites_view),
 					   page_drag_types,
-				           n_page_drag_types,
+				           G_N_ELEMENTS (page_drag_types),
 					   url_col_id,
 					   title_col_id);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (sites_view));
@@ -1329,7 +1326,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	editor->priv->address_col = col;
 	ephy_node_view_enable_drag_source (EPHY_NODE_VIEW (pages_view),
 					   page_drag_types,
-				           n_page_drag_types,
+				           G_N_ELEMENTS (page_drag_types),
 					   url_col_id, title_col_id);
 	ephy_node_view_set_sort (EPHY_NODE_VIEW (pages_view), G_TYPE_INT,
 				 EPHY_NODE_PAGE_PROP_LAST_VISIT,
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 71b542a1a..052ef3979 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -47,9 +47,9 @@ static gboolean open_in_new_tab = FALSE;
 static gboolean open_fullscreen = FALSE;
 static gboolean open_as_bookmarks_editor = FALSE;
 
-static const char *session_filename = NULL;
-static const char *bookmark_url = NULL;
-static const char *bookmarks_file = NULL;
+static char *session_filename = NULL;
+static char *bookmark_url = NULL;
+static char *bookmarks_file = NULL;
 
 static struct poptOption popt_options[] =
 {
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 8ba8c29ba..182849ce6 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -86,12 +86,11 @@ static void move_tab_to_another_notebook (EphyNotebook *src,
 /* Local variables */
 static GdkCursor *cursor = NULL;
 
-static GtkTargetEntry url_drag_types [] = 
+static const GtkTargetEntry url_drag_types [] = 
 {
         { EPHY_DND_URI_LIST_TYPE,   0, 0 },
         { EPHY_DND_URL_TYPE,        0, 1 }
 };
-static guint n_url_drag_types = G_N_ELEMENTS (url_drag_types);
 
 enum
 {
@@ -808,7 +807,7 @@ ephy_notebook_init (EphyNotebook *notebook)
 			  NULL);
         gtk_drag_dest_set (GTK_WIDGET(notebook), GTK_DEST_DEFAULT_MOTION |
 			   GTK_DEST_DEFAULT_DROP,
-                           url_drag_types,n_url_drag_types,
+                           url_drag_types, G_N_ELEMENTS (url_drag_types),
                            GDK_ACTION_MOVE | GDK_ACTION_COPY);
 
 	notebook->priv->tabs_vis_notifier_id = eel_gconf_notification_add
@@ -1049,7 +1048,7 @@ ephy_notebook_add_tab (EphyNotebook *nb,
 	g_signal_connect (G_OBJECT(label), "drag_data_received",
 			  G_CALLBACK(notebook_drag_data_received_cb), tab);
 	gtk_drag_dest_set (label, GTK_DEST_DEFAULT_ALL,
-			   url_drag_types,n_url_drag_types,
+			   url_drag_types, G_N_ELEMENTS (url_drag_types),
 			   GDK_ACTION_MOVE | GDK_ACTION_COPY);
 
 	sync_icon (tab, NULL, label);
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index d2749094d..6c5be3937 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -84,7 +84,7 @@ static void
 toolbar_cmd_ppv_close (GtkUIManager *merge,
 		       PPViewToolbar *t);
 
-static GtkActionEntry entries [] = {
+static const GtkActionEntry entries [] = {
 	{ "PPVGotoFirst", GTK_STOCK_GOTO_FIRST,
 	  N_("First"), NULL,
 	  N_("Go to the first page"),
@@ -109,13 +109,13 @@ static GtkActionEntry entries [] = {
 
 static const char ui_info[] =
 "<ui>"
-"  <toolbar name=\"PPViewToolbar\">"
-"    <toolitem name=\"PPVGotoFirstItem\" action=\"PPVGotoFirst\" />"
-"    <toolitem name=\"PPVGotoLastItem\" action=\"PPVGotoLast\" />"
-"    <toolitem name=\"PPVGoBackItem\" action=\"PPVGoBack\" />"
-"    <toolitem name=\"PPVGoForwardItem\" action=\"PPVGoForward\" />"
-"    <toolitem name=\"PPVCloseItem\" action=\"PPVClose\" />"
-"  </toolbar>\n"
+"<toolbar name=\"PPViewToolbar\">"
+"<toolitem name=\"PPVGotoFirstItem\" action=\"PPVGotoFirst\" />"
+"<toolitem name=\"PPVGotoLastItem\" action=\"PPVGotoLast\" />"
+"<toolitem name=\"PPVGoBackItem\" action=\"PPVGoBack\" />"
+"<toolitem name=\"PPVGoForwardItem\" action=\"PPVGoForward\" />"
+"<toolitem name=\"PPVCloseItem\" action=\"PPVClose\" />"
+"</toolbar>"
 "</ui>\n";
 
 GType
diff --git a/src/window-commands.c b/src/window-commands.c
index 2b06e2ca5..f6f59b1ee 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -753,15 +753,14 @@ void
 window_cmd_help_about (GtkAction *action,
 		       GtkWidget *window)
 {
-	static char *authors[] = {
+	static const char * const authors[] = {
 		"Marco Pesenti Gritti <marco@gnome.org>",
 		"Xan Lopez <xan@gnome.org>",
 		"David Bordoley <bordoley@msu.edu>",
 		"Christian Persch <chpe@gnome.org>",
 		NULL
 	};
-
-	static char *documenters[] = {
+	static const char *const documenters[] = {
 		"Patanjali Somayaji <patanjali@codito.com>",
 		"David Bordoley <bordoley@msu.edu>",
 		"Piers Cornwell <piers@gnome.org>",