applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

printers: Make panel required on all platforms

Browse source 
All the free Unix-compatible platforms we support have CUPS support, so
require it from the get-go.
This commit is contained in:
Bastien Nocera 2017-02-08 20:06:40 +01:00
parent 0090ba57e4
commit 8074a31d5e
4 changed files with 32 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/Makefile.am
View file

@ -93,16 +93,13 @@ gnome_control_center_LDADD = \
$(top_builddir)/panels/sharing/libsharing.la \
$(top_builddir)/panels/sound/libsound.la \
$(top_builddir)/panels/universal-access/libuniversal-access.la \
$(top_builddir)/panels/user-accounts/libuser-accounts.la
$(top_builddir)/panels/user-accounts/libuser-accounts.la \
$(top_builddir)/panels/printers/libprinters.la
if BUILD_WACOM
gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
endif
if BUILD_PRINTERS
gnome_control_center_LDADD += $(top_builddir)/panels/printers/libprinters.la
endif
if BUILD_NETWORK
gnome_control_center_LDADD += $(top_builddir)/panels/network/libnetwork.la
endif

4
shell/cc-panel-loader.c
View file

@ -45,9 +45,7 @@ extern GType cc_network_panel_get_type (void);
extern GType cc_notifications_panel_get_type (void);
extern GType cc_goa_panel_get_type (void);
extern GType cc_power_panel_get_type (void);
#ifdef BUILD_PRINTERS
extern GType cc_printers_panel_get_type (void);
#endif /* BUILD_PRINTERS */
extern GType cc_privacy_panel_get_type (void);
extern GType cc_region_panel_get_type (void);
extern GType cc_search_panel_get_type (void);
@ -89,9 +87,7 @@ static struct {
PANEL_TYPE("notifications", cc_notifications_panel_get_type),
PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
PANEL_TYPE("power", cc_power_panel_get_type ),
#ifdef BUILD_PRINTERS
PANEL_TYPE("printers", cc_printers_panel_get_type ),
#endif
PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
PANEL_TYPE("region", cc_region_panel_get_type ),
PANEL_TYPE("search", cc_search_panel_get_type ),