diff options
| author | Patrick McCarty <patrick.mccarty@linux.intel.com> | 2012-11-13 14:09:37 -0800 |
|---|---|---|
| committer | Patrick McCarty <patrick.mccarty@linux.intel.com> | 2012-11-13 14:09:37 -0800 |
| commit | 1a8136717ede8e4d63d598142861825b9d77108b (patch) | |
| tree | 23e33024469a8f734c0a91733db1839748807334 | |
| parent | 1c5f418c76630e1e2f1e0a5de27d610d5d5b7270 (diff) | |
| parent | fd4d1f269b3fb1c36ee0de9c39947091cd040206 (diff) | |
| download | app-core-1a8136717ede8e4d63d598142861825b9d77108b.tar.gz app-core-1a8136717ede8e4d63d598142861825b9d77108b.tar.bz2 app-core-1a8136717ede8e4d63d598142861825b9d77108b.zip | |
Merge branch 'master' into systemd
| -rw-r--r-- | app-core.manifest | 5 | ||||
| -rw-r--r-- | packaging/app-core.spec | 4 | ||||
| -rwxr-xr-x | src/appcore-efl.c | 9 |
3 files changed, 16 insertions, 2 deletions
diff --git a/app-core.manifest b/app-core.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/app-core.manifest @@ -0,0 +1,5 @@ +<manifest> + <request> + <domain name="_"/> + </request> +</manifest> diff --git a/packaging/app-core.spec b/packaging/app-core.spec index f3637d5..93a8eb9 100644 --- a/packaging/app-core.spec +++ b/packaging/app-core.spec @@ -2,7 +2,7 @@ Name: app-core Summary: Application basic Version: 1.2 -Release: 28 +Release: 34 Group: TO_BE/FILLED_IN License: Apache License, Version 2.0 Source0: app-core-%{version}.tar.gz @@ -104,6 +104,7 @@ install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/user/ %files efl +%manifest app-core.manifest %defattr(-,root,root,-) %{_libdir}/libappcore-efl.so.* @@ -114,6 +115,7 @@ install -m0644 %{SOURCE101} %{buildroot}%{_libdir}/systemd/user/ %{_libdir}/pkgconfig/appcore-efl.pc %files common +%manifest app-core.manifest %defattr(-,root,root,-) %{_libdir}/libappcore-common.so.* %{_libdir}/systemd/user/core-efl.target diff --git a/src/appcore-efl.c b/src/appcore-efl.c index 25d4f1c..ce6b387 100755 --- a/src/appcore-efl.c +++ b/src/appcore-efl.c @@ -74,7 +74,7 @@ static const char *_as_name[] = { [AS_DYING] = "DYING", }; -static bool b_active = 1; +static bool b_active = 0; struct win_node { unsigned int win; bool bfobscured; @@ -458,6 +458,13 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) g_type_init(); elm_init(*argc, *argv); + if(getenv("opengl_x11")) { + elm_config_preferred_engine_set("opengl_x11"); + _DBG("elm_config_preferred_engine_set"); + } else { + _DBG("opengl_x11 is not set"); + } + r = appcore_init(ui->name, &efl_ops, *argc, *argv); _retv_if(r == -1, -1); |