[gnome-builder] foundry: be more flexible with display name fallbacks
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] foundry: be more flexible with display name fallbacks
- Date: Fri, 3 May 2019 04:02:28 +0000 (UTC)
commit 1ae11dec6c40ce76e6de410716547f824a886659
Author: Christian Hergert <chergert redhat com>
Date: Thu May 2 20:54:31 2019 -0700
foundry: be more flexible with display name fallbacks
src/libide/foundry/ide-runtime.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/foundry/ide-runtime.c b/src/libide/foundry/ide-runtime.c
index b11586052..27c9d0750 100644
--- a/src/libide/foundry/ide-runtime.c
+++ b/src/libide/foundry/ide-runtime.c
@@ -502,10 +502,17 @@ const gchar *
ide_runtime_get_display_name (IdeRuntime *self)
{
IdeRuntimePrivate *priv = ide_runtime_get_instance_private (self);
+ gchar *ret;
g_return_val_if_fail (IDE_IS_RUNTIME (self), NULL);
- return priv->display_name ? priv->display_name : priv->name;
+ if (!(ret = priv->display_name))
+ {
+ if (!(ret = priv->name))
+ ret = priv->id;
+ }
+
+ return ret;
}
void
@@ -515,7 +522,6 @@ ide_runtime_set_display_name (IdeRuntime *self,
IdeRuntimePrivate *priv = ide_runtime_get_instance_private (self);
g_return_if_fail (IDE_IS_RUNTIME (self));
- g_return_if_fail (display_name != NULL);
if (g_strcmp0 (display_name, priv->display_name) != 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]