diff --git a/NEWS b/NEWS index abc1992..0adda2e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +2.6.1 (2017/02/19): +------------------ +* stop always showing activity (#12942) +* fix sizing issues and GtkCssProvider lifecycle + 2.6.0 (2016/11/1): ----------------- * set progressbar minimal width/height to 4px diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c index 26e5ee8..175fd44 100644 --- a/panel-plugin/devperf.c +++ b/panel-plugin/devperf.c @@ -33,6 +33,9 @@ #include #include #include +/* for major() and minor() */ +#define _BSD_SOURCE +#include #if defined(__linux__) @@ -59,8 +62,8 @@ static GetPerfData_t m_mGetPerfData = 0; static int DevGetPerfData1 (dev_t p_iDevice, struct devperf_t *p_poPerf) /* Get disk performance statistics from STATISTICS_FILE_1 */ { - const int iMajorNo = (p_iDevice >> 8) & 0xFF, /**/ - iMinorNo = p_iDevice & 0xFF; + const int iMajorNo = major(p_iDevice), + iMinorNo = minor(p_iDevice); struct timeval oTimeStamp; FILE *pF; unsigned int major, minor, rsect, wsect, ruse, wuse, use;