summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-05-22 10:36:32 +0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-05-22 10:36:32 +0200
commit3c0ef691642b0bd076f8fd2a43e1aa0cf1f05785 (patch)
tree97df78ccc4a4e2daed0c6ba38ef109bb25ea28cb
parent15633b59937fed4d4fafcb4205a6f67c99c50d5e (diff)
Revert "entrance: the gui can now be set to a new theme."
This reverts commit cf959fc86e63423af7e06274b809d0b58c5109fa.
-rw-r--r--src/bin/entrance_gui.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
index 1e1281d..07e6900 100644
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -170,29 +170,6 @@ entrance_gui_init(const char *theme)
170 return j; 170 return j;
171} 171}
172 172
173static void
174_entrance_gui_theme_update(void)
175{
176 Eina_List *node;
177 Entrance_Screen *screen;
178 char buf[PATH_MAX];
179 snprintf(buf, sizeof(buf),
180 PACKAGE_DATA_DIR"/themes/%s.edj", _gui->theme);
181 EINA_LIST_FOREACH(_gui->screens, node, screen)
182 {
183 elm_layout_file_set(screen->transition, buf, "entrance/wallpaper/default");
184 elm_layout_file_set(screen->edj, buf, "entrance");
185 elm_layout_file_set(screen->login, buf, "entrance/login");
186 evas_object_smart_callback_add(
187 ENTRANCE_GUI_GET(screen->edj, "entrance.conf"),
188 "clicked",
189 _entrance_gui_conf_clicked_cb,
190 screen->transition);
191 }
192 _entrance_gui_actions_populate();
193 _entrance_gui_users_populate();
194}
195
196void 173void
197entrance_gui_shutdown(void) 174entrance_gui_shutdown(void)
198{ 175{
@@ -522,8 +499,7 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
522 } 499 }
523 if (_gui->theme != conf->theme) 500 if (_gui->theme != conf->theme)
524 { 501 {
525 entrance_gui_theme_name_set(conf->theme); 502 _gui->theme = conf->theme;
526 _entrance_gui_theme_update();
527 } 503 }
528 _gui->changed = ~(ENTRANCE_CONF_NONE); 504 _gui->changed = ~(ENTRANCE_CONF_NONE);
529 _entrance_gui_update(); 505 _entrance_gui_update();
@@ -565,7 +541,7 @@ entrance_gui_themes_get(void)
565void 541void
566entrance_gui_theme_name_set(const char *theme) 542entrance_gui_theme_name_set(const char *theme)
567{ 543{
568 _gui->theme = theme; 544 /* TODO */
569} 545}
570 546
571const char * 547const char *