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

mm-origin: Prefer STR_IS_NULL_OR_EMPTY macro to explicit checks

Browse source
This commit is contained in:
Evangelos Ribeiro Tzaras 2023-01-18 19:47:09 +01:00
parent ab6f1a4c45
commit f09852bc19
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/provider/mm/calls-mm-origin.c
View file

@ -29,6 +29,7 @@
#include "calls-ussd.h" #include "calls-ussd.h"
#include "calls-mm-call.h" #include "calls-mm-call.h"
#include "calls-message-source.h" #include "calls-message-source.h"
#include "calls-util.h"
#include "itu-e212-iso.h" #include "itu-e212-iso.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -215,7 +216,7 @@ calls_mm_ussd_initiate_async (CallsUssd *ussd,
return; return;
} }
if (!command || !*command) { if (STR_IS_NULL_OR_EMPTY (command)) {
g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED, g_task_return_new_error (task, G_IO_ERROR, G_IO_ERROR_FAILED,
"USSD command empty"); "USSD command empty");
return; return;
@ -718,10 +719,10 @@ ussd_properties_changed_cb (CallsMMOrigin *self,
(value = g_variant_lookup_value (properties, "NetworkRequest", NULL))) { (value = g_variant_lookup_value (properties, "NetworkRequest", NULL))) {
response = mm_modem_3gpp_ussd_get_network_request (self->ussd); response = mm_modem_3gpp_ussd_get_network_request (self->ussd);
if (response && *response && response != self->last_ussd_request) if (!STR_IS_NULL_OR_EMPTY (response) && response != self->last_ussd_request)
g_signal_emit_by_name (self, "ussd-added", response); g_signal_emit_by_name (self, "ussd-added", response);
if (response && *response) if (!STR_IS_NULL_OR_EMPTY (response))
self->last_ussd_request = (char *) response; self->last_ussd_request = (char *) response;
g_clear_pointer (&value, g_variant_unref); g_clear_pointer (&value, g_variant_unref);
} }
@ -730,10 +731,10 @@ ussd_properties_changed_cb (CallsMMOrigin *self,
(value = g_variant_lookup_value (properties, "NetworkNotification", NULL))) { (value = g_variant_lookup_value (properties, "NetworkNotification", NULL))) {
response = mm_modem_3gpp_ussd_get_network_notification (self->ussd); response = mm_modem_3gpp_ussd_get_network_notification (self->ussd);
if (response && *response && response != self->last_ussd_response) if (!STR_IS_NULL_OR_EMPTY (response) && response != self->last_ussd_response)
g_signal_emit_by_name (self, "ussd-added", response); g_signal_emit_by_name (self, "ussd-added", response);
if (response && *response) if (!STR_IS_NULL_OR_EMPTY (response))
self->last_ussd_response = (char *) response; self->last_ussd_response = (char *) response;
g_clear_pointer (&value, g_variant_unref); g_clear_pointer (&value, g_variant_unref);
} }