← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/nokia.c

  • Committer: Martin Pitt
  • Date: 2011-02-21 14:08:48 UTC
  • mfrom: (18.1.7 ofono)
  • Revision ID: martin@piware.de-20110221140848-9v2jbu09zvxib74l
https://launchpad.net/bugs/600501
https://launchpad.net/bugs/688472
https://launchpad.net/bugs/691450
* New upstream release.
* debian/control: explicitly Conflicts with modemmanager: having both
  installed / running at the same time causes issues causes issues with both
  claiming modem devices. (LP: #688472)
* debian/patches/02-dont-handle-stacktraces.patch: stop catching stacktraces
  and printing the information internally, so apport can catch and report
  the possible bugs. (LP: #691450)
* debian/ofono.postinst: on configure, notify the user that a reboot is
  required (so ofono can get started by upstart). (LP: #600501)
* debian/control: add new Build-Depends on libbluetooth-dev to build with
  bluetooth support.
* debian/rules: drop override_dh_strip, not needed for debug symbols with
  cdbs.
* debian/rules: pass --no-restart-on-upgrade so ofono isn't automatically
  restarted when upgrades.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/nokia.c
62
62
        DBG("%p", modem);
63
63
 
64
64
        data = g_try_new0(struct nokia_data, 1);
65
 
        if (!data)
 
65
        if (data == NULL)
66
66
                return -ENOMEM;
67
67
 
68
68
        ofono_modem_set_data(modem, data);
106
106
        DBG("%s %s", key, device);
107
107
 
108
108
        channel = g_at_tty_open(device, NULL);
109
 
        if (!channel)
 
109
        if (channel == NULL)
110
110
                return NULL;
111
111
 
112
112
        syntax = g_at_syntax_new_gsm_permissive();
114
114
        g_at_syntax_unref(syntax);
115
115
        g_io_channel_unref(channel);
116
116
 
117
 
        if (!chat)
 
117
        if (chat == NULL)
118
118
                return NULL;
119
119
 
120
120
        if (getenv("OFONO_AT_DEBUG"))
137
137
        data->modem = NULL;
138
138
 
139
139
        data->modem = open_device(modem, "Modem", "Modem: ");
140
 
        if (!data->modem)
 
140
        if (data->modem == NULL)
141
141
                return;
142
142
 
143
143
        g_at_chat_set_disconnect_function(data->modem,
216
216
                data->modem = NULL;
217
217
        }
218
218
 
219
 
        if (!data->control)
 
219
        if (data->control == NULL)
220
220
                return 0;
221
221
 
222
222
        g_at_chat_cancel_all(data->control);