callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use g_date_strftime() for UTF-8 correctness; use Julian dates to simplify

Browse Source 
2003-12-19  Federico Mena Quintero  <federico@ximian.com>

	* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
	g_date_strftime() for UTF-8 correctness; use Julian dates to
	simplify the function.
This commit is contained in:
Federico Mena Quintero
2003-12-19 17:38:54 +00:00
committed by Federico Mena Quintero
parent fc3b98b2c2
commit f615072cde
6 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-12-19 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
g_date_strftime() for UTF-8 correctness; use Julian dates to
simplify the function.
Fri Dec 19 01:47:34 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request):

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2003-12-19 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
g_date_strftime() for UTF-8 correctness; use Julian dates to
simplify the function.
Fri Dec 19 01:47:34 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request):

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2003-12-19 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
g_date_strftime() for UTF-8 correctness; use Julian dates to
simplify the function.
Fri Dec 19 01:47:34 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request):

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2003-12-19 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
g_date_strftime() for UTF-8 correctness; use Julian dates to
simplify the function.
Fri Dec 19 01:47:34 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request):

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2003-12-19 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Use
g_date_strftime() for UTF-8 correctness; use Julian dates to
simplify the function.
Fri Dec 19 01:47:34 2003 Matthias Clasen <maclas@gmx.de>
* gtk/gtkscrolledwindow.c (gtk_scrolled_window_size_request):

60
gtk/gtkfilechooserdefault.c
View File

@ -2972,8 +2972,9 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column,
{
GtkFileChooserDefault *impl;
const GtkFileInfo *info;
time_t mtime, now;
struct tm tm, now_tm;
GtkFileTime time_mtime, time_now;
GDate mtime, now;
int days_diff;
char buf[256];
impl = data;
@ -2982,52 +2983,29 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column,
if (!info)
return;
mtime = (time_t) gtk_file_info_get_modification_time (info);
tm = *localtime (&mtime);
time_mtime = gtk_file_info_get_modification_time (info);
g_date_set_time (&mtime, (GTime) time_mtime);
now = time (NULL);
now_tm = *localtime (&now);
time_now = (GTime ) time (NULL);
g_date_set_time (&now, (GTime) time_now);
/* Today */
if (tm.tm_mday == now_tm.tm_mday
&& tm.tm_mon == now_tm.tm_mon
&& tm.tm_year == now_tm.tm_year)
days_diff = g_date_get_julian (&now) - g_date_get_julian (&mtime);
if (days_diff == 0)
strcpy (buf, _("Today"));
else if (days_diff == 1)
strcpy (buf, _("Yesterday"));
else
{
int i;
char *format;
/* Days from last week */
if (days_diff > 1 && days_diff < 7)
format = "%A"; /* Days from last week */
else
format = _("%d/%b/%Y"); /* Any other date */
for (i = 1; i < 7; i++)
{
time_t then;
struct tm then_tm;
then = now - i * 60 * 60 * 24;
then_tm = *localtime (&then);
if (tm.tm_mday == then_tm.tm_mday
&& tm.tm_mon == then_tm.tm_mon
&& tm.tm_year == then_tm.tm_year)
{
if (i == 1)
strcpy (buf, _("Yesterday"));
else
if (strftime (buf, sizeof (buf), "%A", &tm) == 0)
strcpy (buf, _("Unknown"));
break;
}
}
/* Any other date */
if (i == 7)
{
if (strftime (buf, sizeof (buf), _("%d/%b/%Y"), &tm) == 0)
strcpy (buf, _("Unknown"));
}
if (g_date_strftime (buf, sizeof (buf), format, &mtime) == 0)
strcpy (buf, _("Unknown"));
}
set_cell_text_bold_if_folder (info, cell, buf);