← Back to branch summary

~ubuntu-branches/ubuntu/trusty/obexd/trusty-proposed

« back to all changes in this revision

Viewing changes to gdbus/object.c

  • Committer: Bazaar Package Importer
  • Author(s): Baptiste Mille-Mathias
  • Date: 2010-03-15 20:43:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100315204306-0jq3qj7q1jiybpxr
Tags: 0.22-0ubuntu1
https://launchpad.net/bugs/539914
https://launchpad.net/bugs/421684
* New upstream release (LP: #539914):
  - Fix file corruption during PUT operation. (LP: #421684]
  - Fix the response of PUT requests for PBAP.
  - Fix blocking while waiting capability script to exit.
  - Fix compilation issues with driver and plugin options.
  - Fix service driver selection when WHO header is informed.
  - Fix issue with PC-Suite WHO header.
  - Fix issue when mime type exists but is unknown.
  - Fix issue when opening file fails during SendFiles.
  - Fix error code response when there is no default vCard.
  - Fix a memory leak when opening a folder for listing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gdbus/object.c
2
2
 *
3
3
 *  D-Bus helper library
4
4
 *
5
 
 *  Copyright (C) 2004-2009  Marcel Holtmann <marcel@holtmann.org>
 
5
 *  Copyright (C) 2004-2010  Marcel Holtmann <marcel@holtmann.org>
6
6
 *
7
7
 *
8
8
 *  This program is free software; you can redistribute it and/or modify
45
45
 
46
46
struct interface_data {
47
47
        char *name;
48
 
        GDBusMethodTable *methods;
49
 
        GDBusSignalTable *signals;
50
 
        GDBusPropertyTable *properties;
 
48
        const GDBusMethodTable *methods;
 
49
        const GDBusSignalTable *signals;
 
50
        const GDBusPropertyTable *properties;
51
51
        void *user_data;
52
52
        GDBusDestroyFunction destroy;
53
53
};
114
114
 
115
115
static void generate_interface_xml(GString *gstr, struct interface_data *iface)
116
116
{
117
 
        GDBusMethodTable *method;
118
 
        GDBusSignalTable *signal;
 
117
        const GDBusMethodTable *method;
 
118
        const GDBusSignalTable *signal;
119
119
 
120
120
        for (method = iface->methods; method && method->name; method++) {
121
121
                if (!strlen(method->signature) && !strlen(method->reply))
238
238
{
239
239
        struct generic_data *data = user_data;
240
240
        struct interface_data *iface;
241
 
        GDBusMethodTable *method;
 
241
        const GDBusMethodTable *method;
242
242
        const char *interface;
243
243
 
244
244
        interface = dbus_message_get_interface(message);
327
327
};
328
328
 
329
329
static void add_interface(struct generic_data *data, const char *name,
330
 
                                GDBusMethodTable *methods,
331
 
                                GDBusSignalTable *signals,
332
 
                                GDBusPropertyTable *properties,
 
330
                                const GDBusMethodTable *methods,
 
331
                                const GDBusSignalTable *signals,
 
332
                                const GDBusPropertyTable *properties,
333
333
                                void *user_data,
334
334
                                GDBusDestroyFunction destroy)
335
335
{
428
428
{
429
429
        struct generic_data *data = NULL;
430
430
        struct interface_data *iface;
431
 
        GDBusSignalTable *signal;
 
431
        const GDBusSignalTable *signal;
432
432
 
433
433
        *args = NULL;
434
434
        if (!dbus_connection_get_object_path_data(conn, path,
502
502
 
503
503
gboolean g_dbus_register_interface(DBusConnection *connection,
504
504
                                        const char *path, const char *name,
505
 
                                        GDBusMethodTable *methods,
506
 
                                        GDBusSignalTable *signals,
507
 
                                        GDBusPropertyTable *properties,
 
505
                                        const GDBusMethodTable *methods,
 
506
                                        const GDBusSignalTable *signals,
 
507
                                        const GDBusPropertyTable *properties,
508
508
                                        void *user_data,
509
509
                                        GDBusDestroyFunction destroy)
510
510
{