← Back to branch summary

~ubuntu-branches/ubuntu/precise/xfce4-power-manager/precise

« back to all changes in this revision

Viewing changes to src/xfpm-xfconf.c

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2009-10-02 20:15:41 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20091002201541-ognqyxyov51epj84
Tags: 0.8.4-1ubuntu1
https://launchpad.net/bugs/438754
https://launchpad.net/bugs/437374
* New upstream bugfix release (LP: #438754), merge from Debian unstable,
  remaining Ubuntu changes:
  - debian/patches:
    + xubuntu-use-notification-icons.patch: use our notification-* icons for
      notification bubbles instead of the normal ones LP: #437374
    + 10_pc.patch: added patched files to POTFILES.skip
    + series: created, with these two patches
  - debian/rules: add --with quilt
  - debian/control: build-depends on quilt (>= 0.46-7).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xfpm-xfconf.c
124
124
    conf = XFPM_XFCONF (object);
125
125
    
126
126
    src = conf->priv->values + prop_id;
127
 
    
 
127
 
128
128
    if ( G_VALUE_HOLDS (src, pspec->value_type) )
129
129
        g_value_copy (src, value);
130
130
    else
447
447
                                     PROP_DIM_ON_AC_TIMEOUT,
448
448
                                     g_param_spec_uint (BRIGHTNESS_ON_AC,
449
449
                                                        NULL, NULL,
450
 
                                                        0,
 
450
                                                        9,
451
451
                                                        G_MAXUINT,
452
452
                                                        9,
453
453
                                                        G_PARAM_READWRITE));
459
459
                                     PROP_DIM_ON_BATTERY_TIMEOUT,
460
460
                                     g_param_spec_uint (BRIGHTNESS_ON_BATTERY,
461
461
                                                        NULL, NULL,
462
 
                                                        0,
 
462
                                                        9,
463
463
                                                        G_MAXUINT,
464
464
                                                        120,
465
465
                                                        G_PARAM_READWRITE));