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

Don't assert on future dates, but accept it and show a warning.

Browse source 
On a mobile phone it's not that uncommon to accidentally reset the
system clock by removing the battery. So instead of crashing
a warning is displayed.
This commit is contained in:
Christian Dywan 2009-10-30 21:10:20 +01:00
parent 0f9865b56f
commit 461511c216
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
panels/midori-history.c
View file

@ -577,7 +577,7 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column,
GtkCellRenderer* renderer, GtkCellRenderer* renderer,
GtkTreeModel* model, GtkTreeModel* model,
GtkTreeIter* iter, GtkTreeIter* iter,
GtkWidget* treeview) MidoriHistory* history)
{ {
KatzeItem* item; KatzeItem* item;
gint64 age; gint64 age;
@ -590,9 +590,21 @@ midori_history_treeview_render_text_cb (GtkTreeViewColumn* column,
{ {
gchar* sdate; gchar* sdate;
g_assert (age >= 0); /* A negative age is a date in the future, the clock is probably off */
if (age < -1)
{
static gboolean clock_warning = FALSE;
if (!clock_warning)
{
midori_app_send_notification (history->app,
_("Erroneous clock time"),
_("The clock time lies in the past. "
"Please check the current date and time."));
clock_warning = TRUE;
}
}
if (age > 7) if (age > 7 || age < 0)
{ {
g_object_set (renderer, "text", katze_item_get_name (item), NULL); g_object_set (renderer, "text", katze_item_get_name (item), NULL);
} }
@ -941,7 +953,7 @@ midori_history_init (MidoriHistory* history)
gtk_tree_view_column_pack_start (column, renderer_text, FALSE); gtk_tree_view_column_pack_start (column, renderer_text, FALSE);
gtk_tree_view_column_set_cell_data_func (column, renderer_text, gtk_tree_view_column_set_cell_data_func (column, renderer_text,
(GtkTreeCellDataFunc)midori_history_treeview_render_text_cb, (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb,
treeview, NULL); history, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
g_object_unref (model); g_object_unref (model);
g_object_connect (treeview, g_object_connect (treeview,