[gnome-builder] greeter: fix module-name when greeter plugin is used
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] greeter: fix module-name when greeter plugin is used
- Date: Mon, 14 Jan 2019 23:40:03 +0000 (UTC)
commit 565a3af6022296aeec0f9eb62fa88b59e798b8a3
Author: Christian Hergert <chergert redhat com>
Date: Mon Jan 14 15:39:46 2019 -0800
greeter: fix module-name when greeter plugin is used
We don't need to keep the "greeter" plugin module-name around for filters
added internally to the plugin. Just ignore it and fallback in that case.
src/libide/greeter/ide-greeter-workspace-actions.c | 8 ++++----
src/plugins/buildsystem/gbp-buildsystem-workbench-addin.c | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/libide/greeter/ide-greeter-workspace-actions.c
b/src/libide/greeter/ide-greeter-workspace-actions.c
index cb4881f34..63cc3aa8f 100644
--- a/src/libide/greeter/ide-greeter-workspace-actions.c
+++ b/src/libide/greeter/ide-greeter-workspace-actions.c
@@ -130,6 +130,7 @@ ide_greeter_workspace_actions_open (GSimpleAction *action,
for (; list != NULL; list = list->next)
{
PeasPluginInfo *plugin_info = list->data;
+ const gchar *module_name = peas_plugin_info_get_module_name (plugin_info);
GtkFileFilter *filter;
const gchar *pattern;
const gchar *content_type;
@@ -159,10 +160,9 @@ ide_greeter_workspace_actions_open (GSimpleAction *action,
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, name);
- g_object_set_data_full (G_OBJECT (filter),
- "MODULE_NAME",
- g_strdup (peas_plugin_info_get_module_name (plugin_info)),
- g_free);
+
+ if (!ide_str_equal0 (module_name, "greeter"))
+ g_object_set_data_full (G_OBJECT (filter), "MODULE_NAME", g_strdup (module_name), g_free);
for (i = 0; patterns [i] != NULL; i++)
{
diff --git a/src/plugins/buildsystem/gbp-buildsystem-workbench-addin.c
b/src/plugins/buildsystem/gbp-buildsystem-workbench-addin.c
index 9ed422c04..9d35f82a0 100644
--- a/src/plugins/buildsystem/gbp-buildsystem-workbench-addin.c
+++ b/src/plugins/buildsystem/gbp-buildsystem-workbench-addin.c
@@ -260,7 +260,10 @@ gbp_buildsystem_workbench_addin_load_project_async (IdeWorkbenchAddin *addin,
directory = ide_project_info_get_directory (project_info);
g_assert (G_IS_FILE (directory));
+ /* Get the hint, but ignore if it is "greeter" */
hint = ide_project_info_get_build_system_hint (project_info);
+ if (ide_str_equal0 (hint, "greeter"))
+ hint = NULL;
discover_async (self,
directory,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]