← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/phonebook.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:
src/phonebook.c
155
155
        char *pref = "", *intl = "", *category_string = "";
156
156
        char buf[128];
157
157
 
158
 
        if (!number || !strlen(number) || !type)
 
158
        if (number == NULL || !strlen(number) || !type)
159
159
                return;
160
160
 
161
161
        switch (category) {
277
277
        DBusMessageIter iter;
278
278
 
279
279
        reply = dbus_message_new_method_return(msg);
280
 
 
281
 
        if (!reply)
 
280
        if (reply == NULL)
282
281
                return NULL;
283
282
 
284
283
        dbus_message_iter_init_append(reply, &iter);
292
291
        int len;
293
292
        char c;
294
293
 
295
 
        if (!text)
 
294
        if (text == NULL)
296
295
                return FALSE;
297
296
 
298
297
        len = strlen(text);
375
374
                                break;
376
375
                }
377
376
 
378
 
                if (!l) {
 
377
                if (l == NULL) {
379
378
                        person = g_new0(struct phonebook_person, 1);
380
379
                        phonebook->merge_list =
381
380
                                g_slist_prepend(phonebook->merge_list, person);
444
443
        }
445
444
 
446
445
        reply = generate_export_entries_reply(phonebook, phonebook->pending);
447
 
 
448
 
        if (!reply) {
 
446
        if (reply == NULL) {
449
447
                dbus_message_unref(phonebook->pending);
450
448
                return;
451
449
        }