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

project: Switch to the new shell

Browse source 
This is the bomb dropping commit. It does so simply by
changing the compiled files, and adjusting the build
projects proper.
This commit is contained in:
Georges Basile Stavracas Neto 2017-08-03 18:24:27 +01:00 • committed by Rui Matos
parent 8282ba0cf6
commit d5c4436869
8 changed files with 1202 additions and 1202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
shell/Makefile.am
View file

@ -55,6 +55,8 @@ common_sources = \
gnome_control_center_SOURCES = \ gnome_control_center_SOURCES = \
$(common_sources) \ $(common_sources) \
cc-panel-list.c \
cc-panel-list.h \
cc-window.c \ cc-window.c \
cc-window.h cc-window.h

2
shell/alt/Makefile.am
View file

@ -12,8 +12,6 @@ AM_CPPFLAGS = \
noinst_LTLIBRARIES = libshell_alt.la noinst_LTLIBRARIES = libshell_alt.la
libshell_alt_la_SOURCES = \ libshell_alt_la_SOURCES = \
cc-panel-list.c \
cc-panel-list.h \
cc-window.c \ cc-window.c \
cc-window.h cc-window.h

1191
shell/alt/cc-window.c
View file

File diff suppressed because it is too large Load diff

0
shell/alt/cc-panel-list.c → shell/cc-panel-list.c
View file

0
shell/alt/cc-panel-list.h → shell/cc-panel-list.h
View file

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

@ -135,6 +135,15 @@ parse_categories (GDesktopAppInfo *app)
#define const_strv(s) ((const gchar* const*) s) #define const_strv(s) ((const gchar* const*) s)
#ifdef CC_ENABLE_ALT_CATEGORIES #ifdef CC_ENABLE_ALT_CATEGORIES
if (g_strv_contains (const_strv (split), "X-GNOME-Hidden"))
retval = CC_CATEGORY_HIDDEN;
else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE;
else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
retval = CC_CATEGORY_PERSONAL;
else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
retval = CC_CATEGORY_SYSTEM;
#else
if (g_strv_contains (const_strv (split), "X-GNOME-AltHidden")) if (g_strv_contains (const_strv (split), "X-GNOME-AltHidden"))
retval = CC_CATEGORY_HIDDEN; retval = CC_CATEGORY_HIDDEN;
else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings")) else if (g_strv_contains (const_strv (split), "X-GNOME-ConnectivitySettings"))
@ -149,15 +158,6 @@ parse_categories (GDesktopAppInfo *app)
retval = CC_CATEGORY_DETAILS; retval = CC_CATEGORY_DETAILS;
else if (g_strv_contains (const_strv (split), "HardwareSettings")) else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE; retval = CC_CATEGORY_HARDWARE;
#else
if (g_strv_contains (const_strv (split), "X-GNOME-Hidden"))
retval = CC_CATEGORY_HIDDEN;
else if (g_strv_contains (const_strv (split), "HardwareSettings"))
retval = CC_CATEGORY_HARDWARE;
else if (g_strv_contains (const_strv (split), "X-GNOME-PersonalSettings"))
retval = CC_CATEGORY_PERSONAL;
else if (g_strv_contains (const_strv (split), "X-GNOME-SystemSettings"))
retval = CC_CATEGORY_SYSTEM;
#endif #endif
#undef const_strv #undef const_strv

8
shell/cc-shell-model.h
View file

@ -54,16 +54,16 @@ typedef struct _CcShellModelPrivate CcShellModelPrivate;
typedef enum { typedef enum {
#ifdef CC_ENABLE_ALT_CATEGORIES #ifdef CC_ENABLE_ALT_CATEGORIES
CC_CATEGORY_PERSONAL,
CC_CATEGORY_SYSTEM,
CC_CATEGORY_HARDWARE,
#else
CC_CATEGORY_CONNECTIVITY, CC_CATEGORY_CONNECTIVITY,
CC_CATEGORY_PERSONALIZATION, CC_CATEGORY_PERSONALIZATION,
CC_CATEGORY_ACCOUNT, CC_CATEGORY_ACCOUNT,
CC_CATEGORY_HARDWARE, CC_CATEGORY_HARDWARE,
CC_CATEGORY_DEVICES, CC_CATEGORY_DEVICES,
CC_CATEGORY_DETAILS, CC_CATEGORY_DETAILS,
#else
CC_CATEGORY_PERSONAL,
CC_CATEGORY_SYSTEM,
CC_CATEGORY_HARDWARE,
#endif #endif
CC_CATEGORY_HIDDEN, CC_CATEGORY_HIDDEN,

1183
shell/cc-window.c
View file

File diff suppressed because it is too large Load diff