Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 296380
Collapse All | Expand All

(-)/src/conky.c_old (+7 lines)
Lines 142-147 Link Here
142
#ifdef IOSTATS
142
#ifdef IOSTATS
143
int top_io;
143
int top_io;
144
#endif
144
#endif
145
#ifdef __linux__
146
int top_running;
147
#endif
145
static unsigned int top_name_width = 15;
148
static unsigned int top_name_width = 15;
146
int output_methods;
149
int output_methods;
147
static int extra_newline;
150
static int extra_newline;
Lines 2145-2150 Link Here
2145
#ifdef __linux__
2148
#ifdef __linux__
2146
	END OBJ_IF(if_running, INFO_TOP)
2149
	END OBJ_IF(if_running, INFO_TOP)
2147
		if (arg) {
2150
		if (arg) {
2151
                        top_running = 1;
2148
			obj->data.ifblock.s = strndup(arg, text_buffer_size);
2152
			obj->data.ifblock.s = strndup(arg, text_buffer_size);
2149
#else
2153
#else
2150
	END OBJ_IF(if_running, 0)
2154
	END OBJ_IF(if_running, 0)
Lines 7740-7745 Link Here
7740
#ifdef IOSTATS
7744
#ifdef IOSTATS
7741
	top_io = 0;
7745
	top_io = 0;
7742
#endif
7746
#endif
7747
#ifdef __linux__
7748
	top_running = 0;
7749
#endif
7743
#ifdef MPD
7750
#ifdef MPD
7744
	mpd_env_host = getenv("MPD_HOST");
7751
	mpd_env_host = getenv("MPD_HOST");
7745
	mpd_env_port = getenv("MPD_PORT");
7752
	mpd_env_port = getenv("MPD_PORT");
(-)/src/conky.h_old (+3 lines)
Lines 329-334 Link Here
329
#ifdef IOSTATS
329
#ifdef IOSTATS
330
extern int top_io;
330
extern int top_io;
331
#endif
331
#endif
332
#ifdef __linux__
333
extern int top_running;
334
#endif
332
335
333
/* defined in conky.c, needed by top.c */
336
/* defined in conky.c, needed by top.c */
334
extern int cpu_separate;
337
extern int cpu_separate;
(-)/src/top.c_old (+1 lines)
Lines 669-674 Link Here
669
#ifdef IOSTATS
669
#ifdef IOSTATS
670
			&& !top_io
670
			&& !top_io
671
#endif
671
#endif
672
                        && !top_running
672
	   ) {
673
	   ) {
673
		return;
674
		return;
674
	}
675
	}

Return to bug 296380