[Xfce4-commits] [xfce/xfce4-power-manager] 04/04: Merge remote-tracking branch 'private/progressbar'
noreply at xfce.org
noreply at xfce.org
Mon Aug 18 16:53:49 CEST 2014
This is an automated email from the git hooks/post-receive script.
ochosi pushed a commit to branch master
in repository xfce/xfce4-power-manager.
commit a492d0b3dfa0b5b595be7af7d46634233fc86f9f
Merge: 6e4a6e5 c65c36a
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Mon Aug 18 16:53:17 2014 +0200
Merge remote-tracking branch 'private/progressbar'
common/xfpm-icons.h | 24 +-
common/xfpm-power-common.c | 16 +-
data/icons/32x32/Makefile.am | 56 +-
data/icons/32x32/computer.png | Bin 0 -> 2013 bytes
data/icons/32x32/input-keyboard.png | Bin 0 -> 972 bytes
data/icons/32x32/input-mouse.png | Bin 0 -> 1793 bytes
data/icons/32x32/multimedia-player.png | Bin 0 -> 1240 bytes
data/icons/32x32/pda.png | Bin 0 -> 1059 bytes
data/icons/32x32/phone.png | Bin 0 -> 1720 bytes
data/icons/32x32/tablet.png | Bin 0 -> 1596 bytes
.../32x32/{xfpm-tablet-000.svg => tablet.svg} | 109 +-
data/icons/32x32/video-display.png | Bin 0 -> 1679 bytes
data/icons/32x32/xfpm-computer-000.png | Bin 1504 -> 0 bytes
data/icons/32x32/xfpm-computer-000.svg | 888 -------
data/icons/32x32/xfpm-computer-020.png | Bin 1504 -> 0 bytes
data/icons/32x32/xfpm-computer-020.svg | 828 ------
data/icons/32x32/xfpm-computer-040.png | Bin 1509 -> 0 bytes
data/icons/32x32/xfpm-computer-040.svg | 828 ------
data/icons/32x32/xfpm-computer-060.png | Bin 1505 -> 0 bytes
data/icons/32x32/xfpm-computer-060.svg | 828 ------
data/icons/32x32/xfpm-computer-080.png | Bin 1492 -> 0 bytes
data/icons/32x32/xfpm-computer-080.svg | 828 ------
data/icons/32x32/xfpm-computer-100.png | Bin 1467 -> 0 bytes
data/icons/32x32/xfpm-computer-100.svg | 828 ------
data/icons/32x32/xfpm-keyboard-000.png | Bin 1161 -> 0 bytes
data/icons/32x32/xfpm-keyboard-000.svg | 1078 --------
data/icons/32x32/xfpm-keyboard-020.png | Bin 1161 -> 0 bytes
data/icons/32x32/xfpm-keyboard-020.svg | 1078 --------
data/icons/32x32/xfpm-keyboard-040.png | Bin 1155 -> 0 bytes
data/icons/32x32/xfpm-keyboard-040.svg | 1078 --------
data/icons/32x32/xfpm-keyboard-060.png | Bin 1154 -> 0 bytes
data/icons/32x32/xfpm-keyboard-060.svg | 1078 --------
data/icons/32x32/xfpm-keyboard-080.png | Bin 1154 -> 0 bytes
data/icons/32x32/xfpm-keyboard-080.svg | 1078 --------
data/icons/32x32/xfpm-keyboard-100.png | Bin 1127 -> 0 bytes
data/icons/32x32/xfpm-keyboard-100.svg | 1078 --------
data/icons/32x32/xfpm-mediaplayer-000.png | Bin 1367 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-000.svg | 463 ----
data/icons/32x32/xfpm-mediaplayer-020.png | Bin 1364 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-020.svg | 463 ----
data/icons/32x32/xfpm-mediaplayer-040.png | Bin 1372 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-040.svg | 463 ----
data/icons/32x32/xfpm-mediaplayer-060.png | Bin 1362 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-060.svg | 463 ----
data/icons/32x32/xfpm-mediaplayer-080.png | Bin 1349 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-080.svg | 463 ----
data/icons/32x32/xfpm-mediaplayer-100.png | Bin 1332 -> 0 bytes
data/icons/32x32/xfpm-mediaplayer-100.svg | 463 ----
data/icons/32x32/xfpm-monitor-000.png | Bin 1337 -> 0 bytes
data/icons/32x32/xfpm-monitor-000.svg | 940 -------
data/icons/32x32/xfpm-monitor-020.png | Bin 1334 -> 0 bytes
data/icons/32x32/xfpm-monitor-020.svg | 979 --------
data/icons/32x32/xfpm-monitor-040.png | Bin 1334 -> 0 bytes
data/icons/32x32/xfpm-monitor-040.svg | 676 -----
data/icons/32x32/xfpm-monitor-060.png | Bin 1334 -> 0 bytes
data/icons/32x32/xfpm-monitor-060.svg | 656 -----
data/icons/32x32/xfpm-monitor-080.png | Bin 1319 -> 0 bytes
data/icons/32x32/xfpm-monitor-080.svg | 656 -----
data/icons/32x32/xfpm-monitor-100.png | Bin 1294 -> 0 bytes
data/icons/32x32/xfpm-monitor-100.svg | 716 ------
data/icons/32x32/xfpm-mouse-000.png | Bin 1970 -> 0 bytes
data/icons/32x32/xfpm-mouse-000.svg | 529 ----
data/icons/32x32/xfpm-mouse-020.png | Bin 1967 -> 0 bytes
data/icons/32x32/xfpm-mouse-020.svg | 529 ----
data/icons/32x32/xfpm-mouse-040.png | Bin 1968 -> 0 bytes
data/icons/32x32/xfpm-mouse-040.svg | 529 ----
data/icons/32x32/xfpm-mouse-060.png | Bin 1965 -> 0 bytes
data/icons/32x32/xfpm-mouse-060.svg | 529 ----
data/icons/32x32/xfpm-mouse-080.png | Bin 1941 -> 0 bytes
data/icons/32x32/xfpm-mouse-080.svg | 529 ----
data/icons/32x32/xfpm-mouse-100.png | Bin 1916 -> 0 bytes
data/icons/32x32/xfpm-mouse-100.svg | 529 ----
data/icons/32x32/xfpm-pda-000.png | Bin 1203 -> 0 bytes
data/icons/32x32/xfpm-pda-000.svg | 394 ---
data/icons/32x32/xfpm-pda-020.png | Bin 1210 -> 0 bytes
data/icons/32x32/xfpm-pda-020.svg | 394 ---
data/icons/32x32/xfpm-pda-040.png | Bin 1215 -> 0 bytes
data/icons/32x32/xfpm-pda-040.svg | 394 ---
data/icons/32x32/xfpm-pda-060.png | Bin 1208 -> 0 bytes
data/icons/32x32/xfpm-pda-060.svg | 394 ---
data/icons/32x32/xfpm-pda-080.png | Bin 1196 -> 0 bytes
data/icons/32x32/xfpm-pda-080.svg | 394 ---
data/icons/32x32/xfpm-pda-100.png | Bin 1173 -> 0 bytes
data/icons/32x32/xfpm-pda-100.svg | 394 ---
data/icons/32x32/xfpm-phone-000.png | Bin 1646 -> 0 bytes
data/icons/32x32/xfpm-phone-000.svg | 2650 --------------------
data/icons/32x32/xfpm-phone-020.png | Bin 1643 -> 0 bytes
data/icons/32x32/xfpm-phone-020.svg | 2650 --------------------
data/icons/32x32/xfpm-phone-040.png | Bin 1653 -> 0 bytes
data/icons/32x32/xfpm-phone-040.svg | 2650 --------------------
data/icons/32x32/xfpm-phone-060.png | Bin 1643 -> 0 bytes
data/icons/32x32/xfpm-phone-060.svg | 2650 --------------------
data/icons/32x32/xfpm-phone-080.png | Bin 1621 -> 0 bytes
data/icons/32x32/xfpm-phone-080.svg | 2650 --------------------
data/icons/32x32/xfpm-phone-100.png | Bin 1594 -> 0 bytes
data/icons/32x32/xfpm-phone-100.svg | 2650 --------------------
data/icons/32x32/xfpm-tablet-000.png | Bin 1760 -> 0 bytes
data/icons/32x32/xfpm-tablet-020.png | Bin 1745 -> 0 bytes
data/icons/32x32/xfpm-tablet-020.svg | 671 -----
data/icons/32x32/xfpm-tablet-040.png | Bin 1763 -> 0 bytes
data/icons/32x32/xfpm-tablet-040.svg | 671 -----
data/icons/32x32/xfpm-tablet-060.png | Bin 1756 -> 0 bytes
data/icons/32x32/xfpm-tablet-060.svg | 671 -----
data/icons/32x32/xfpm-tablet-080.png | Bin 1738 -> 0 bytes
data/icons/32x32/xfpm-tablet-080.svg | 671 -----
data/icons/32x32/xfpm-tablet-100.png | Bin 1698 -> 0 bytes
data/icons/32x32/xfpm-tablet-100.svg | 671 -----
data/icons/48x48/Makefile.am | 56 +-
data/icons/48x48/computer.png | Bin 0 -> 3331 bytes
data/icons/48x48/input-keyboard.png | Bin 0 -> 1381 bytes
data/icons/48x48/input-mouse.png | Bin 0 -> 3016 bytes
data/icons/48x48/multimedia-player.png | Bin 0 -> 1902 bytes
data/icons/48x48/pda.png | Bin 0 -> 1728 bytes
data/icons/48x48/phone.png | Bin 0 -> 2765 bytes
data/icons/48x48/tablet.png | Bin 0 -> 2891 bytes
data/icons/48x48/video-display.png | Bin 0 -> 2405 bytes
data/icons/48x48/xfpm-computer-000.png | Bin 2465 -> 0 bytes
data/icons/48x48/xfpm-computer-020.png | Bin 2461 -> 0 bytes
data/icons/48x48/xfpm-computer-040.png | Bin 2467 -> 0 bytes
data/icons/48x48/xfpm-computer-060.png | Bin 2464 -> 0 bytes
data/icons/48x48/xfpm-computer-080.png | Bin 2448 -> 0 bytes
data/icons/48x48/xfpm-computer-100.png | Bin 2415 -> 0 bytes
data/icons/48x48/xfpm-keyboard-000.png | Bin 1608 -> 0 bytes
data/icons/48x48/xfpm-keyboard-020.png | Bin 1607 -> 0 bytes
data/icons/48x48/xfpm-keyboard-040.png | Bin 1603 -> 0 bytes
data/icons/48x48/xfpm-keyboard-060.png | Bin 1603 -> 0 bytes
data/icons/48x48/xfpm-keyboard-080.png | Bin 1595 -> 0 bytes
data/icons/48x48/xfpm-keyboard-100.png | Bin 1580 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-000.png | Bin 1969 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-020.png | Bin 1972 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-040.png | Bin 1975 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-060.png | Bin 1971 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-080.png | Bin 1945 -> 0 bytes
data/icons/48x48/xfpm-mediaplayer-100.png | Bin 1908 -> 0 bytes
data/icons/48x48/xfpm-monitor-000.png | Bin 2119 -> 0 bytes
data/icons/48x48/xfpm-monitor-020.png | Bin 2113 -> 0 bytes
data/icons/48x48/xfpm-monitor-040.png | Bin 2130 -> 0 bytes
data/icons/48x48/xfpm-monitor-060.png | Bin 2118 -> 0 bytes
data/icons/48x48/xfpm-monitor-080.png | Bin 2105 -> 0 bytes
data/icons/48x48/xfpm-monitor-100.png | Bin 2073 -> 0 bytes
data/icons/48x48/xfpm-mouse-000.png | Bin 3224 -> 0 bytes
data/icons/48x48/xfpm-mouse-020.png | Bin 3220 -> 0 bytes
data/icons/48x48/xfpm-mouse-040.png | Bin 3227 -> 0 bytes
data/icons/48x48/xfpm-mouse-060.png | Bin 3223 -> 0 bytes
data/icons/48x48/xfpm-mouse-080.png | Bin 3202 -> 0 bytes
data/icons/48x48/xfpm-mouse-100.png | Bin 3173 -> 0 bytes
data/icons/48x48/xfpm-pda-000.png | Bin 1961 -> 0 bytes
data/icons/48x48/xfpm-pda-020.png | Bin 1955 -> 0 bytes
data/icons/48x48/xfpm-pda-040.png | Bin 1961 -> 0 bytes
data/icons/48x48/xfpm-pda-060.png | Bin 1968 -> 0 bytes
data/icons/48x48/xfpm-pda-080.png | Bin 1948 -> 0 bytes
data/icons/48x48/xfpm-pda-100.png | Bin 1910 -> 0 bytes
data/icons/48x48/xfpm-phone-000.png | Bin 2861 -> 0 bytes
data/icons/48x48/xfpm-phone-020.png | Bin 2860 -> 0 bytes
data/icons/48x48/xfpm-phone-040.png | Bin 2869 -> 0 bytes
data/icons/48x48/xfpm-phone-060.png | Bin 2862 -> 0 bytes
data/icons/48x48/xfpm-phone-080.png | Bin 2832 -> 0 bytes
data/icons/48x48/xfpm-phone-100.png | Bin 2816 -> 0 bytes
data/icons/48x48/xfpm-tablet-000.png | Bin 2958 -> 0 bytes
data/icons/48x48/xfpm-tablet-020.png | Bin 2954 -> 0 bytes
data/icons/48x48/xfpm-tablet-040.png | Bin 2947 -> 0 bytes
data/icons/48x48/xfpm-tablet-060.png | Bin 2957 -> 0 bytes
data/icons/48x48/xfpm-tablet-080.png | Bin 2924 -> 0 bytes
data/icons/48x48/xfpm-tablet-100.png | Bin 2895 -> 0 bytes
data/icons/scalable/Makefile.am | 56 +-
data/icons/scalable/computer.svg | 1902 ++++++++++++++
data/icons/scalable/keyboard.svg | 961 +++++++
data/icons/scalable/mouse.svg | 1063 ++++++++
data/icons/scalable/multimedia-player.svg | 1016 ++++++++
data/icons/scalable/{xfpm-pda-000.svg => pda.svg} | 103 +-
.../scalable/{xfpm-phone-020.svg => phone.svg} | 1632 +++++++-----
.../scalable/{xfpm-tablet-000.svg => tablet.svg} | 153 +-
data/icons/scalable/video-display.svg | 1049 ++++++++
data/icons/scalable/xfpm-brightness-keyboard.svg | 66 -
data/icons/scalable/xfpm-brightness-lcd.svg | 100 +-
data/icons/scalable/xfpm-computer-000.svg | 1340 ----------
data/icons/scalable/xfpm-computer-020.svg | 1340 ----------
data/icons/scalable/xfpm-computer-040.svg | 1340 ----------
data/icons/scalable/xfpm-computer-060.svg | 1340 ----------
data/icons/scalable/xfpm-computer-080.svg | 1340 ----------
data/icons/scalable/xfpm-computer-100.svg | 1340 ----------
data/icons/scalable/xfpm-keyboard-000.svg | 2154 ----------------
data/icons/scalable/xfpm-keyboard-020.svg | 2154 ----------------
data/icons/scalable/xfpm-keyboard-040.svg | 2154 ----------------
data/icons/scalable/xfpm-keyboard-060.svg | 2154 ----------------
data/icons/scalable/xfpm-keyboard-080.svg | 2154 ----------------
data/icons/scalable/xfpm-keyboard-100.svg | 2154 ----------------
data/icons/scalable/xfpm-mediaplayer-000.svg | 700 ------
data/icons/scalable/xfpm-mediaplayer-020.svg | 700 ------
data/icons/scalable/xfpm-mediaplayer-040.svg | 700 ------
data/icons/scalable/xfpm-mediaplayer-060.svg | 700 ------
data/icons/scalable/xfpm-mediaplayer-080.svg | 700 ------
data/icons/scalable/xfpm-mediaplayer-100.svg | 700 ------
data/icons/scalable/xfpm-monitor-000.svg | 570 -----
data/icons/scalable/xfpm-monitor-020.svg | 570 -----
data/icons/scalable/xfpm-monitor-040.svg | 570 -----
data/icons/scalable/xfpm-monitor-060.svg | 570 -----
data/icons/scalable/xfpm-monitor-080.svg | 570 -----
data/icons/scalable/xfpm-monitor-100.svg | 570 -----
data/icons/scalable/xfpm-mouse-000.svg | 575 -----
data/icons/scalable/xfpm-mouse-020.svg | 575 -----
data/icons/scalable/xfpm-mouse-040.svg | 575 -----
data/icons/scalable/xfpm-mouse-060.svg | 575 -----
data/icons/scalable/xfpm-mouse-080.svg | 575 -----
data/icons/scalable/xfpm-mouse-100.svg | 575 -----
data/icons/scalable/xfpm-pda-020.svg | 456 ----
data/icons/scalable/xfpm-pda-040.svg | 456 ----
data/icons/scalable/xfpm-pda-060.svg | 456 ----
data/icons/scalable/xfpm-pda-080.svg | 456 ----
data/icons/scalable/xfpm-pda-100.svg | 456 ----
data/icons/scalable/xfpm-phone-000.svg | 2650 --------------------
data/icons/scalable/xfpm-phone-040.svg | 2650 --------------------
data/icons/scalable/xfpm-phone-060.svg | 2650 --------------------
data/icons/scalable/xfpm-phone-080.svg | 2650 --------------------
data/icons/scalable/xfpm-phone-100.svg | 2650 --------------------
data/icons/scalable/xfpm-tablet-020.svg | 668 -----
data/icons/scalable/xfpm-tablet-040.svg | 668 -----
data/icons/scalable/xfpm-tablet-060.svg | 668 -----
data/icons/scalable/xfpm-tablet-080.svg | 668 -----
data/icons/scalable/xfpm-tablet-100.svg | 668 -----
panel-plugins/battery/battery-button.c | 64 +
221 files changed, 7230 insertions(+), 95790 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list