diff options
author | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-08-14 18:50:27 +0800 |
---|---|---|
committer | Diego Escalante Urrelo <diegoe@src.gnome.org> | 2008-08-14 18:50:27 +0800 |
commit | c3463bf64ddd607326384f6134fc38b9710887b8 (patch) | |
tree | 0067ea03bc45bcc089b220c4df651ee8ccd947ac | |
parent | 08f119db46c4de4d5d52f40563f427f830783f7e (diff) | |
download | gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar.gz gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar.bz2 gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar.lz gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar.xz gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.tar.zst gsoc2013-epiphany-c3463bf64ddd607326384f6134fc38b9710887b8.zip |
Make the order in which we name the cols consistent.
Just a minor reordering of *_col variables, no code changed.
svn path=/trunk/; revision=8414
-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 6a6693159..a949d949b 100644 --- a/lib/widgets/ephy-location-entry.h +++ b/lib/widgets/ephy-location-entry.h @@ -74,9 +74,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 d3ea816ab..81d0c1f8a 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.h @@ -44,9 +44,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 2f9c8b2cb..5121a631d 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -504,9 +504,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, |