From dccae661d278556664eee7d5efc8ebe5b6c4eddc Mon Sep 17 00:00:00 2001
From: raster <raster@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Mon, 5 Mar 2012 12:36:09 +0000
Subject: [PATCH] elm_theme_all_set -> deprecate.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@68706 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/bin/config.c         | 5 +++--
 src/lib/elm_deprecated.h | 9 +++++++++
 src/lib/elm_theme.c      | 2 +-
 src/lib/elm_theme.h      | 9 ---------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/bin/config.c b/src/bin/config.c
index 2b00423..28a1eff 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1111,8 +1111,9 @@ _theme_use(void *data       __UNUSED__,
 
    th = elm_object_theme_get(sample);
    defth = elm_theme_get(th);
-   elm_theme_all_set(defth);
+   elm_theme_set(NULL, defth);
    elm_config_save();
+   elm_config_all_flush();
 }
 
 static void
@@ -3112,7 +3113,7 @@ elm_main(int    argc,
      }
    if (!interactive)
      {
-        if (theme_set) elm_theme_all_set(theme_set);
+        if (theme_set) elm_theme_set(NULL, theme_set);
         if (finger_size_set) elm_finger_size_set(atoi(finger_size_set));
         if (scale_set)  elm_scale_set(atof(scale_set));
 
diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 8e59d3e..df0339e 100644
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -4766,5 +4766,14 @@ EINA_DEPRECATED EAPI void                  elm_win_transparent_set(Evas_Object *
 EINA_DEPRECATED EAPI Eina_Bool             elm_win_transparent_get(const Evas_Object *obj);
 
 /**
+ * Set the theme for all elementary using applications on the current display
+ *
+ * @param theme The name of the theme to use. Format same as the ELM_THEME
+ * environment variable.
+ * @deprecated Use elm_theme_set(NULL, theme); elm_config_all_flush(); instead.
+ */
+EINA_DEPRECATED EAPI void             elm_theme_all_set(const char *theme);
+
+/**
  * @}
  */
diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index c2934c1..d660d64 100644
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -594,7 +594,7 @@ elm_theme_full_flush(void)
    elm_theme_flush(&(theme_default));
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_theme_all_set(const char *theme)
 {
    eina_stringshare_replace(&_elm_config->theme, theme);
diff --git a/src/lib/elm_theme.h b/src/lib/elm_theme.h
index a99ab59..7c543a5 100644
--- a/src/lib/elm_theme.h
+++ b/src/lib/elm_theme.h
@@ -302,15 +302,6 @@ EAPI void             elm_theme_flush(Elm_Theme *th);
 EAPI void             elm_theme_full_flush(void);
 
 /**
- * Set the theme for all elementary using applications on the current display
- *
- * @param theme The name of the theme to use. Format same as the ELM_THEME
- * environment variable.
- */
-//XXX: how about changing to elm_theme_set & elm_theme_flush & elm_config_all_flush? 
-EAPI void             elm_theme_all_set(const char *theme);
-
-/**
  * Return a list of theme elements in the theme search path
  *
  * @return A list of strings that are the theme element names.
-- 
2.7.4