Attachment #639666 for bug #707184

View | Details | Raw Unified | Return to bug 707184
Collapse All | Expand All




#endif

/* globals */
extern struct monitor* mon;

extern GtkWidget* main_app_window;

extern GtkWidget* monitor_manager;
extern GtkWidget* profile_manager;

/* notebook.c */



GtkWidget *stock_label_button(const gchar * stockid, const gchar *label_text, const gchar *tool_tip);

extern GtkWidget* profile_manager_button;
extern GtkWidget* saveprofile_button;
extern GtkWidget* cancelprofile_button;
extern GtkWidget* refresh_controls_button;

/* Multimonitor support */
extern int current_monitor; /* current monitor */
extern int num_monitor; /* total number of monitors */

#endif //NOTEBOOK_H





#include "daemon/dbus_client.h"

/* Globals previously in notebook.h */

struct monitor* mon;
GtkWidget* main_app_window;
GtkWidget* monitor_manager;
GtkWidget* profile_manager;
GtkWidget* profile_manager_button;
GtkWidget* saveprofile_button;
GtkWidget* cancelprofile_button;
GtkWidget* refresh_controls_button;

/* Multimonitor support */
int current_monitor; /* current monitor */
int num_monitor; /* total number of monitors */

/* End Globals moved for -fno-common/gcc10 fix */


GtkWidget* table;

GtkWidget *combo_box;

Return to bug 707184

Lines 43-54 Link Here

(-)ddccontrol-0.4.4_p20181007/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/notebook.h (-10 / +10 lines)
43	#endif	43	#endif
44		44
45	/* globals */	45	/* globals */
46	struct monitor* mon;	46	extern struct monitor* mon;
47		47
48	GtkWidget* main_app_window;	48	extern GtkWidget* main_app_window;
49		49
50	GtkWidget* monitor_manager;	50	extern GtkWidget* monitor_manager;
51	GtkWidget* profile_manager;	51	extern GtkWidget* profile_manager;
52		52
53	/* notebook.c */	53	/* notebook.c */
54		54
Lines 91-103 Link Here
91		91
92	GtkWidget stock_label_button(const gchar stockid, const gchar label_text, const gchar tool_tip);	92	GtkWidget stock_label_button(const gchar stockid, const gchar label_text, const gchar tool_tip);
93		93
94	GtkWidget* profile_manager_button;	94	extern GtkWidget* profile_manager_button;
95	GtkWidget* saveprofile_button;	95	extern GtkWidget* saveprofile_button;
96	GtkWidget* cancelprofile_button;	96	extern GtkWidget* cancelprofile_button;
97	GtkWidget* refresh_controls_button;	97	extern GtkWidget* refresh_controls_button;
98		98
99	/* Multimonitor support */	99	/* Multimonitor support */
100	int current_monitor; /* current monitor */	100	extern int current_monitor; /* current monitor */
101	int num_monitor; /* total number of monitors */	101	extern int num_monitor; /* total number of monitors */
102		102
103	#endif //NOTEBOOK_H	103	#endif //NOTEBOOK_H

Lines 31-36 Link Here

(-)ddccontrol-0.4.4_p20181007/work/ddccontrol-ec793083f69bb3dc8624ce7199aa921ddc5064f9/src/gddccontrol/main.c (+18 lines)
31		31
32	#include "daemon/dbus_client.h"	32	#include "daemon/dbus_client.h"
33		33
		34	/* Globals previously in notebook.h */
		35
		36	struct monitor* mon;
		37	GtkWidget* main_app_window;
		38	GtkWidget* monitor_manager;
		39	GtkWidget* profile_manager;
		40	GtkWidget* profile_manager_button;
		41	GtkWidget* saveprofile_button;
		42	GtkWidget* cancelprofile_button;
		43	GtkWidget* refresh_controls_button;
		44
		45	/* Multimonitor support */
		46	int current_monitor; /* current monitor */
		47	int num_monitor; /* total number of monitors */
		48
		49	/* End Globals moved for -fno-common/gcc10 fix */
		50
		51
34	GtkWidget* table;	52	GtkWidget* table;
35		53
36	GtkWidget *combo_box;	54	GtkWidget *combo_box;