depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2025-01-05 19:15:32 +00:00
Code Issues Releases Wiki Activity

BestMatch: Simplify code for updating new best matching individual

Browse source
This commit is contained in:
Julian Sparber 2021-01-28 14:58:49 +01:00 committed by Evangelos Ribeiro Tzaras
parent 339b71a233
commit 2a85b60f7c
1 changed files with 17 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
src/calls-best-match.c
View file

@ -36,8 +36,6 @@ struct _CallsBestMatch
CallsBestMatchView *view; CallsBestMatchView *view;
FolksIndividual *best_match; FolksIndividual *best_match;
gchar *phone_number; gchar *phone_number;
gulong display_name_notify_handler_id;
gulong avatar_notify_handler_id;
}; };
G_DEFINE_TYPE (CallsBestMatch, calls_best_match, G_TYPE_OBJECT); G_DEFINE_TYPE (CallsBestMatch, calls_best_match, G_TYPE_OBJECT);
@ -80,122 +78,35 @@ notify_avatar (CallsBestMatch *self)
} }
static void static void
set_best_match (CallsBestMatch *self, update_best_match (CallsBestMatch *self)
FolksIndividual *best_match)
{ {
g_assert (self->best_match == NULL); FolksIndividual *best_match = calls_best_match_view_get_best_match (self->view);
g_assert (self->display_name_notify_handler_id == 0);
g_assert (self->avatar_notify_handler_id == 0);
self->best_match = best_match; if (best_match == self->best_match)
g_object_ref (best_match); return;
self->display_name_notify_handler_id = if (self->best_match) {
g_signal_handlers_disconnect_by_data (self->best_match, self);
g_clear_object (&self->best_match);
}
if (best_match) {
g_set_object (&self->best_match, best_match);
g_signal_connect_swapped (self->best_match, g_signal_connect_swapped (self->best_match,
"notify::display-name", "notify::display-name",
G_CALLBACK (notify_name), G_CALLBACK (notify_name),
self); self);
self->avatar_notify_handler_id =
g_signal_connect_swapped (self->best_match, g_signal_connect_swapped (self->best_match,
"notify::avatar", "notify::avatar",
G_CALLBACK (notify_avatar), G_CALLBACK (notify_avatar),
self); self);
} }
static void
clear_best_match (CallsBestMatch *self)
{
calls_clear_signal (self->best_match,
&self->avatar_notify_handler_id);
calls_clear_signal (self->best_match,
&self->display_name_notify_handler_id);
g_clear_object (&self->best_match);
}
static void
new_best_match (CallsBestMatch *self,
FolksIndividual *best_match)
{
set_best_match (self, best_match);
notify_name (self); notify_name (self);
notify_avatar (self); notify_avatar (self);
} }
static void
change_best_match (CallsBestMatch *self,
FolksIndividual *best_match)
{
clear_best_match (self);
set_best_match (self, best_match);
notify_name (self);
notify_avatar (self);
}
static void
remove_best_match (CallsBestMatch *self)
{
clear_best_match (self);
notify_name (self);
notify_avatar (self);
}
static void
update_best_match (CallsBestMatch *self)
{
FolksIndividual *best_match;
g_debug ("Best match property notified");
best_match = calls_best_match_view_get_best_match
(self->view);
if (best_match)
{
if (self->best_match)
{
if (self->best_match == best_match)
{
// No change
g_debug (" No best match change");
}
else
{
// Different best match object
change_best_match (self, best_match);
g_debug (" Different best match object");
}
}
else
{
// New best match
new_best_match (self, best_match);
g_debug (" New best match");
}
}
else
{
if (self->best_match)
{
// Best match disappeared
remove_best_match (self);
g_debug (" Best match disappeared");
}
else
{
// No change
g_debug (" No best match change");
}
}
}
static void static void
set_property (GObject *object, set_property (GObject *object,
guint property_id, guint property_id,
@ -256,6 +167,11 @@ dispose (GObject *object)
g_clear_object (&self->view); g_clear_object (&self->view);
g_clear_pointer (&self->phone_number, g_free); g_clear_pointer (&self->phone_number, g_free);
if (self->best_match) {
g_signal_handlers_disconnect_by_data (self->best_match, self);
g_clear_object (&self->best_match);
}
G_OBJECT_CLASS (calls_best_match_parent_class)->dispose (object); G_OBJECT_CLASS (calls_best_match_parent_class)->dispose (object);
} }