diff options
| author | Xan Lopez <xan@igalia.com> | 2012-02-29 00:39:45 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@igalia.com> | 2012-03-07 04:49:44 +0800 |
| commit | 8ad6302a3f9e1a867f3dd61605196d22e9bd2f86 (patch) | |
| tree | 0e5167f79659daa565fe455ae3c0a80f95e057ae /embed | |
| parent | 306fb5a64f9b347fde9cf99ee7a594f04e9d7601 (diff) | |
| download | gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar.gz gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar.bz2 gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar.lz gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar.xz gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.tar.zst gsoc2013-epiphany-8ad6302a3f9e1a867f3dd61605196d22e9bd2f86.zip | |
Hook the new history to the URL entry
We now fetch the history from the SQL backend using a service thread,
and merge the results with our old bookmark data.
Diffstat (limited to 'embed')
| -rw-r--r-- | embed/ephy-browse-history.c | 5 | ||||
| -rw-r--r-- | embed/ephy-browse-history.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/embed/ephy-browse-history.c b/embed/ephy-browse-history.c index 3295f8517..c58eaeaf7 100644 --- a/embed/ephy-browse-history.c +++ b/embed/ephy-browse-history.c @@ -181,6 +181,7 @@ ephy_browse_history_get_url (EphyBrowseHistory *history, void ephy_browse_history_find_urls (EphyBrowseHistory *history, gint64 from, gint64 to, + guint limit, GList *substring_list, EphyHistoryJobCallback callback, gpointer user_data) @@ -193,6 +194,10 @@ ephy_browse_history_find_urls (EphyBrowseHistory *history, query->from = from; query->to = to; query->substring_list = substring_list; + query->sort_type = EPHY_HISTORY_SORT_MV; + + if (limit != 0) + query->limit = limit; ephy_history_service_query_urls (history->priv->history_service, query, callback, user_data); diff --git a/embed/ephy-browse-history.h b/embed/ephy-browse-history.h index abb61343d..980134af5 100644 --- a/embed/ephy-browse-history.h +++ b/embed/ephy-browse-history.h @@ -93,6 +93,7 @@ void ephy_browse_history_get_url (EphyBrowseHistory *history, void ephy_browse_history_find_urls (EphyBrowseHistory *history, gint64 from, gint64 to, + guint limit, GList *substring_list, EphyHistoryJobCallback callback, gpointer user_data); |