commit 544b8c0f1f2970eb619025b7a3ae7579131adc67
parent 5a51208c20daaf2c3d2c83d072d57157a799cbc8
Author: Jacki <jacki@thejackimonster.de>
Date: Thu, 26 Sep 2024 18:15:03 +0200
Adjust code to build with time format changes
Diffstat:
12 files changed, 38 insertions(+), 54 deletions(-)
diff --git a/src/event.c b/src/event.c
@@ -591,11 +591,12 @@ event_presence_contact(MESSENGER_Application *app,
"presence.online"
);
- struct GNUNET_TIME_Absolute timestamp = GNUNET_CHAT_message_get_timestamp(
+ char time [20];
+ time_t timestamp = GNUNET_CHAT_message_get_timestamp(
msg
);
- const char *time = GNUNET_STRINGS_absolute_time_to_string(timestamp);
+ strftime(time, 20, "%Y-%m-%d %H:%M:%S", localtime(×tamp));
ui_label_set_text(message->text_label, text);
ui_label_set_text(message->timestamp_label, time);
@@ -686,10 +687,10 @@ event_invitation(MESSENGER_Application *app,
return;
if (app->settings.delete_invitations_delay > 0)
- GNUNET_CHAT_message_delete(msg, GNUNET_TIME_relative_multiply(
- GNUNET_TIME_relative_get_second_(),
+ GNUNET_CHAT_message_delete(
+ msg,
app->settings.delete_invitations_delay
- ));
+ );
const int sent = GNUNET_CHAT_message_is_sent(msg);
@@ -766,10 +767,10 @@ event_receive_message(MESSENGER_Application *app,
const int sent = GNUNET_CHAT_message_is_sent(msg);
if ((sent) && (app->settings.auto_delete_delay > 0))
- GNUNET_CHAT_message_delete(msg, GNUNET_TIME_relative_multiply(
- GNUNET_TIME_relative_get_second_(),
+ GNUNET_CHAT_message_delete(
+ msg,
app->settings.auto_delete_delay
- ));
+ );
const gchar *text = GNUNET_CHAT_message_get_text(msg);
@@ -793,10 +794,10 @@ event_receive_message(MESSENGER_Application *app,
file_add_ui_message_to_info(file, message);
if (app->settings.delete_files_delay > 0)
- GNUNET_CHAT_message_delete(msg, GNUNET_TIME_relative_multiply(
- GNUNET_TIME_relative_get_second_(),
+ GNUNET_CHAT_message_delete(
+ msg,
app->settings.delete_files_delay
- ));
+ );
}
ui_message_update(message, app, msg);
@@ -807,11 +808,12 @@ event_receive_message(MESSENGER_Application *app,
ui_message_set_contact(message, contact);
- struct GNUNET_TIME_Absolute timestamp = GNUNET_CHAT_message_get_timestamp(
+ char time [20];
+ time_t timestamp = GNUNET_CHAT_message_get_timestamp(
msg
);
- const char *time = GNUNET_STRINGS_absolute_time_to_string(timestamp);
+ strftime(time, 20, "%Y-%m-%d %H:%M:%S", localtime(×tamp));
if ((!ui_messenger_is_context_active(&(app->ui.messenger), context)) &&
(GNUNET_YES == GNUNET_CHAT_message_is_recent(msg)) &&
diff --git a/src/ui/chat.c b/src/ui/chat.c
@@ -25,9 +25,7 @@
#include "chat.h"
#include <gdk/gdkkeysyms.h>
-#include <gnunet/gnunet_common.h>
#include <gnunet/gnunet_chat_lib.h>
-#include <gnunet/gnunet_time_lib.h>
#include <stdlib.h>
#include "chat_entry.h"
@@ -347,12 +345,14 @@ handle_chat_messages_sort(GtkListBoxRow* row0,
if ((!message0) || (!message1))
return 0;
- struct GNUNET_TIME_Absolute timestamp0 = message0->timestamp;
- struct GNUNET_TIME_Absolute timestamp1 = message1->timestamp;
+ time_t timestamp0 = message0->timestamp;
+ time_t timestamp1 = message1->timestamp;
- if (GNUNET_TIME_absolute_cmp(timestamp0, <, timestamp1))
+ const double diff = difftime(timestamp0, timestamp1);
+
+ if (diff < -0.0)
return -1;
- else if (GNUNET_TIME_absolute_cmp(timestamp0, >, timestamp1))
+ else if (diff > +0.0)
return +1;
else
return 0;
diff --git a/src/ui/chat_entry.c b/src/ui/chat_entry.c
@@ -34,8 +34,6 @@
#include <glib-2.0/glib.h>
#include <gnunet/gnunet_chat_lib.h>
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_time_lib.h>
UI_CHAT_ENTRY_Handle*
ui_chat_entry_new(MESSENGER_Application *app,
@@ -47,7 +45,7 @@ ui_chat_entry_new(MESSENGER_Application *app,
memset(handle, 0, sizeof(*handle));
- handle->timestamp = GNUNET_TIME_absolute_get_zero_();
+ handle->timestamp = ((time_t) -1);
handle->context = context;
handle->chat = ui_chat_new(app, handle->context);
@@ -183,13 +181,9 @@ ui_chat_entry_update(UI_CHAT_ENTRY_Handle *handle,
handle->timestamp = last_message->timestamp;
- const struct GNUNET_TIME_Timestamp timestamp = GNUNET_TIME_absolute_to_timestamp(
- handle->timestamp
- );
-
GDateTime *dt_now = g_date_time_new_now_local();
GDateTime *dt_message = g_date_time_new_from_unix_local(
- (gint64) (timestamp.abs_time.abs_value_us / 1000000)
+ (gint64) handle->timestamp
);
GTimeSpan span = g_date_time_difference(dt_now, dt_message);
diff --git a/src/ui/chat_entry.h b/src/ui/chat_entry.h
@@ -33,7 +33,7 @@ typedef struct UI_CHAT_ENTRY_Handle
{
guint update;
- struct GNUNET_TIME_Absolute timestamp;
+ time_t timestamp;
struct GNUNET_CHAT_Context *context;
UI_CHAT_Handle *chat;
diff --git a/src/ui/chat_title.c b/src/ui/chat_title.c
@@ -201,10 +201,7 @@ _delete_messages_callback(MESSENGER_Application *app,
GNUNET_CHAT_message_delete(
message->msg,
- GNUNET_TIME_relative_multiply(
- GNUNET_TIME_relative_get_second_(),
- delay
- )
+ delay
);
application_chat_unlock(app);
diff --git a/src/ui/contact_info.c b/src/ui/contact_info.c
@@ -33,8 +33,6 @@
#include "../ui.h"
#include <gnunet/gnunet_chat_lib.h>
-#include <gnunet/gnunet_common.h>
-#include <gnunet/gnunet_time_lib.h>
#include <string.h>
static void
@@ -168,8 +166,7 @@ _cb_file_upload(void *cls,
GNUNET_CHAT_set_attribute(
app->chat.messenger.handle,
GNUNET_CHAT_ATTRIBUTE_AVATAR,
- uri_string,
- GNUNET_TIME_relative_get_forever_()
+ uri_string
);
GNUNET_free(uri_string);
@@ -753,7 +750,7 @@ handle_value_renderer_edit(GtkCellRendererText *renderer,
if ((new_text) && (strlen(new_text)))
{
application_chat_lock(handle->app);
- GNUNET_CHAT_set_attribute(chat, name, new_text, GNUNET_TIME_relative_get_forever_());
+ GNUNET_CHAT_set_attribute(chat, name, new_text);
application_chat_unlock(handle->app);
gtk_list_store_set(handle->attributes_list, &iter, 1, new_text, -1);
@@ -803,7 +800,7 @@ handle_add_attribute_button_click(UNUSED GtkButton *button,
if ((name) && (value))
{
application_chat_lock(handle->app);
- GNUNET_CHAT_set_attribute(chat, name, value, GNUNET_TIME_relative_get_forever_());
+ GNUNET_CHAT_set_attribute(chat, name, value);
application_chat_unlock(handle->app);
gtk_list_store_insert_with_values(
diff --git a/src/ui/discourse.c b/src/ui/discourse.c
@@ -25,9 +25,7 @@
#include "discourse.h"
#include <glib-2.0/glib.h>
-#include <gnunet/gnunet_common.h>
#include <gnunet/gnunet_chat_lib.h>
-#include <gnunet/gnunet_time_lib.h>
#include "account_entry.h"
#include "discourse_panel.h"
diff --git a/src/ui/message.c b/src/ui/message.c
@@ -262,7 +262,7 @@ ui_message_new(MESSENGER_Application *app,
handle->type = type;
- handle->timestamp = GNUNET_TIME_absolute_get_zero_();
+ handle->timestamp = ((time_t) -1);
handle->msg = NULL;
handle->contact = NULL;
diff --git a/src/ui/message.h b/src/ui/message.h
@@ -45,7 +45,7 @@ typedef struct UI_MESSAGE_Handle
{
UI_MESSAGE_Type type;
- struct GNUNET_TIME_Absolute timestamp;
+ time_t timestamp;
struct GNUNET_CHAT_Message *msg;
struct GNUNET_CHAT_Contact *contact;
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
@@ -365,12 +365,14 @@ handle_chats_listbox_sort_func(GtkListBoxRow* row0,
if ((!entry0) || (!entry1))
return 0;
- struct GNUNET_TIME_Absolute timestamp0 = entry0->timestamp;
- struct GNUNET_TIME_Absolute timestamp1 = entry1->timestamp;
+ time_t timestamp0 = entry0->timestamp;
+ time_t timestamp1 = entry1->timestamp;
- if (GNUNET_TIME_absolute_cmp(timestamp0, >, timestamp1))
+ const double diff = difftime(timestamp0, timestamp1);
+
+ if (diff > +0.0)
return -1;
- else if (GNUNET_TIME_absolute_cmp(timestamp0, <, timestamp1))
+ else if (diff < -0.0)
return +1;
else
return 0;
diff --git a/src/ui/new_account.c b/src/ui/new_account.c
@@ -289,8 +289,7 @@ _cb_file_upload(void *cls,
GNUNET_CHAT_set_attribute(
app->chat.messenger.handle,
GNUNET_CHAT_ATTRIBUTE_AVATAR,
- uri_string,
- GNUNET_TIME_relative_get_forever_()
+ uri_string
);
GNUNET_free(uri_string);
diff --git a/src/ui/new_lobby.c b/src/ui/new_lobby.c
@@ -132,11 +132,6 @@ handle_generate_button_click(UNUSED GtkButton *button,
if (gtk_combo_box_get_active_iter(app->ui.new_lobby.expiration_combo_box, &iter))
gtk_tree_model_get(model, &iter, 1, &delay, -1);
- struct GNUNET_TIME_Relative expiration = GNUNET_TIME_relative_multiply(
- GNUNET_TIME_relative_get_second_(),
- delay
- );
-
gtk_stack_set_visible_child(
app->ui.new_lobby.preview_stack,
GTK_WIDGET(app->ui.new_lobby.loading_spinner)
@@ -154,7 +149,7 @@ handle_generate_button_click(UNUSED GtkButton *button,
GNUNET_CHAT_lobby_open(
app->chat.messenger.handle,
- expiration,
+ delay,
handle_lobby_opened_and_uri_generated,
app
);
