epiphany r8413 - in branches/gnome-2-24: lib/widgets src

[diegoe svn gnome org]

Author: diegoe
Date: Thu Aug 14 10:49:54 2008
New Revision: 8413
URL: http://svn.gnome.org/viewvc/epiphany?rev=8413&view=rev

Log:
Make the order in which we name the cols consistent.

Just a minor reordering of *_col variables, no code changed.


Modified:
   branches/gnome-2-24/lib/widgets/ephy-location-entry.c
   branches/gnome-2-24/lib/widgets/ephy-location-entry.h
   branches/gnome-2-24/src/ephy-completion-model.h
   branches/gnome-2-24/src/ephy-location-action.c

Modified: branches/gnome-2-24/lib/widgets/ephy-location-entry.c
==============================================================================
--- branches/gnome-2-24/lib/widgets/ephy-location-entry.c	(original)
+++ branches/gnome-2-24/lib/widgets/ephy-location-entry.c	Thu Aug 14 10:49:54 2008
@@ -62,9 +62,9 @@
 	guint action_col;
 	guint keywords_col;
 	guint relevance_col;
+	guint url_col;
 	guint extra_col;
 	guint favicon_col;
-	guint url_col;
 
 	guint hash;
 
@@ -1007,9 +1007,9 @@
 				    guint action_col,
 				    guint keywords_col,
 				    guint relevance_col,
+				    guint url_col,
 				    guint extra_col,
-				    guint favicon_col,
-				    guint url_col)
+				    guint favicon_col)
 {
 	EphyLocationEntryPrivate *priv = le->priv;
 	GtkTreeModel *sort_model;
@@ -1020,9 +1020,9 @@
 	le->priv->action_col = action_col;
 	le->priv->keywords_col = keywords_col;
 	le->priv->relevance_col = relevance_col;
+	le->priv->url_col = url_col;
 	le->priv->extra_col = extra_col;
 	le->priv->favicon_col = favicon_col;
-	le->priv->url_col = url_col;
 
 	sort_model = gtk_tree_model_sort_new_with_model (model);
 	g_object_unref (model);

Modified: branches/gnome-2-24/lib/widgets/ephy-location-entry.h
==============================================================================
--- branches/gnome-2-24/lib/widgets/ephy-location-entry.h	(original)
+++ branches/gnome-2-24/lib/widgets/ephy-location-entry.h	Thu Aug 14 10:49:54 2008
@@ -70,9 +70,9 @@
 							 guint action_col,
 							 guint keywords_col,
 							 guint relevance_col,
+							 guint url_col,
 							 guint extra_col,
-							 guint favicon_col,
-							 guint url_col);
+							 guint favicon_col);
 
 void		ephy_location_entry_set_location	(EphyLocationEntry *le,
 							 const char *address,

Modified: branches/gnome-2-24/src/ephy-completion-model.h
==============================================================================
--- branches/gnome-2-24/src/ephy-completion-model.h	(original)
+++ branches/gnome-2-24/src/ephy-completion-model.h	Thu Aug 14 10:49:54 2008
@@ -40,9 +40,9 @@
 	EPHY_COMPLETION_ACTION_COL,
 	EPHY_COMPLETION_KEYWORDS_COL,
 	EPHY_COMPLETION_RELEVANCE_COL,
+	EPHY_COMPLETION_URL_COL,
 	EPHY_COMPLETION_EXTRA_COL,
 	EPHY_COMPLETION_FAVICON_COL,
-	EPHY_COMPLETION_URL_COL,
 	N_COL
 } EphyCompletionColumn;
 

Modified: branches/gnome-2-24/src/ephy-location-action.c
==============================================================================
--- branches/gnome-2-24/src/ephy-location-action.c	(original)
+++ branches/gnome-2-24/src/ephy-location-action.c	Thu Aug 14 10:49:54 2008
@@ -460,9 +460,9 @@
 						    EPHY_COMPLETION_ACTION_COL,
 						    EPHY_COMPLETION_KEYWORDS_COL,
 						    EPHY_COMPLETION_RELEVANCE_COL,
+						    EPHY_COMPLETION_URL_COL,
 						    EPHY_COMPLETION_EXTRA_COL,
-						    EPHY_COMPLETION_FAVICON_COL,
-						    EPHY_COMPLETION_URL_COL);
+						    EPHY_COMPLETION_FAVICON_COL);
 
 		ephy_location_entry_set_completion_func (EPHY_LOCATION_ENTRY (proxy), 
 							completion_func,