diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-23 13:28:31 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-23 13:28:31 -0800 |
| commit | 4ad6c16ece62b4f5dc90ac96623c5643e97a1921 (patch) | |
| tree | 6cb7c142584cb9376e6f5e82c54d4344bc403ed3 /battstat | |
| parent | 40180c1e529161e8ce1cefbbe311b894383c6fe5 (diff) | |
| parent | 4d1a88869536ba3083a4472c823b379bd63f310d (diff) | |
| download | mate-applets-4ad6c16ece62b4f5dc90ac96623c5643e97a1921.tar.bz2 mate-applets-4ad6c16ece62b4f5dc90ac96623c5643e97a1921.tar.xz | |
Merge pull request #69 from flexiondotorg/1.6
Cherry picks for `mate-applets` 1.6
Diffstat (limited to 'battstat')
| -rw-r--r-- | battstat/battstat-upower.c | 2 | ||||
| -rw-r--r-- | battstat/docs/C/mate-battstat.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/battstat/battstat-upower.c b/battstat/battstat-upower.c index 36acb408..55929491 100644 --- a/battstat/battstat-upower.c +++ b/battstat/battstat-upower.c @@ -86,10 +86,12 @@ battstat_upower_initialise (void (*callback) (void)) GCancellable *cancellable = g_cancellable_new(); GError *gerror; +#if !UP_CHECK_VERSION(0, 9, 99) if (! up_client_enumerate_devices_sync( upc, cancellable, &gerror ) ) { sprintf(error_str, "Unable to enumerate upower devices: %s\n", gerror->message); goto error_shutdownclient; } +#endif g_signal_connect_after( upc, "device-changed", device_cb, NULL ); g_signal_connect_after( upc, "device-added", device_cb, NULL ); diff --git a/battstat/docs/C/mate-battstat.xml b/battstat/docs/C/mate-battstat.xml index 74e5ea60..983772d5 100644 --- a/battstat/docs/C/mate-battstat.xml +++ b/battstat/docs/C/mate-battstat.xml @@ -144,7 +144,7 @@ <revnumber>Battery Charge Monitor Applet Manual V2.2</revnumber> <date>August 2004</date> <revdescription> - <para role="author">Sun MATE Documentation Team</para> + <para role="author">Sun GNOME Documentation Team</para> <para role="publisher">MATE Documentation Project</para> </revdescription> </revision> |