tasn pushed a commit to branch master.
commit 3ae0b13de7c14886e28b355e3d4b18fc3b6c7bcb
Author: Tom Hacohen <[email protected]>
Date: Mon Apr 29 15:17:06 2013 +0100
Override ELM_CLOUSEAU env var so we don't inspect ourselves.
---
src/bin/clouseau_client.c | 10 +++++-----
src/lib/clouseau_preload.c | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index d680f5a..c0cc0ed 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -1929,9 +1929,8 @@ _property_list_create(Evas_Object *panes)
evas_object_show(o);
}
-#ifndef ELM_LIB_QUICKLAUNCH
-EAPI int
-elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
+int
+main(int argc, char **argv)
{ /* Create Client Window */
const char *log_dom = "clouseau_client";
_clouseau_client_log_dom = eina_log_domain_register(log_dom,
EINA_COLOR_LIGHTBLUE);
@@ -1950,6 +1949,9 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
gui = calloc(1, sizeof(gui_elements));
+ setenv("ELM_CLOUSEAU", "0", 1);
+ elm_init(argc, argv);
+
gui->win = win = elm_win_util_standard_add("client", CLIENT_NAME);
elm_win_autodel_set(win, EINA_TRUE);
_titlebar_string_set(gui, EINA_FALSE);
@@ -2096,5 +2098,3 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
return 0;
}
-ELM_MAIN()
-#endif
diff --git a/src/lib/clouseau_preload.c b/src/lib/clouseau_preload.c
index 48799f5..278442f 100644
--- a/src/lib/clouseau_preload.c
+++ b/src/lib/clouseau_preload.c
@@ -19,6 +19,8 @@ elm_init(int argc, char **argv)
{
int (*_elm_init)(int, char **) = dlsym(RTLD_NEXT, __func__);
+ setenv("ELM_CLOUSEAU", "0", 1);
+
if (!_elm_is_init)
{
_my_app_name = argv[0];
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
