← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/stemgr.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:
plugins/stemgr.c
2
2
 *
3
3
 *  oFono - Open Source Telephony
4
4
 *
5
 
 *  Copyright (C) 2011 ST-Ericsson AB.
 
5
 *  Copyright (C) 2011  ST-Ericsson AB.
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
305
305
        dbus_message_unref(message);
306
306
}
307
307
 
308
 
static gboolean property_changed(DBusConnection *connection,
 
308
static gboolean property_changed(DBusConnection *conn,
309
309
                                        DBusMessage *message, void *user_data)
310
310
{
311
311
        DBusMessageIter iter;
335
335
        return TRUE;
336
336
}
337
337
 
338
 
static void mgr_connect(DBusConnection *connection, void *user_data)
 
338
static void mgr_connect(DBusConnection *conn, void *user_data)
339
339
{
340
 
        property_changed_watch = g_dbus_add_signal_watch(connection, NULL,
341
 
                                                NULL,
 
340
        property_changed_watch = g_dbus_add_signal_watch(conn,
 
341
                                                MGR_SERVICE, NULL,
342
342
                                                MGR_MODEM_INTERFACE,
343
343
                                                PROPERTY_CHANGED,
344
344
                                                property_changed,
346
346
        get_modems();
347
347
}
348
348
 
349
 
static void mgr_disconnect(DBusConnection *connection, void *user_data)
 
349
static void mgr_disconnect(DBusConnection *conn, void *user_data)
350
350
{
351
351
        g_hash_table_remove_all(modem_list);
352
 
        g_dbus_remove_watch(connection, property_changed_watch);
 
352
        g_dbus_remove_watch(conn, property_changed_watch);
353
353
        property_changed_watch = 0;
354
354
}
355
355