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

cleanup: Fix calls_origin_get_name() related memory leaks

Browse source 
Document calls_origin_get_name() correctly as transfer-full.
Additionaly fix related memory leaks.
This commit is contained in:
Evangelos Ribeiro Tzaras 2021-05-13 17:35:10 +02:00
parent 1543802c88
commit fecdc1fff8
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/sip/calls-sip-origin.c
View file

@ -242,13 +242,16 @@ dial (CallsOrigin *origin,
{ {
CallsSipOrigin *self; CallsSipOrigin *self;
nua_handle_t *nh; nua_handle_t *nh;
g_autofree char *name = NULL;
g_assert (CALLS_ORIGIN (origin)); g_assert (CALLS_ORIGIN (origin));
g_assert (CALLS_IS_SIP_ORIGIN (origin)); g_assert (CALLS_IS_SIP_ORIGIN (origin));
name = calls_origin_get_name (origin);
if (address == NULL) { if (address == NULL) {
g_warning ("Tried dialing on origin '%s' without an address", g_warning ("Tried dialing on origin '%s' without an address",
calls_origin_get_name (origin)); name);
return; return;
} }
@ -259,7 +262,7 @@ dial (CallsOrigin *origin,
SOATAG_ACTIVE_AUDIO (SOA_ACTIVE_SENDRECV), SOATAG_ACTIVE_AUDIO (SOA_ACTIVE_SENDRECV),
TAG_END ()); TAG_END ());
g_debug ("Calling `%s'", address); g_debug ("Calling `%s' from origin '%s'", address, name);
add_call (CALLS_SIP_ORIGIN (origin), address, FALSE, nh); add_call (CALLS_SIP_ORIGIN (origin), address, FALSE, nh);
} }

8
src/calls-manager.c
View file

@ -146,10 +146,12 @@ ussd_state_changed_cb (CallsManager *self,
static void static void
add_origin (CallsManager *self, CallsOrigin *origin) add_origin (CallsManager *self, CallsOrigin *origin)
{ {
g_autofree const char *name = NULL;
g_assert (CALLS_IS_MANAGER (self)); g_assert (CALLS_IS_MANAGER (self));
g_assert (CALLS_IS_ORIGIN (origin)); g_assert (CALLS_IS_ORIGIN (origin));
g_debug ("Adding origin %s (%p)", calls_origin_get_name (origin), origin); name = calls_origin_get_name (origin);
g_debug ("Adding origin %s (%p)", name, origin);
g_signal_connect_swapped (origin, "call-added", G_CALLBACK (add_call), self); g_signal_connect_swapped (origin, "call-added", G_CALLBACK (add_call), self);
g_signal_connect_swapped (origin, "call-removed", G_CALLBACK (remove_call), self); g_signal_connect_swapped (origin, "call-removed", G_CALLBACK (remove_call), self);
@ -176,10 +178,12 @@ static void
remove_origin (CallsManager *self, CallsOrigin *origin) remove_origin (CallsManager *self, CallsOrigin *origin)
{ {
GListModel *origins; GListModel *origins;
g_autofree const char *name = NULL;
g_return_if_fail (CALLS_IS_ORIGIN (origin)); g_return_if_fail (CALLS_IS_ORIGIN (origin));
g_debug ("Removing origin %s (%p)", calls_origin_get_name (origin), origin); name = calls_origin_get_name (origin);
g_debug ("Removing origin %s (%p)", name, origin);
g_signal_handlers_disconnect_by_data (origin, self); g_signal_handlers_disconnect_by_data (origin, self);

4
src/calls-new-call-box.c
View file

@ -163,13 +163,13 @@ dial_queued (CallsNewCallBox *self)
} }
char * static char *
get_origin_name (gpointer item, get_origin_name (gpointer item,
gpointer user_data) gpointer user_data)
{ {
g_assert (CALLS_IS_ORIGIN (item)); g_assert (CALLS_IS_ORIGIN (item));
return g_strdup (calls_origin_get_name (item)); return calls_origin_get_name (item);
} }
static void static void

4
src/calls-origin.c
View file

@ -96,10 +96,10 @@ calls_origin_default_init (CallsOriginInterface *iface)
* *
* Get the user-presentable name of the origin. * Get the user-presentable name of the origin.
* *
* Returns: A string containing the name. The string must be freed by * Returns (transfer full): A string containing the name. The string must be freed by
* the caller. * the caller.
*/ */
DEFINE_ORIGIN_GETTER(name, const gchar *, NULL); DEFINE_ORIGIN_GETTER(name, char *, NULL);
/** /**
* calls_origin_get_calls: * calls_origin_get_calls:

2
src/calls-origin.h
View file

@ -48,7 +48,7 @@ struct _CallsOriginInterface
typedef void (*CallsOriginForeachCallFunc) (gpointer param, CallsCall* call, CallsOrigin* origin); typedef void (*CallsOriginForeachCallFunc) (gpointer param, CallsCall* call, CallsOrigin* origin);
const gchar * calls_origin_get_name (CallsOrigin *self); char * calls_origin_get_name (CallsOrigin *self);
GList * calls_origin_get_calls (CallsOrigin *self); GList * calls_origin_get_calls (CallsOrigin *self);
void calls_origin_foreach_call (CallsOrigin *self, void calls_origin_foreach_call (CallsOrigin *self,
CallsOriginForeachCallFunc callback, CallsOriginForeachCallFunc callback,