diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-02-19 18:59:24 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-02-19 18:59:24 -0600 |
| commit | acc7b4b8b91cb5428cf2dcd16328febaeece680b (patch) | |
| tree | 19c51993d6f23675225db1b29984d06ce5a9acd5 | |
| parent | 8327db70b9b5b08481ce1666d7a0192f306ff5ee (diff) | |
Revert "broadband-modem-mbim: update to use mbim_message_device_service_subscribe_list"
This reverts commit 8327db70b9b5b08481ce1666d7a0192f306ff5ee.
libmbim change not committed yet...
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/mm-broadband-modem-mbim.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index df8c09a4..3fda9559 100644 --- a/configure.ac +++ b/configure.ac @@ -201,9 +201,9 @@ AC_ARG_WITH(mbim, AS_HELP_STRING([--without-mbim], [Build without MBIM support]) AM_CONDITIONAL(WITH_MBIM, test "x$with_mbim" = "xyes") case $with_mbim in yes) - PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.7], [have_mbim=yes],[have_mbim=no]) + PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.4], [have_mbim=yes],[have_mbim=no]) if test "x$have_mbim" = "xno"; then - AC_MSG_ERROR([Couldn't find libmbim-glib >= 1.7. Install it, or otherwise configure using --without-mbim to disable MBIM support.]) + AC_MSG_ERROR([Couldn't find libmbim-glib. Install it, or otherwise configure using --without-mbim to disable MBIM support.]) else AC_DEFINE(WITH_MBIM, 1, [Define if you want MBIM support]) AC_SUBST(MBIM_CFLAGS) diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c index f1f786c4..714cb700 100644 --- a/src/mm-broadband-modem-mbim.c +++ b/src/mm-broadband-modem-mbim.c @@ -1897,9 +1897,9 @@ common_enable_disable_unsolicited_events_finish (MMBroadbandModemMbim *self, } static void -subscribe_list_set_ready_cb (MbimDevice *device, - GAsyncResult *res, - GSimpleAsyncResult *simple) +subscriber_list_set_ready_cb (MbimDevice *device, + GAsyncResult *res, + GSimpleAsyncResult *simple) { MbimMessage *response; GError *error = NULL; @@ -1970,7 +1970,7 @@ common_enable_disable_unsolicited_events (MMBroadbandModemMbim *self, n_entries++; } - request = (mbim_message_device_service_subscribe_list_set_new ( + request = (mbim_message_device_service_subscriber_list_set_new ( n_entries, (const MbimEventEntry *const *)entries, NULL)); @@ -1978,7 +1978,7 @@ common_enable_disable_unsolicited_events (MMBroadbandModemMbim *self, request, 10, NULL, - (GAsyncReadyCallback)subscribe_list_set_ready_cb, + (GAsyncReadyCallback)subscriber_list_set_ready_cb, result); mbim_message_unref (request); mbim_event_entry_array_free (entries); |