diff options
author | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-08-14 18:49:54 +0800 |
---|---|---|
committer | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-08-14 18:49:54 +0800 |
commit | 97df6b510e806d54e38952e89563e0a44c1bcea2 (patch) | |
tree | 8e0499c7692235d495ea7075f770f49fc6cb02be | |
parent | 7d5685240767828e16ecc8276c51eb90a3b0179c (diff) | |
download | gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar.gz gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar.bz2 gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar.lz gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar.xz gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.tar.zst gsoc2013-epiphany-97df6b510e806d54e38952e89563e0a44c1bcea2.zip |
Make the order in which we name the cols consistent.
Just a minor reordering of *_col variables, no code changed.
svn path=/branches/gnome-2-24/; revision=8413
-rw-r--r-- | lib/widgets/ephy-location-entry.c | 8 | ||||
-rw-r--r-- | lib/widgets/ephy-location-entry.h | 4 | ||||
-rw-r--r-- | src/ephy-completion-model.h | 2 | ||||
-rw-r--r-- | src/ephy-location-action.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index ee530aae7..53b28338b 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -62,9 +62,9 @@ struct _EphyLocationEntryPrivate 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 @@ ephy_location_entry_set_completion (EphyLocationEntry *le, 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 @@ ephy_location_entry_set_completion (EphyLocationEntry *le, 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); diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h index 48c16daa0..2bee79cf5 100644 --- a/lib/widgets/ephy-location-entry.h +++ b/lib/widgets/ephy-location-entry.h @@ -70,9 +70,9 @@ void ephy_location_entry_set_completion (EphyLocationEntry *le, 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, diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h index 60996313c..cf7f1e93f 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.h @@ -40,9 +40,9 @@ typedef enum 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; diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index ed9eae8c7..f1190822d 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -460,9 +460,9 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) 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, |