[libdazzle] shortcuts: special case internal parent
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdazzle] shortcuts: special case internal parent
- Date: Thu, 15 Jun 2017 02:26:31 +0000 (UTC)
commit a3e081bb77d96a3e4b70cdd3348aa75beff7a57a
Author: Christian Hergert <chergert redhat com>
Date: Wed Jun 14 19:26:11 2017 -0700
shortcuts: special case internal parent
src/shortcuts/dzl-shortcut-theme.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/src/shortcuts/dzl-shortcut-theme.c b/src/shortcuts/dzl-shortcut-theme.c
index 4ac34d2..80a30ee 100644
--- a/src/shortcuts/dzl-shortcut-theme.c
+++ b/src/shortcuts/dzl-shortcut-theme.c
@@ -565,12 +565,15 @@ dzl_shortcut_theme_get_parent (DzlShortcutTheme *self)
g_assert (DZL_IS_SHORTCUT_THEME (self));
- if (priv->parent_name == NULL)
+ if (g_strcmp0 (priv->name, "internal") == 0)
return NULL;
if (priv->manager == NULL)
return NULL;
+ if (priv->parent_name == NULL)
+ return _dzl_shortcut_manager_get_internal_theme (priv->manager);
+
return dzl_shortcut_manager_get_theme_by_name (priv->manager, priv->parent_name);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]