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

port-probe: don't warn if requesting info which wasn't probed

Browse Source
This commit is contained in:
Aleksander Morgado
2012-07-10 15:01:22 +02:00
parent a8bc1909e4
commit a5560bef3d
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/mm-port-probe.c
View File

@@ -893,10 +893,9 @@ mm_port_probe_is_at (MMPortProbe *self)
if (g_str_equal (self->priv->subsys, "net")) if (g_str_equal (self->priv->subsys, "net"))
return FALSE; return FALSE;
/* Warn if it wasn't probed */ return (self->priv->flags & MM_PORT_PROBE_AT ?
g_return_val_if_fail (self->priv->flags & MM_PORT_PROBE_AT, FALSE); self->priv->is_at :
FALSE);
return self->priv->is_at;
} }
gboolean gboolean
@@ -905,7 +904,9 @@ mm_port_probe_list_has_at_port (GList *list)
GList *l; GList *l;
for (l = list; l; l = g_list_next (l)){ for (l = list; l; l = g_list_next (l)){
if (mm_port_probe_is_at (MM_PORT_PROBE (l->data))) MMPortProbe *probe = MM_PORT_PROBE (l->data);
if (probe->priv->flags & MM_PORT_PROBE_AT &&
probe->priv->is_at)
return TRUE; return TRUE;
} }
@@ -920,10 +921,9 @@ mm_port_probe_is_qcdm (MMPortProbe *self)
if (g_str_equal (self->priv->subsys, "net")) if (g_str_equal (self->priv->subsys, "net"))
return FALSE; return FALSE;
/* Warn if it wasn't probed */ return (self->priv->flags & MM_PORT_PROBE_QCDM ?
g_return_val_if_fail (self->priv->flags & MM_PORT_PROBE_QCDM, FALSE); self->priv->is_qcdm :
FALSE);
return self->priv->is_qcdm;
} }
MMPortType MMPortType
@@ -961,10 +961,9 @@ mm_port_probe_get_vendor (MMPortProbe *self)
if (g_str_equal (self->priv->subsys, "net")) if (g_str_equal (self->priv->subsys, "net"))
return NULL; return NULL;
/* Warn if it wasn't probed */ return (self->priv->flags & MM_PORT_PROBE_AT_VENDOR ?
g_return_val_if_fail (self->priv->flags & MM_PORT_PROBE_AT_VENDOR, NULL); self->priv->vendor :
NULL);
return self->priv->vendor;
} }
const gchar * const gchar *
@@ -975,10 +974,9 @@ mm_port_probe_get_product (MMPortProbe *self)
if (g_str_equal (self->priv->subsys, "net")) if (g_str_equal (self->priv->subsys, "net"))
return NULL; return NULL;
/* Warn if it wasn't probed */ return (self->priv->flags & MM_PORT_PROBE_AT_PRODUCT ?
g_return_val_if_fail (self->priv->flags & MM_PORT_PROBE_AT_PRODUCT, NULL); self->priv->product :
NULL);
return self->priv->product;
} }
const gchar * const gchar *