colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-signal: port skeleton update logic to use g_autoptr

Browse Source
This commit is contained in:
Aleksander Morgado
2020-07-04 06:08:40 +02:00
parent 3d138f9f80
commit bdbd0fc049
1 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/mm-iface-modem-signal.c
View File

@@ -55,7 +55,7 @@ refresh_context_free (RefreshContext *ctx)
static void static void
clear_values (MMIfaceModemSignal *self) clear_values (MMIfaceModemSignal *self)
{ {
MmGdbusModemSignal *skeleton; g_autoptr(MmGdbusModemSignalSkeleton) skeleton = NULL;
g_object_get (self, g_object_get (self,
MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON, &skeleton, MM_IFACE_MODEM_SIGNAL_DBUS_SKELETON, &skeleton,
@@ -63,28 +63,32 @@ clear_values (MMIfaceModemSignal *self)
if (!skeleton) if (!skeleton)
return; return;
mm_gdbus_modem_signal_set_cdma (skeleton, NULL); mm_gdbus_modem_signal_set_cdma (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
mm_gdbus_modem_signal_set_evdo (skeleton, NULL); mm_gdbus_modem_signal_set_evdo (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
mm_gdbus_modem_signal_set_gsm (skeleton, NULL); mm_gdbus_modem_signal_set_gsm (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
mm_gdbus_modem_signal_set_umts (skeleton, NULL); mm_gdbus_modem_signal_set_umts (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
mm_gdbus_modem_signal_set_lte (skeleton, NULL); mm_gdbus_modem_signal_set_lte (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
mm_gdbus_modem_signal_set_nr5g (skeleton, NULL); mm_gdbus_modem_signal_set_nr5g (MM_GDBUS_MODEM_SIGNAL (skeleton), NULL);
g_object_unref (skeleton);
} }
static void static void
load_values_ready (MMIfaceModemSignal *self, load_values_ready (MMIfaceModemSignal *self,
GAsyncResult *res) GAsyncResult *res)
{ {
GVariant *dictionary; g_autoptr(GError) error = NULL;
GError *error = NULL; g_autoptr(MMSignal) cdma = NULL;
MMSignal *cdma = NULL; g_autoptr(GVariant) dict_cdma = NULL;
MMSignal *evdo = NULL; g_autoptr(MMSignal) evdo = NULL;
MMSignal *gsm = NULL; g_autoptr(GVariant) dict_evdo = NULL;
MMSignal *umts = NULL; g_autoptr(MMSignal) gsm = NULL;
MMSignal *lte = NULL; g_autoptr(GVariant) dict_gsm = NULL;
MMSignal *nr5g = NULL; g_autoptr(MMSignal) umts = NULL;
MmGdbusModemSignal *skeleton; g_autoptr(GVariant) dict_umts = NULL;
g_autoptr(MMSignal) lte = NULL;
g_autoptr(GVariant) dict_lte = NULL;
g_autoptr(MMSignal) nr5g = NULL;
g_autoptr(GVariant) dict_nr5g = NULL;
g_autoptr(MmGdbusModemSignalSkeleton) skeleton = NULL;
if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->load_values_finish ( if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->load_values_finish (
self, self,
@@ -97,7 +101,6 @@ load_values_ready (MMIfaceModemSignal *self,
&nr5g, &nr5g,
&error)) { &error)) {
mm_obj_warn (self, "couldn't load extended signal information: %s", error->message); mm_obj_warn (self, "couldn't load extended signal information: %s", error->message);
g_error_free (error);
clear_values (self); clear_values (self);
return; return;
} }
@@ -110,59 +113,32 @@ load_values_ready (MMIfaceModemSignal *self,
return; return;
} }
if (cdma) { if (cdma)
dictionary = mm_signal_get_dictionary (cdma); dict_cdma = mm_signal_get_dictionary (cdma);
mm_gdbus_modem_signal_set_cdma (skeleton, dictionary); mm_gdbus_modem_signal_set_cdma (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_cdma);
g_variant_unref (dictionary);
g_object_unref (cdma);
} else
mm_gdbus_modem_signal_set_cdma (skeleton, NULL);
if (evdo) { if (evdo)
dictionary = mm_signal_get_dictionary (evdo); dict_evdo = mm_signal_get_dictionary (evdo);
mm_gdbus_modem_signal_set_evdo (skeleton, dictionary); mm_gdbus_modem_signal_set_evdo (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_evdo);
g_variant_unref (dictionary);
g_object_unref (evdo);
} else
mm_gdbus_modem_signal_set_evdo (skeleton, NULL);
if (gsm) { if (gsm)
dictionary = mm_signal_get_dictionary (gsm); dict_gsm = mm_signal_get_dictionary (gsm);
mm_gdbus_modem_signal_set_gsm (skeleton, dictionary); mm_gdbus_modem_signal_set_gsm (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_gsm);
g_variant_unref (dictionary);
g_object_unref (gsm);
} else
mm_gdbus_modem_signal_set_gsm (skeleton, NULL);
if (umts) { if (umts)
dictionary = mm_signal_get_dictionary (umts); dict_umts = mm_signal_get_dictionary (umts);
mm_gdbus_modem_signal_set_umts (skeleton, dictionary); mm_gdbus_modem_signal_set_umts (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_umts);
g_variant_unref (dictionary);
g_object_unref (umts);
} else
mm_gdbus_modem_signal_set_umts (skeleton, NULL);
if (lte) { if (lte)
dictionary = mm_signal_get_dictionary (lte); dict_lte = mm_signal_get_dictionary (lte);
mm_gdbus_modem_signal_set_lte (skeleton, dictionary); mm_gdbus_modem_signal_set_lte (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_lte);
g_variant_unref (dictionary);
g_object_unref (lte);
} else
mm_gdbus_modem_signal_set_lte (skeleton, NULL);
if (nr5g) {
dictionary = mm_signal_get_dictionary (nr5g);
mm_gdbus_modem_signal_set_nr5g (skeleton, dictionary);
g_variant_unref (dictionary);
g_object_unref (nr5g);
} else
mm_gdbus_modem_signal_set_nr5g (skeleton, NULL);
if (nr5g)
dict_nr5g = mm_signal_get_dictionary (nr5g);
mm_gdbus_modem_signal_set_nr5g (MM_GDBUS_MODEM_SIGNAL (skeleton), dict_nr5g);
/* Flush right away */ /* Flush right away */
g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (skeleton)); g_dbus_interface_skeleton_flush (G_DBUS_INTERFACE_SKELETON (skeleton));
g_object_unref (skeleton);
} }
static gboolean static gboolean