depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-12-12 07:37:35 +00:00
Code Issues Releases Wiki Activity

best-match: codestyle

Browse source
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-06-30 23:23:11 +02:00
parent 49c347ca31
commit fd45f04886
2 changed files with 60 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,8 +37,8 @@ struct _CallsBestMatch
FolksSearchView *view; FolksSearchView *view;
FolksIndividual *best_match; FolksIndividual *best_match;
gchar *phone_number; char *phone_number;
gchar *country_code; char *country_code;
gboolean had_country_code_last_time; gboolean had_country_code_last_time;
}; };
@ -131,31 +131,30 @@ set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
CallsBestMatch *self = CALLS_BEST_MATCH (object); CallsBestMatch *self = CALLS_BEST_MATCH (object);
const gchar *country_code; const char *country_code;
switch (property_id) switch (property_id) {
{ case PROP_PHONE_NUMBER:
case PROP_PHONE_NUMBER: calls_best_match_set_phone_number (self, g_value_get_string (value));
calls_best_match_set_phone_number (self, g_value_get_string (value)); break;
break;
case PROP_COUNTRY_CODE: case PROP_COUNTRY_CODE:
country_code = g_value_get_string (value); country_code = g_value_get_string (value);
if (country_code) { if (country_code) {
g_free (self->country_code); g_free (self->country_code);
self->country_code = g_strdup (country_code); self->country_code = g_strdup (country_code);
if (self->phone_number) { if (self->phone_number) {
g_autofree gchar *number = g_strdup (self->phone_number); g_autofree char *number = g_strdup (self->phone_number);
calls_best_match_set_phone_number (self, number); calls_best_match_set_phone_number (self, number);
}
} }
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
} }
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
} }
static void static void
@ -166,36 +165,35 @@ get_property (GObject *object,
{ {
CallsBestMatch *self = CALLS_BEST_MATCH (object); CallsBestMatch *self = CALLS_BEST_MATCH (object);
switch (property_id) switch (property_id) {
{ case PROP_HAS_INDIVIDUAL:
case PROP_HAS_INDIVIDUAL: g_value_set_boolean (value,
g_value_set_boolean (value, calls_best_match_has_individual (self));
calls_best_match_has_individual (self)); break;
break;
case PROP_PHONE_NUMBER: case PROP_PHONE_NUMBER:
g_value_set_string (value, g_value_set_string (value,
calls_best_match_get_phone_number (self)); calls_best_match_get_phone_number (self));
break; break;
case PROP_COUNTRY_CODE: case PROP_COUNTRY_CODE:
g_value_set_string (value, self->country_code); g_value_set_string (value, self->country_code);
break; break;
case PROP_NAME: case PROP_NAME:
g_value_set_string (value, g_value_set_string (value,
calls_best_match_get_name (self)); calls_best_match_get_name (self));
break; break;
case PROP_AVATAR: case PROP_AVATAR:
g_value_set_object (value, g_value_set_object (value,
calls_best_match_get_avatar (self)); calls_best_match_get_avatar (self));
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
} }
} }
@ -276,7 +274,7 @@ calls_best_match_init (CallsBestMatch *self)
CallsBestMatch * CallsBestMatch *
calls_best_match_new (const gchar *number) calls_best_match_new (const char *number)
{ {
return g_object_new (CALLS_TYPE_BEST_MATCH, return g_object_new (CALLS_TYPE_BEST_MATCH,
"phone_number", number, "phone_number", number,
@ -291,7 +289,7 @@ calls_best_match_has_individual (CallsBestMatch *self)
return !!self->best_match; return !!self->best_match;
} }
const gchar * const char *
calls_best_match_get_phone_number (CallsBestMatch *self) calls_best_match_get_phone_number (CallsBestMatch *self)
{ {
g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL); g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL);
@ -301,7 +299,7 @@ calls_best_match_get_phone_number (CallsBestMatch *self)
void void
calls_best_match_set_phone_number (CallsBestMatch *self, calls_best_match_set_phone_number (CallsBestMatch *self,
const gchar *phone_number) const char *phone_number)
{ {
g_autoptr (EPhoneNumber) number = NULL; g_autoptr (EPhoneNumber) number = NULL;
g_autoptr (CallsPhoneNumberQuery) query = NULL; g_autoptr (CallsPhoneNumberQuery) query = NULL;
@ -352,23 +350,19 @@ calls_best_match_set_phone_number (CallsBestMatch *self,
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_PHONE_NUMBER]); g_object_notify_by_pspec (G_OBJECT (self), props[PROP_PHONE_NUMBER]);
} }
const gchar * const char *
calls_best_match_get_name (CallsBestMatch *self) calls_best_match_get_name (CallsBestMatch *self)
{ {
g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL); g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL);
if (self->best_match) if (self->best_match)
{ return folks_individual_get_display_name (self->best_match);
return folks_individual_get_display_name (self->best_match); else if (self->name_sip)
} return self->name_sip;
else if (self->phone_number) else if (self->phone_number)
{ return self->phone_number;
return self->phone_number;
}
else else
{ return _("Anonymous caller");
return _("Anonymous caller");
}
} }
@ -378,11 +372,7 @@ calls_best_match_get_avatar (CallsBestMatch *self)
g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL); g_return_val_if_fail (CALLS_IS_BEST_MATCH (self), NULL);
if (self->best_match) if (self->best_match)
{ return folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (self->best_match));
return folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (self->best_match));
}
else else
{ return NULL;
return NULL;
}
} }

8
src/calls-best-match.h
View file

@ -33,12 +33,12 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (CallsBestMatch, calls_best_match, CALLS, BEST_MATCH, GObject); G_DECLARE_FINAL_TYPE (CallsBestMatch, calls_best_match, CALLS, BEST_MATCH, GObject);
CallsBestMatch *calls_best_match_new (const gchar *phone_number); CallsBestMatch *calls_best_match_new (const char *phone_number);
gboolean calls_best_match_has_individual (CallsBestMatch *self); gboolean calls_best_match_has_individual (CallsBestMatch *self);
const gchar * calls_best_match_get_phone_number (CallsBestMatch *self); const char *calls_best_match_get_phone_number (CallsBestMatch *self);
void calls_best_match_set_phone_number (CallsBestMatch *self, void calls_best_match_set_phone_number (CallsBestMatch *self,
const gchar *phone_number); const char *phone_number);
const gchar * calls_best_match_get_name (CallsBestMatch *self); const char *calls_best_match_get_name (CallsBestMatch *self);
GLoadableIcon *calls_best_match_get_avatar (CallsBestMatch *self); GLoadableIcon *calls_best_match_get_avatar (CallsBestMatch *self);
G_END_DECLS G_END_DECLS