← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/ifxmodem/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/ifxmodem/radio-settings.c
2
2
 *
3
3
 *  oFono - Open Source Telephony
4
4
 *
5
 
 *  Copyright (C) 2008-2010  Intel Corporation. All rights reserved.
 
5
 *  Copyright (C) 2008-2011  Intel Corporation. All rights reserved.
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
145
145
                goto error;
146
146
        }
147
147
 
148
 
        snprintf(buf, sizeof(buf), "AT+XRAT=%u,%u", value, preferred);
 
148
        if (value == 1)
 
149
                snprintf(buf, sizeof(buf), "AT+XRAT=%u,%u", value, preferred);
 
150
        else
 
151
                snprintf(buf, sizeof(buf), "AT+XRAT=%u", value);
149
152
 
150
153
        if (g_at_chat_send(rsd->chat, buf, none_prefix,
151
154
                                        xrat_modify_cb, cbd, g_free) > 0)
160
163
{
161
164
        struct ofono_radio_settings *rs = user_data;
162
165
 
163
 
        if (!ok)
 
166
        if (!ok) {
 
167
                ofono_radio_settings_remove(rs);
164
168
                return;
 
169
        }
165
170
 
166
171
        ofono_radio_settings_register(rs);
167
172
}