From 08c429ec82ddf2fe6e6850f27ca2d2d9aa195903 Mon Sep 17 00:00:00 2001
From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Wed, 21 May 2014 22:48:10 +0200
Subject: [PATCH] entrance: sent the current theme name

---
 src/bin/entrance_connect.c   | 1 +
 src/bin/entrance_gui.c       | 5 ++++-
 src/daemon/entrance_config.c | 7 ++++++-
 src/daemon/entrance_server.c | 1 +
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/bin/entrance_connect.c b/src/bin/entrance_connect.c
index 495ea93..14aea5f 100644
--- a/src/bin/entrance_connect.c
+++ b/src/bin/entrance_connect.c
@@ -156,6 +156,7 @@ entrance_connect_conf_gui_send(Entrance_Conf_Gui_Event *ev)
    PT("Send gui config\n");
    eev.event.conf_gui.bg.path = ev->bg.path;
    eev.event.conf_gui.bg.group = ev->bg.group;
+   eev.event.conf_gui.theme = ev->theme;
 
    eev.type = ENTRANCE_EVENT_CONF_GUI;
    entrance_event_send(&eev);
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index 8612494..02399f0 100644
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -488,7 +488,10 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
         _gui->vkbd_enabled = conf->vkbd_enabled;
         _gui->changed &= ENTRANCE_CONF_VKBD;
      }
-
+   if (_gui->theme != conf->theme)
+     {
+       _gui->theme = conf->theme;
+     }
    _gui->changed = ~(ENTRANCE_CONF_NONE);
    _entrance_gui_update();
 }
diff --git a/src/daemon/entrance_config.c b/src/daemon/entrance_config.c
index 6136cec..259237e 100644
--- a/src/daemon/entrance_config.c
+++ b/src/daemon/entrance_config.c
@@ -224,7 +224,12 @@ entrance_config_set(const Entrance_Conf_Gui_Event *conf)
         if (!update)
           update = EINA_TRUE;
      }
-
+   if (conf->theme != entrance_config->theme)
+     {
+        entrance_config->theme = conf->theme;
+        if (!update)
+          update = EINA_TRUE;
+     }
    if (update)
      {
         PT("Config save\n");
diff --git a/src/daemon/entrance_server.c b/src/daemon/entrance_server.c
index 42cce8d..b8217c3 100644
--- a/src/daemon/entrance_server.c
+++ b/src/daemon/entrance_server.c
@@ -39,6 +39,7 @@ _entrance_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event E
         eev.event.conf_gui.enabled = EINA_TRUE;
         eev.event.conf_gui.bg.path = entrance_config->bg.path;
         eev.event.conf_gui.bg.group = entrance_config->bg.group;
+        eev.event.conf_gui.theme = entrance_config->theme;
         entrance_event_send(&eev);
      }
    PT("Sending pools\n");