diff options
Diffstat (limited to 'embed/ephy-history.c')
| -rw-r--r-- | embed/ephy-history.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/embed/ephy-history.c b/embed/ephy-history.c index 4b2876665..3d6e9897c 100644 --- a/embed/ephy-history.c +++ b/embed/ephy-history.c @@ -45,6 +45,9 @@ /* if you change this remember to change also the user interface description */ #define HISTORY_PAGE_OBSOLETE_DAYS 10 +/* the number of seconds in a day */ +#define SECS_PER_DAY (60*60*24) + #define EPHY_HISTORY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY, EphyHistoryPrivate)) struct _EphyHistoryPrivate @@ -240,23 +243,13 @@ ephy_history_class_init (EphyHistoryClass *klass) } static gboolean -page_is_obsolete (EphyNode *node, GDate *now) +page_is_obsolete (EphyNode *node, time_t now) { int last_visit; - GDate date; last_visit = ephy_node_get_property_int (node, EPHY_NODE_PAGE_PROP_LAST_VISIT); - - g_date_clear (&date, 1); -#if GLIB_CHECK_VERSION (2,9,0) - g_date_set_time_t (&date, last_visit); -#else - g_date_set_time (&date, last_visit); -#endif - - return (g_date_days_between (&date, now) >= - HISTORY_PAGE_OBSOLETE_DAYS); + return now - last_visit >= HISTORY_PAGE_OBSOLETE_DAYS*SECS_PER_DAY; } static void @@ -264,16 +257,9 @@ remove_obsolete_pages (EphyHistory *eb) { GPtrArray *children; int i; - GTime now; - GDate current_date; + time_t now; now = time (NULL); - g_date_clear (¤t_date, 1); -#if GLIB_CHECK_VERSION (2,9,0) - g_date_set_time_t (¤t_date, time (NULL)); -#else - g_date_set_time (¤t_date, time (NULL)); -#endif children = ephy_node_get_children (eb->priv->pages); for (i = (int) children->len - 1; i >= 0; i--) @@ -282,7 +268,7 @@ remove_obsolete_pages (EphyHistory *eb) kid = g_ptr_array_index (children, i); - if (page_is_obsolete (kid, ¤t_date)) + if (page_is_obsolete (kid, now)) { ephy_node_unref (kid); } |