← Back to branch summary

~ubuntu-branches/ubuntu/maverick/brasero/maverick

« back to all changes in this revision

Viewing changes to libbrasero-burn/burn-dbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-09-14 10:23:22 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914102322-7eigq8pge5wqfol1
Tags: 2.31.92-0ubuntu1
* New upstream release:
  - Revert to libunique from GApplication (Luis Medinas)
  - Remove dbus-glib requires from pkgconfig file (Luis Medinas)
  - Some more debugging to find out about problems with encrypted DVDs
    (Philippe Rouquier)
  - Fix minor issues in gdbus conversion. (Luis Medinas)
  - Remove dbus-glib check from configure (Luis Medinas)
  - Replace last part of dbus-glib by GDBus (Luis Medinas)
  - Fix Inhibit() d-bus parameters (Robert Ancell)
  - Remove dbus libraries from the Makefile. (Luis Medinas)
  - Use --with-gtk switch for gtk 2/3 selection (Christian Persch)
  - Fix image checksuming that did not occur when GConf or GSetting returned 0
    as a value for the checksum type key (Philippe Rouquier)
  - Don't hardcode gconf gsettings backend (Robert Ancell)
  - Fix brasero plugin directory (Robert Ancell)
* debian/control:
  - build-dep on libunique
* debian/patches/010_lpi.patch,31_link_libice.patch:
  - adapt to latest code
* debian/patches/013_gsettings_backend.patch,014_plugin_directory.patch,
  015_inhibit_params.patch:
  - removed, now upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbrasero-burn/burn-dbus.c
91
91
        guint            cookie;
92
92
        GError          *error  = NULL;
93
93
        GVariant        *res;
94
 
        GVariantType    *type;
95
94
 
96
95
        g_return_val_if_fail (reason != NULL, -1);
97
96
 
104
103
                return -1;
105
104
        }
106
105
 
107
 
        type = g_variant_type_new ("(u)");
108
106
        res = g_dbus_connection_call_sync (conn,
109
107
                                           GS_DBUS_SERVICE,
110
108
                                           GS_DBUS_INHIBIT_PATH, 
115
113
                                                         0,
116
114
                                                         reason,
117
115
                                                         1 | 4),
118
 
                                           type,
 
116
                                           G_VARIANT_TYPE ("(u)"),
119
117
                                           G_DBUS_CALL_FLAGS_NONE, 
120
118
                                           -1,
121
119
                                           NULL,
122
120
                                           &error);
123
 
        g_variant_type_free (type);
124
121
 
125
122
        if (res == NULL) {
126
123
                g_warning ("Failed to inhibit the system from suspending: %s",