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

core: fix mm_modem_check_removed() to return errors correctly

Browse Source 
Make sure all errors actually get returned, not just removal errors.
This commit is contained in:
Dan Williams
2010-01-19 14:23:05 -08:00
parent f4d2e30525
commit c6694a06b5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mm-modem.c
View File

@@ -36,9 +36,6 @@ static void impl_modem_get_info (MMModem *modem, DBusGMethodInvocation *context)
GError * GError *
mm_modem_check_removed (MMModem *self, const GError *error) mm_modem_check_removed (MMModem *self, const GError *error)
{ {
if (g_error_matches (error, MM_MODEM_ERROR, MM_MODEM_ERROR_REMOVED))
return g_error_copy (error);
if (!self) { if (!self) {
/* If the modem was NULL, the error *should* have been /* If the modem was NULL, the error *should* have been
* MM_MODEM_ERROR_REMOVED. If it wasn't, make it that. * MM_MODEM_ERROR_REMOVED. If it wasn't, make it that.
@@ -48,7 +45,7 @@ mm_modem_check_removed (MMModem *self, const GError *error)
"The modem was removed."); "The modem was removed.");
} }
return NULL; return error ? g_error_copy (error) : NULL;
} }
static void static void