diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-12-18 03:08:40 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-12-18 03:08:40 +0800 |
| commit | 7bb2d46bde7f24278f1eef01fc97854b870b948f (patch) | |
| tree | efb093f4ebe169001fff8b7090523bebe7102772 /src | |
| parent | bbe2b5bf9901099d93388ffdac41afce0a6f96e2 (diff) | |
| download | gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar.gz gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar.bz2 gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar.lz gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar.xz gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.tar.zst gsoc2013-epiphany-7bb2d46bde7f24278f1eef01fc97854b870b948f.zip | |
List title and URL in location entry drop-down. Bug #169550, patch by
2006-12-17 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-location-entry.c:
(ephy_location_entry_set_completion):
* lib/widgets/ephy-location-entry.h:
* src/ephy-completion-model.c:
(ephy_completion_model_get_column_type),
(ephy_completion_model_get_value):
* src/ephy-completion-model.h:
* src/ephy-location-action.c: (connect_proxy):
List title and URL in location entry drop-down. Bug #169550,
patch by Diego Escalante Urrelo.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-completion-model.c | 12 | ||||
| -rw-r--r-- | src/ephy-completion-model.h | 1 | ||||
| -rw-r--r-- | src/ephy-location-action.c | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c index b54122bf8..75358c096 100644 --- a/src/ephy-completion-model.c +++ b/src/ephy-completion-model.c @@ -271,6 +271,7 @@ ephy_completion_model_get_column_type (GtkTreeModel *tree_model, case EPHY_COMPLETION_TEXT_COL: case EPHY_COMPLETION_ACTION_COL: case EPHY_COMPLETION_KEYWORDS_COL: + case EPHY_COMPLETION_EXTRA_COL: type = G_TYPE_STRING; break; case EPHY_COMPLETION_RELEVANCE_COL: @@ -427,6 +428,17 @@ ephy_completion_model_get_value (GtkTreeModel *tree_model, switch (column) { + case EPHY_COMPLETION_EXTRA_COL: + g_value_init (value, G_TYPE_STRING); + /* We set an additional text for the item title only for history, since we assume that people know the url of their bookmarks */ + if (group == HISTORY_GROUP) + { + const char *text; + text = ephy_node_get_property_string + (node, EPHY_NODE_PAGE_PROP_TITLE); + g_value_set_string (value, text); + } + break; case EPHY_COMPLETION_TEXT_COL: g_value_init (value, G_TYPE_STRING); init_text_col (value, node, group); diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h index 319c94eed..d54470912 100644 --- a/src/ephy-completion-model.h +++ b/src/ephy-completion-model.h @@ -40,6 +40,7 @@ typedef enum EPHY_COMPLETION_ACTION_COL, EPHY_COMPLETION_KEYWORDS_COL, EPHY_COMPLETION_RELEVANCE_COL, + EPHY_COMPLETION_EXTRA_COL, N_COL } EphyCompletionColumn; diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c index df230479c..25af807a5 100644 --- a/src/ephy-location-action.c +++ b/src/ephy-location-action.c @@ -368,7 +368,8 @@ connect_proxy (GtkAction *action, GtkWidget *proxy) EPHY_COMPLETION_TEXT_COL, EPHY_COMPLETION_ACTION_COL, EPHY_COMPLETION_KEYWORDS_COL, - EPHY_COMPLETION_RELEVANCE_COL); + EPHY_COMPLETION_RELEVANCE_COL, + EPHY_COMPLETION_EXTRA_COL); add_completion_actions (action, proxy); |