← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/gnome-power-manager/intrepid-proposed

« back to all changes in this revision

Viewing changes to libhal-glib/libhal-gdevice.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-08-19 13:55:19 UTC
  • mfrom: (2.1.35 upstream)
  • Revision ID: james.westby@ubuntu.com-20080819135519-l130mnhuu3dnh28l
Tags: 2.23.6-0ubuntu1
* debian/patches/09_lid_always_blanks.patch: Update for new upstream
* debian/control, added PolicyKit DBus and Grant to reflect changes
  in upstream configure files.
* Updated upstream version (2.23.6)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libhal-glib/libhal-gdevice.c
148
148
                                 G_TYPE_INVALID,
149
149
                                 G_TYPE_BOOLEAN, value,
150
150
                                 G_TYPE_INVALID);
151
 
        if (ret == FALSE) {
 
151
        if (!ret) {
152
152
                *value = FALSE;
153
153
        }
154
154
        return ret;
188
188
                                 G_TYPE_INVALID,
189
189
                                 G_TYPE_STRING, value,
190
190
                                 G_TYPE_INVALID);
191
 
        if (ret == FALSE) {
 
191
        if (!ret) {
192
192
                *value = NULL;
193
193
        }
194
194
        return ret;
226
226
                                 G_TYPE_INVALID,
227
227
                                 G_TYPE_INT, value,
228
228
                                 G_TYPE_INVALID);
229
 
        if (ret == FALSE) {
 
229
        if (!ret) {
230
230
                *value = 0;
231
231
        }
232
232
        return ret;
284
284
                                 G_TYPE_INVALID,
285
285
                                 G_TYPE_BOOLEAN, has_capability,
286
286
                                 G_TYPE_INVALID);
287
 
        if (ret == FALSE) {
 
287
        if (!ret) {
288
288
                *has_capability = FALSE;
289
289
        }
290
290
        return ret;
375
375
        g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
376
376
        g_return_val_if_fail (device->priv->udi != NULL, FALSE);
377
377
 
378
 
        if (device->priv->use_property_modified == TRUE) {
 
378
        if (device->priv->use_property_modified) {
379
379
                /* already watched */
380
380
                return FALSE;
381
381
        }
438
438
        g_return_val_if_fail (LIBHAL_IS_GDEVICE (device), FALSE);
439
439
        g_return_val_if_fail (device->priv->udi != NULL, FALSE);
440
440
 
441
 
        if (device->priv->use_condition == TRUE) {
 
441
        if (device->priv->use_condition) {
442
442
                /* already watched */
443
443
                return FALSE;
444
444
        }
531
531
                 HalGDevice *device)
532
532
{
533
533
        g_return_if_fail (LIBHAL_IS_GDEVICE (device));
534
 
        if (status == TRUE) {
 
534
        if (status) {
535
535
                /* should join */
536
536
        } else {
537
537
                /* should unjoin */
611
611
        device = LIBHAL_GDEVICE (object);
612
612
        device->priv = LIBHAL_GDEVICE_GET_PRIVATE (device);
613
613
 
614
 
        if (device->priv->use_property_modified == TRUE) {
 
614
        if (device->priv->use_property_modified) {
615
615
                hal_gdevice_remove_property_modified (device);
616
616
        }
617
 
        if (device->priv->use_condition == TRUE) {
 
617
        if (device->priv->use_condition) {
618
618
                hal_gdevice_remove_condition (device);
619
619
        }
620
620