← Back to branch summary

~morphis/phablet-extras/ofono-sms-status-report

« back to all changes in this revision

Viewing changes to drivers/isimodem/radio-settings.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-08-22 19:59:08 UTC
  • mfrom: (1.3.3) (6.1.5 experimental)
  • Revision ID: package-import@ubuntu.com-20120822195908-0bmmk1hlh989bgk6
Tags: 1.9-1ubuntu1
https://launchpad.net/bugs/600501
* Merge with Debian experimental; remaining changes:
  - debian/control: explicitly Conflicts with modemmanager: having both
    installed / running at the same time causes issues causes issues with
    both claiming modem devices.
  - debian/patches/02-dont-handle-stacktraces.patch: stop catching stacktraces
    and printing the information internally, so apport can catch and report
    the possible bugs.
  - debian/ofono.postinst: on configure, notify the user that a reboot is
    required (so ofono can get started by upstart). (LP: #600501)
  - debian/rules: pass --no-restart-on-upgrade so ofono isn't automatically
    restarted when upgrades.
  - Adding upstart config / Removing standard init script
  - Adding Apport support
  - Patch for recognizing special Huawei devices with weird serial
  - Override lintian to avoid script-in-etc-init.d... warnings.
  - Update debian/compat to 7
* debian/series: add our patches to debian/patches/series now that the package
  uses quilt.
* debian/patches/02-dont-handle-stacktraces.patch: refreshed.
* debian/ofono-dev.install, debian/ofono.install:
  - Install usr/sbin/dundee and ofono.pc to the proper packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/isimodem/radio-settings.c
2
2
 *
3
3
 *  oFono - Open Source Telephony
4
4
 *
5
 
 *  Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 
5
 *  Copyright (C) 2009-2010  Nokia Corporation and/or its subsidiary(-ies).
6
6
 *
7
7
 *  This program is free software; you can redistribute it and/or modify
8
8
 *  it under the terms of the GNU General Public License version 2 as
287
287
        if (g_isi_msg_error(msg) < 0)
288
288
                return;
289
289
 
290
 
        ISI_VERSION_DBG(msg);
 
290
        ISI_RESOURCE_DBG(msg);
291
291
 
292
292
        rd->wran_object = g_isi_msg_object(msg);
293
293
 
304
304
{
305
305
        struct ofono_radio_settings *rs = opaque;
306
306
 
307
 
        if (g_isi_msg_error(msg) < 0)
 
307
        if (g_isi_msg_error(msg) < 0) {
 
308
                ofono_radio_settings_remove(rs);
308
309
                return;
 
310
        }
309
311
 
310
 
        ISI_VERSION_DBG(msg);
 
312
        ISI_RESOURCE_DBG(msg);
311
313
 
312
314
        ofono_radio_settings_register(rs);
313
315
}