summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac19
-rw-r--r--gsearchtool/src/gsearchtool-support.c192
-rw-r--r--gsearchtool/src/gsearchtool-support.h7
-rw-r--r--gsearchtool/src/gsearchtool.c18
4 files changed, 35 insertions, 201 deletions
diff --git a/configure.ac b/configure.ac
index 7dcaddb0..ed501a1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,25 +258,6 @@ AS_IF([test "x$have_ipv6" = "xyes"],
]
)
-
-dnl strftime extension checks
-AC_TRY_RUN([
- #include <time.h>
- int main (void) {
- char buf[100];
- struct tm tm = {0};
- tm.tm_year = 99;
- if (strftime(buf, 100, "%EY", &tm) == 4 && strcmp (buf, "1999")==0)
- return 0;
- return 1;
- }
- ],
- [
- AC_DEFINE([HAVE_STRFTIME_EXTENSION], [1],
- [Define if strftime supports %E and %O modifiers.])
- ]
-)
-
dnl mate-search-tool checks
withval=""
AC_ARG_WITH([grep],
diff --git a/gsearchtool/src/gsearchtool-support.c b/gsearchtool/src/gsearchtool-support.c
index 272d089d..54d1475a 100644
--- a/gsearchtool/src/gsearchtool-support.c
+++ b/gsearchtool/src/gsearchtool-support.c
@@ -408,193 +408,33 @@ remove_mnemonic_character (const gchar * string)
}
gchar *
-get_readable_date (const CajaDateFormat date_format_enum,
- const time_t file_time_raw)
+get_readable_date (const CajaDateFormat date_format_enum,
+ GDateTime *file_date_time)
{
- struct tm * file_time;
- gchar * format;
- GDate * today;
- GDate * file_date;
- guint32 file_date_age;
- gchar * readable_date;
-
- file_time = localtime (&file_time_raw);
+ const gchar *format;
+ GDateTime *now;
+ GTimeSpan file_date_age;
/* Base format of date column on caja date-format key */
if (date_format_enum == CAJA_DATE_FORMAT_LOCALE) {
- return gsearchtool_strdup_strftime ("%c", file_time);
+ return g_date_time_format (file_date_time, "%c");
} else if (date_format_enum == CAJA_DATE_FORMAT_ISO) {
- return gsearchtool_strdup_strftime ("%Y-%m-%d %H:%M:%S", file_time);
+ return g_date_time_format (file_date_time, "%Y-%m-%d %H:%M:%S");
}
- file_date = g_date_new_dmy (file_time->tm_mday,
- file_time->tm_mon + 1,
- file_time->tm_year + 1900);
-
- today = g_date_new ();
- g_date_set_time_t (today, time (NULL));
-
- file_date_age = g_date_get_julian (today) - g_date_get_julian (file_date);
+ now = g_date_time_new_now_local ();
+ file_date_age = g_date_time_difference (now, file_date_time);
+ g_date_time_unref (now);
- g_date_free (today);
- g_date_free (file_date);
-
- if (file_date_age == 0) {
- /* Translators: Below are the strings displayed in the 'Date Modified'
- column of the list view. The format of this string can vary depending
- on age of a file. Please modify the format of the timestamp to match
- your locale. For example, to display 24 hour time replace the '%-I'
- with '%-H' and remove the '%p'. (See bugzilla report #120434.) */
- format = g_strdup(_("today at %-I:%M %p"));
- } else if (file_date_age == 1) {
- format = g_strdup(_("yesterday at %-I:%M %p"));
- } else if (file_date_age < 7) {
- format = g_strdup(_("%A, %B %-d %Y at %-I:%M:%S %p"));
+ if (file_date_age < G_TIME_SPAN_DAY) {
+ format = _("today at %-I:%M %p");
+ } else if (file_date_age < 2 * G_TIME_SPAN_DAY) {
+ format = _("yesterday at %-I:%M %p");
} else {
- format = g_strdup(_("%A, %B %-d %Y at %-I:%M:%S %p"));
- }
-
- readable_date = gsearchtool_strdup_strftime (format, file_time);
- g_free (format);
-
- return readable_date;
-}
-
-gchar *
-gsearchtool_strdup_strftime (const gchar * format,
- struct tm * time_pieces)
-{
- /* This function is borrowed from eel's eel_strdup_strftime() */
- GString * string;
- const char * remainder, * percent;
- char code[4], buffer[512];
- char * piece, * result, * converted;
- size_t string_length;
- gboolean strip_leading_zeros, turn_leading_zeros_to_spaces;
- char modifier;
- int i;
-
- /* Format could be translated, and contain UTF-8 chars,
- * so convert to locale encoding which strftime uses */
- converted = g_locale_from_utf8 (format, -1, NULL, NULL, NULL);
- g_return_val_if_fail (converted != NULL, NULL);
-
- string = g_string_new ("");
- remainder = converted;
-
- /* Walk from % character to % character. */
- for (;;) {
- percent = strchr (remainder, '%');
- if (percent == NULL) {
- g_string_append (string, remainder);
- break;
- }
- g_string_append_len (string, remainder,
- percent - remainder);
-
- /* Handle the "%" character. */
- remainder = percent + 1;
- switch (*remainder) {
- case '-':
- strip_leading_zeros = TRUE;
- turn_leading_zeros_to_spaces = FALSE;
- remainder++;
- break;
- case '_':
- strip_leading_zeros = FALSE;
- turn_leading_zeros_to_spaces = TRUE;
- remainder++;
- break;
- case '%':
- g_string_append_c (string, '%');
- remainder++;
- continue;
- case '\0':
- g_warning ("Trailing %% passed to gsearchtool_strdup_strftime");
- g_string_append_c (string, '%');
- continue;
- default:
- strip_leading_zeros = FALSE;
- turn_leading_zeros_to_spaces = FALSE;
- break;
- }
-
- modifier = 0;
- if (strchr (SUS_EXTENDED_STRFTIME_MODIFIERS, *remainder) != NULL) {
- modifier = *remainder;
- remainder++;
-
- if (*remainder == 0) {
- g_warning ("Unfinished %%%c modifier passed to gsearchtool_strdup_strftime", modifier);
- break;
- }
- }
-
- if (strchr (C_STANDARD_STRFTIME_CHARACTERS, *remainder) == NULL) {
- g_warning ("gsearchtool_strdup_strftime does not support "
- "non-standard escape code %%%c",
- *remainder);
- }
-
- /* Convert code to strftime format. We have a fixed
- * limit here that each code can expand to a maximum
- * of 512 bytes, which is probably OK. There's no
- * limit on the total size of the result string.
- */
- i = 0;
- code[i++] = '%';
- if (modifier != 0) {
-#ifdef HAVE_STRFTIME_EXTENSION
- code[i++] = modifier;
-#endif
- }
- code[i++] = *remainder;
- code[i++] = '\0';
- string_length = strftime (buffer, sizeof (buffer),
- code, time_pieces);
- if (string_length == 0) {
- /* We could put a warning here, but there's no
- * way to tell a successful conversion to
- * empty string from a failure.
- */
- buffer[0] = '\0';
- }
-
- /* Strip leading zeros if requested. */
- piece = buffer;
- if (strip_leading_zeros || turn_leading_zeros_to_spaces) {
- if (strchr (C_STANDARD_NUMERIC_STRFTIME_CHARACTERS, *remainder) == NULL) {
- g_warning ("gsearchtool_strdup_strftime does not support "
- "modifier for non-numeric escape code %%%c%c",
- remainder[-1],
- *remainder);
- }
- if (*piece == '0') {
- do {
- piece++;
- } while (*piece == '0');
- if (!g_ascii_isdigit (*piece)) {
- piece--;
- }
- }
- if (turn_leading_zeros_to_spaces) {
- memset (buffer, ' ', piece - buffer);
- piece = buffer;
- }
- }
- remainder++;
-
- /* Add this piece. */
- g_string_append (string, piece);
+ format = _("%A, %B %-d %Y at %-I:%M:%S %p");
}
- /* Convert the string back into utf-8. */
- result = g_locale_to_utf8 (string->str, -1, NULL, NULL, NULL);
-
- g_string_free (string, TRUE);
- g_free (converted);
-
- return result;
+ return g_date_time_format (file_date_time, format);
}
gchar *
diff --git a/gsearchtool/src/gsearchtool-support.h b/gsearchtool/src/gsearchtool-support.h
index 7d9842b7..cca3846f 100644
--- a/gsearchtool/src/gsearchtool-support.h
+++ b/gsearchtool/src/gsearchtool-support.h
@@ -68,11 +68,8 @@ gchar *
remove_mnemonic_character (const gchar * string);
gchar *
-get_readable_date (const CajaDateFormat date_format_enum,
- const time_t file_time_raw);
-gchar *
-gsearchtool_strdup_strftime (const gchar * format,
- struct tm * time_pieces);
+get_readable_date (const CajaDateFormat date_format_enum,
+ GDateTime *file_time_raw);
gchar *
get_file_type_description (const gchar * file,
GFileInfo * file_info);
diff --git a/gsearchtool/src/gsearchtool.c b/gsearchtool/src/gsearchtool.c
index 964e7f4c..bdc1561a 100644
--- a/gsearchtool/src/gsearchtool.c
+++ b/gsearchtool/src/gsearchtool.c
@@ -840,7 +840,12 @@ add_file_to_search_results (const gchar * file,
GFileInfo * file_info;
GFile * g_file;
GError * error = NULL;
+ GDateTime * file_dt;
+#if GLIB_CHECK_VERSION(2,61,2)
+ gint64 time_val;
+#else
GTimeVal time_val;
+#endif
GtkTreePath * path;
GtkTreeRowReference * reference;
gchar * description;
@@ -875,8 +880,14 @@ add_file_to_search_results (const gchar * file,
description = get_file_type_description (file, file_info);
readable_size = g_format_size (g_file_info_get_size (file_info));
+#if GLIB_CHECK_VERSION(2,61,2)
+ file_dt = g_file_info_get_modification_date_time (file_info);
+ time_val = g_date_time_to_unix (file_dt);
+#else
g_file_info_get_modification_time (file_info, &time_val);
- readable_date = get_readable_date (gsearch->search_results_date_format, time_val.tv_sec);
+ file_dt = g_date_time_new_from_unix_local ((gint64) time_val.tv_sec);
+#endif
+ readable_date = get_readable_date (gsearch->search_results_date_format, file_dt);
base_name = g_path_get_basename (file);
dir_name = g_path_get_dirname (file);
@@ -915,7 +926,11 @@ add_file_to_search_results (const gchar * file,
COLUMN_SIZE, (-1) * (gdouble) file_size,
COLUMN_TYPE, (description != NULL) ? description : g_strdup (g_file_info_get_content_type (file_info)),
COLUMN_READABLE_DATE, readable_date,
+#if GLIB_CHECK_VERSION(2,61,2)
+ COLUMN_DATE, (-1) * (gdouble) time_val,
+#else
COLUMN_DATE, (-1) * (gdouble) time_val.tv_sec,
+#endif
COLUMN_NO_FILES_FOUND, FALSE,
-1);
@@ -946,6 +961,7 @@ add_file_to_search_results (const gchar * file,
g_object_unref (g_file);
g_object_unref (file_info);
+ g_date_time_unref (file_dt);
g_free (base_name);
g_free (dir_name);
g_free (relative_dir_name);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-04 10:03:38 +0000