debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do not add history items for URIs that were visited on the same day

Browse source
This commit is contained in:
Christian Dywan 2009-10-02 21:29:08 +02:00
parent 41385a9e5e
commit 255018aeaa
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
midori/midori-browser.c
View file

@ -160,7 +160,7 @@ midori_browser_get_property (GObject* object,
static void static void
midori_browser_new_history_item (MidoriBrowser* browser, midori_browser_new_history_item (MidoriBrowser* browser,
KatzeItem* item); KatzeItem** item);
static void static void
_midori_browser_set_toolbar_style (MidoriBrowser* browser, _midori_browser_set_toolbar_style (MidoriBrowser* browser,
@ -559,7 +559,8 @@ midori_view_notify_title_cb (GtkWidget* widget,
else else
{ {
katze_object_assign (item, katze_item_copy (proxy)); katze_object_assign (item, katze_item_copy (proxy));
midori_browser_new_history_item (browser, g_object_ref (item)); midori_browser_new_history_item (browser, &item);
g_object_ref (item);
g_object_set_data_full (G_OBJECT (view), "history-item-added", g_object_set_data_full (G_OBJECT (view), "history-item-added",
item, (GDestroyNotify)g_object_unref); item, (GDestroyNotify)g_object_unref);
} }
@ -4878,31 +4879,33 @@ midori_browser_entry_clear_icon_released_cb (GtkIconEntry* entry,
static void static void
midori_browser_new_history_item (MidoriBrowser* browser, midori_browser_new_history_item (MidoriBrowser* browser,
KatzeItem* item) KatzeItem** item)
{ {
KatzeArray* parent; KatzeArray* parent;
gint i; gint i;
gboolean found; gboolean found;
time_t now; time_t now;
gint64 day; gint64 day;
gint64 pday;
gint64 newage;
gchar token[50]; gchar token[50];
now = time (NULL); now = time (NULL);
katze_item_set_added (item, now); katze_item_set_added (*item, now);
day = sokoke_time_t_to_julian (&now); day = sokoke_time_t_to_julian (&now);
found = FALSE; found = FALSE;
i = 0; i = 0;
while ((parent = katze_array_get_nth_item (browser->history, i++))) while ((parent = katze_array_get_nth_item (browser->history, i++)))
{ {
pday = katze_item_get_added (KATZE_ITEM (parent)); gint64 pday = katze_item_get_added (KATZE_ITEM (parent));
newage = day - pday; if (day - pday == 0)
if (newage == 0)
{ {
KatzeItem* _item;
found = TRUE; found = TRUE;
katze_array_add_item (parent, item); if ((_item = katze_array_find_uri (parent, katze_item_get_uri (*item))))
*item = g_object_ref (_item);
else
katze_array_add_item (parent, *item);
} }
} }
if (!found) if (!found)
@ -4912,7 +4915,7 @@ midori_browser_new_history_item (MidoriBrowser* browser,
katze_item_set_added (KATZE_ITEM (parent), day); katze_item_set_added (KATZE_ITEM (parent), day);
katze_item_set_name (KATZE_ITEM (parent), token); katze_item_set_name (KATZE_ITEM (parent), token);
katze_array_add_item (browser->history, parent); katze_array_add_item (browser->history, parent);
katze_array_add_item (parent, item); katze_array_add_item (parent, *item);
} }
} }