[gnome-control-center/gbsneto/interactive-test-panels: 11/16] panel-loader: Allow overriding panel vtable
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gbsneto/interactive-test-panels: 11/16] panel-loader: Allow overriding panel vtable
- Date: Mon, 12 Nov 2018 01:47:55 +0000 (UTC)
commit 62d3fb95ff79783720f5abb2cebb8f04b6d39a3b
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Nov 7 21:03:41 2018 -0200
panel-loader: Allow overriding panel vtable
In order to introduce test panels, which are a nice to have
feature before actually moving to working on the custom
widget on sidebar feature, add a way to override the panels
vtable and load whatever panels we might want.
shell/cc-panel-loader.c | 42 +++++++++++++++++++++++++++++++-----------
shell/cc-panel-loader.h | 3 +++
2 files changed, 34 insertions(+), 11 deletions(-)
---
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 8ce95372e..c68b033d4 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -118,6 +118,13 @@ static CcPanelLoaderVtable default_panels[] =
#endif
};
+/* Override for the panel vtable. When NULL, the default_panels will
+ * be used.
+ */
+static CcPanelLoaderVtable *panels_vtable = default_panels;
+static gsize panels_vtable_len = G_N_ELEMENTS (default_panels);
+
+
static int
parse_categories (GDesktopAppInfo *app)
{
@@ -169,8 +176,8 @@ ensure_panel_types (void)
return;
panel_types = g_hash_table_new (g_str_hash, g_str_equal);
- for (i = 0; i < G_N_ELEMENTS (default_panels); i++)
- g_hash_table_insert (panel_types, (char*)default_panels[i].name, default_panels[i].get_type);
+ for (i = 0; i < panels_vtable_len; i++)
+ g_hash_table_insert (panel_types, (char*)panels_vtable[i].name, panels_vtable[i].get_type);
}
CcPanel *
@@ -198,18 +205,18 @@ cc_panel_loader_fill_model (CcShellModel *model)
{
guint i;
- for (i = 0; i < G_N_ELEMENTS (default_panels); i++)
+ for (i = 0; i < panels_vtable_len; i++)
{
g_autoptr (GDesktopAppInfo) app;
g_autofree gchar *desktop_name = NULL;
gint category;
- desktop_name = g_strconcat ("gnome-", default_panels[i].name, "-panel.desktop", NULL);
+ desktop_name = g_strconcat ("gnome-", panels_vtable[i].name, "-panel.desktop", NULL);
app = g_desktop_app_info_new (desktop_name);
if (!app)
{
- g_warning ("Ignoring broken panel %s (missing desktop file)", default_panels[i].name);
+ g_warning ("Ignoring broken panel %s (missing desktop file)", panels_vtable[i].name);
continue;
}
@@ -221,7 +228,7 @@ cc_panel_loader_fill_model (CcShellModel *model)
if (!g_desktop_app_info_get_show_in (app, NULL))
continue;
- cc_shell_model_add_item (model, category, G_APP_INFO (app), default_panels[i].name);
+ cc_shell_model_add_item (model, category, G_APP_INFO (app), panels_vtable[i].name);
}
/* If there's an static init function, execute it after adding all panels to
@@ -229,10 +236,10 @@ cc_panel_loader_fill_model (CcShellModel *model)
* having an instance running.
*/
#ifndef CC_PANEL_LOADER_NO_GTYPES
- for (i = 0; i < G_N_ELEMENTS (default_panels); i++)
+ for (i = 0; i < panels_vtable_len; i++)
{
- if (default_panels[i].static_init_func)
- default_panels[i].static_init_func ();
+ if (panels_vtable[i].static_init_func)
+ panels_vtable[i].static_init_func ();
}
#endif
}
@@ -244,7 +251,20 @@ cc_panel_loader_list_panels (void)
g_print ("%s\n", _("Available panels:"));
- for (i = 0; i < G_N_ELEMENTS (default_panels); i++)
- g_print ("\t%s\n", default_panels[i].name);
+ for (i = 0; i < panels_vtable_len; i++)
+ g_print ("\t%s\n", panels_vtable[i].name);
+
+}
+
+void
+cc_panel_loader_override_vtable (CcPanelLoaderVtable *override_vtable,
+ gsize n_elements)
+{
+ g_assert (override_vtable != NULL);
+ g_assert (n_elements > 0);
+
+ g_debug ("Overriding default panel vtable");
+ panels_vtable = override_vtable;
+ panels_vtable_len = n_elements;
}
diff --git a/shell/cc-panel-loader.h b/shell/cc-panel-loader.h
index f9847600e..1b91832e8 100644
--- a/shell/cc-panel-loader.h
+++ b/shell/cc-panel-loader.h
@@ -45,5 +45,8 @@ CcPanel *cc_panel_loader_load_by_name (CcShell *shell,
const char *name,
GVariant *parameters);
+void cc_panel_loader_override_vtable (CcPanelLoaderVtable *override_vtable,
+ gsize n_elements);
+
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]