diff options
| author | rbuj <[email protected]> | 2019-04-30 13:12:04 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-05-04 19:23:16 +0200 |
| commit | 476f56a25be636970b336d525a7766b6d1eb3fff (patch) | |
| tree | 44ee464da369bcd56331fe8b1f5e5aa64c535f94 /src | |
| parent | 02646f7773b7b9b46df570e06084e428817889f0 (diff) | |
| download | caja-476f56a25be636970b336d525a7766b6d1eb3fff.tar.bz2 caja-476f56a25be636970b336d525a7766b6d1eb3fff.tar.xz | |
eel: remove date & time functions
Do not need to extend glib library, since it now incorporates these functions.
Extended date format modifiers are available on glib v2.56.
eel-glib-extensions.h/c:
GDate * eel_g_date_new_tm (struct tm *time_pieces);
char * eel_strdup_strftime (const char *format, struct tm *time_pieces);
gint64 eel_get_system_time (void);
Do not need to test the extensions in eel_self_check_glib_extensions (void).
eel-glib-extensions.c:
static void check_tm_to_g_date (time_t time)
static char * test_strftime (...)
Do not need to check if strftime implements extended date format modifiers on the system (available on glibc v2.27).
configure.ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-file-management-properties.c | 14 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 4 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 4a895962..764a988c 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -508,27 +508,27 @@ create_date_format_menu (GtkBuilder *builder) { GtkComboBoxText *combo_box; gchar *date_string; - time_t now_raw; - struct tm* now; + GDateTime *now; combo_box = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (builder, CAJA_FILE_MANAGEMENT_PROPERTIES_DATE_FORMAT_WIDGET)); - now_raw = time (NULL); - now = localtime (&now_raw); + now = g_date_time_new_now_local (); - date_string = eel_strdup_strftime ("%c", now); + date_string = g_date_time_format (now, "%c"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); - date_string = eel_strdup_strftime ("%Y-%m-%d %H:%M:%S", now); + date_string = g_date_time_format (now, "%Y-%m-%d %H:%M:%S"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); - date_string = eel_strdup_strftime (_("today at %-I:%M:%S %p"), now); + date_string = g_date_time_format (now, _("today at %-I:%M:%S %p")); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), date_string); g_free (date_string); + + g_date_time_unref (now); } static void diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index dce96c56..41ea3f16 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -3198,7 +3198,7 @@ changes_timeout_callback (gpointer data) g_object_ref (G_OBJECT (view)); - now = eel_get_system_time(); + now = g_get_monotonic_time(); time_delta = now - view->details->last_queued; if (time_delta < UPDATE_INTERVAL_RESET*1000) { @@ -3223,7 +3223,7 @@ static void schedule_changes (FMDirectoryView *view) { /* Remember when the change was queued */ - view->details->last_queued = eel_get_system_time(); + view->details->last_queued = g_get_monotonic_time(); /* No need to schedule if there are already changes pending or during loading */ if (view->details->changes_timeout_id != 0 || diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index d1b9cb89..c5bb473a 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -697,7 +697,7 @@ button_press_callback (GtkWidget *widget, GdkEventButton *event, gpointer callba NULL); /* Determine click count */ - current_time = eel_get_system_time (); + current_time = g_get_monotonic_time (); if (current_time - last_click_time < double_click_time * 1000) { click_count++; |