[Xfce4-commits] <midori:master> Select date for all history queries, even filtered

[Christian Dywan]

Updating branch refs/heads/master
         to 765cdfeb27b5f2dd396d6e4111884de15175c55d (commit)
       from cb5bdb86460d333e42adf05482eed879632a813f (commit)

commit 765cdfeb27b5f2dd396d6e4111884de15175c55d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Nov 24 00:37:01 2010 +0100

    Select date for all history queries, even filtered
    
    Deleting requires a date to work.

 panels/midori-history.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/panels/midori-history.c b/panels/midori-history.c
index 34452a8..dce2fd1 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -212,11 +212,11 @@ midori_history_read_from_db (MidoriHistory* history,
         gchar* filterstr;
 
         sqlcmd = "SELECT * FROM ("
-                 "    SELECT uri, title, day FROM history"
+                 "    SELECT uri, title, day, date FROM history"
                  "    WHERE uri LIKE ?1 OR title LIKE ?1 GROUP BY uri "
                  "UNION ALL "
                  "    SELECT replace (uri, '%s', keywords) AS uri, "
-                 "    keywords AS title, day FROM search "
+                 "    keywords AS title, day, 0 AS date FROM search "
                  "    WHERE uri LIKE ?1 OR keywords LIKE ?1 GROUP BY uri "
                  ") ORDER BY day ASC";
         result = sqlite3_prepare_v2 (db, sqlcmd, -1, &statement, NULL);