[libdazzle] shortcuts: reapply the existing theme after reloading

[Christian Hergert <chergert src gnome org>]

commit ea88a8bce9266e1843dd3e01ee2cd5b40626977d
Author: Christian Hergert <chergert redhat com>
Date:   Tue Jun 13 00:45:12 2017 -0700

    shortcuts: reapply the existing theme after reloading

 src/shortcuts/dzl-shortcut-manager.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/src/shortcuts/dzl-shortcut-manager.c b/src/shortcuts/dzl-shortcut-manager.c
index a28a5a9..cabde55 100644
--- a/src/shortcuts/dzl-shortcut-manager.c
+++ b/src/shortcuts/dzl-shortcut-manager.c
@@ -141,6 +141,7 @@ dzl_shortcut_manager_reload (DzlShortcutManager *self,
   DzlShortcutManagerPrivate *priv = dzl_shortcut_manager_get_instance_private (self);
   g_autofree gchar *theme_name = NULL;
   g_autofree gchar *parent_theme_name = NULL;
+  DzlShortcutTheme *theme = NULL;
   guint previous_len;
 
   g_assert (DZL_IS_SHORTCUT_MANAGER (self));
@@ -194,6 +195,23 @@ dzl_shortcut_manager_reload (DzlShortcutManager *self,
       else
         dzl_shortcut_manager_load_directory (self, directory, cancellable);
     }
+
+  /*
+   * Now try to reapply the same theme if we can find it.
+   */
+  if (theme_name != NULL)
+    {
+      theme = dzl_shortcut_manager_get_theme_by_name (self, theme_name);
+      g_set_object (&priv->theme, theme);
+    }
+  if (priv->theme == NULL && parent_theme_name != NULL)
+    {
+      theme = dzl_shortcut_manager_get_theme_by_name (self, parent_theme_name);
+      g_set_object (&priv->theme, theme);
+    }
+
+  g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_THEME]);
+  g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_THEME_NAME]);
 }
 
 static gboolean