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

shell: add a way to compile the panel loader without GType functions

Browse source 
This will allow to use the panel loader in the search provider, which
is a separate executable and doesn't link all the panel modules.

https://bugzilla.gnome.org/show_bug.cgi?id=690577
This commit is contained in:
Giovanni Campagna 2013-02-18 15:29:04 +01:00
parent 431b89f176
commit 3911ef1c3a
1 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@
#include "cc-panel-loader.h" #include "cc-panel-loader.h"
#ifndef CC_PANEL_LOADER_NO_GTYPES
/* Extension points */ /* Extension points */
extern GType cc_background_panel_get_type (void); extern GType cc_background_panel_get_type (void);
#ifdef BUILD_BLUETOOTH #ifdef BUILD_BLUETOOTH
@ -57,43 +59,51 @@ extern GType cc_user_panel_get_type (void);
extern GType cc_wacom_panel_get_type (void); extern GType cc_wacom_panel_get_type (void);
#endif /* BUILD_WACOM */ #endif /* BUILD_WACOM */
#define PANEL_TYPE(name, get_type) { name, get_type }
#else /* CC_PANEL_LOADER_NO_GTYPES */
#define PANEL_TYPE(name, get_type) { name }
#endif
static struct { static struct {
const char *name; const char *name;
#ifndef CC_PANEL_LOADER_NO_GTYPES
GType (*get_type)(void); GType (*get_type)(void);
#endif
} all_panels[] = { } all_panels[] = {
{ "background", cc_background_panel_get_type }, PANEL_TYPE("background", cc_background_panel_get_type ),
#ifdef BUILD_BLUETOOTH #ifdef BUILD_BLUETOOTH
{ "bluetooth", cc_bluetooth_panel_get_type }, PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
#endif #endif
{ "color", cc_color_panel_get_type }, PANEL_TYPE("color", cc_color_panel_get_type ),
{ "datetime", cc_date_time_panel_get_type }, PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
{ "display", cc_display_panel_get_type }, PANEL_TYPE("display", cc_display_panel_get_type ),
{ "info", cc_info_panel_get_type }, PANEL_TYPE("info", cc_info_panel_get_type ),
{ "keyboard", cc_keyboard_panel_get_type }, PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ),
{ "mouse", cc_mouse_panel_get_type }, PANEL_TYPE("mouse", cc_mouse_panel_get_type ),
#ifdef BUILD_NETWORK #ifdef BUILD_NETWORK
{ "network", cc_network_panel_get_type }, PANEL_TYPE("network", cc_network_panel_get_type ),
#endif #endif
{ "notifications", cc_notifications_panel_get_type }, PANEL_TYPE("notifications", cc_notifications_panel_get_type),
{ "online-accounts", cc_goa_panel_get_type }, PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
{ "power", cc_power_panel_get_type }, PANEL_TYPE("power", cc_power_panel_get_type ),
#ifdef BUILD_PRINTERS #ifdef BUILD_PRINTERS
{ "printers", cc_printers_panel_get_type }, PANEL_TYPE("printers", cc_printers_panel_get_type ),
#endif #endif
{ "privacy", cc_privacy_panel_get_type }, PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
{ "region", cc_region_panel_get_type }, PANEL_TYPE("region", cc_region_panel_get_type ),
{ "search", cc_search_panel_get_type }, PANEL_TYPE("search", cc_search_panel_get_type ),
{ "sharing", cc_sharing_panel_get_type }, PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
{ "sound", cc_sound_panel_get_type }, PANEL_TYPE("sound", cc_sound_panel_get_type ),
{ "universal-access", cc_ua_panel_get_type }, PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
{ "user-accounts", cc_user_panel_get_type }, PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
#ifdef BUILD_WACOM #ifdef BUILD_WACOM
{ "wacom", cc_wacom_panel_get_type }, PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif #endif
}; };
static GHashTable *panel_types;
GList * GList *
cc_panel_loader_get_panels (void) cc_panel_loader_get_panels (void)
{ {
@ -170,6 +180,10 @@ cc_panel_loader_fill_model (CcShellModel *model)
} }
} }
#ifndef CC_PANEL_LOADER_NO_GTYPES
static GHashTable *panel_types;
static void static void
ensure_panel_types (void) ensure_panel_types (void)
{ {
@ -200,3 +214,5 @@ cc_panel_loader_load_by_name (CcShell *shell,
"argv", argv, "argv", argv,
NULL); NULL);
} }
#endif /* CC_PANEL_LOADER_NO_GTYPES */