Revert "rename pager theme stuff to pager_plain to match current elm"

This reverts commit 4bca1ed0ef. no - this breaks theme api. AGAIN ... like e18. see email to e-devel.
18.9 release
2014-09-11 16:29:00 +09:00 · 2014-09-10 09:27:18 -04:00 · 2014-09-10 09:26:56 -04:00 · 2014-08-29 14:47:34 +02:00 · 2014-07-16 10:49:46 -04:00 · 2014-07-16 10:49:44 -04:00
153 changed files with 13857 additions and 23052 deletions
--- a/6
+++ b/6
@ -1,3 +1,7 @@
+2013-12-21
+
+        * 0.18.0 release
+
 2013-12-10 Mike Blumenkrantz

        * fixed filemanager race condition causing create-queued icons to not be deleted
@ -513,8 +517,6 @@
 2013-01-03  Mike Blumenkrantz

        * Added e_win_elm_available()
-        * Added conf2 module
-        * Added e_configure_option API

 2013-01-03 Cedric Bail

--- a/115
+++ b/115
@ -1,9 +1,121 @@
+Changes since 0.18.8:
+---------------------
+
+* xdg menu implementation improvements
+* buffer overflow fixed in desk flip animation
+* editing a .desktop file no longer sets mime type for .desktop files
+
+Changes since 0.18.7:
+---------------------
+
+* screenshot now displays a helpful error message when it fails
+* efm no longer sometimes shows files from other directories
+* efm no longer sometimes shows blank filenames
+* fix syscon button signals
+* fix winlist scrolling
+* fix systray appindicator deletion
+* fix systray appindicator icon loading
+
+Changes since 0.18.6:
+---------------------
+
+* unify temp module temperature_get_bus_files() functions
+* check notification icon size correctly
+* correctly check evry trigger matches
+* comp config dialog correctly detects effects disabled/fast states
+* efm current .desktop fetching now returns the right .desktop
+* swallow efm background objects after applying theme
+* ibar now scrolls correctly during drags
+* no longer place windows at 0,0 during restart
+* music_control: Use correct markup for metadata text.
+
+
+Changes since 0.18.5:
+---------------------
+
+* wl_desktop_shell builds out of source tree
+* get entry width based on viewport size, not entry size
+* fix hiding of windows when delete is requested
+* don't deref teamwork pointer after null check
+* don't deref possibly-null value in mouse bindings
+* correctly calculate minimum flowlayout rows
+* efm_op no longer tries to close invalid fds during delete ops
+* don't use external log domain in systray
+* don't use external log domain in music player
+* don't crash when saving screenshots with no file extension
+* don't crash on possibly-null gadman bg string extensions
+* check for unicode string end in client menu
+* don't crash when passing NULL desk to e_border_under_pointer_get
+* set connman pending.disconnect when disconnecting a service
+* don't iterate with or access freed pointer in comp match dialog
+* ensure use of non-garbage values for menu item icon placeholders
+* use more descriptive + accurate buffer size in batget iterator
+* prevent out of bounds access in systray theme setup
+* prevent out of bounds write in e_intl_locale_parts_get()
+* ensure null termination of string in xsettings config
+* dim/undim actions don't require acpi triggers
+
+
+Changes since 0.18.4:
+---------------------
+
+* Fix selection of the standard profile in wizard.
+* pointer warp speed config slider correctly detects changed state
+* set border starting geometry from initial zone
+* don't use raise stack for iterating borders
+* Fix wl_desktop_shell compiler warning for Mike
+* evry string matching now handles UTF8
+* remove efm nav SELF_RENAME handler
+
+Changes since 0.18.3:
+---------------------
+
+* fixed menu placement in some cases
+* fixed dnd indicator visibility after operation ends
+* fixed screen limits window handling to not unexpectedly warp windows
+* fixed distcheck for non-default modules
+* fixed rare crash when closing applications
+* fixed crash when settings windows containing an entry widget were closed
+* fixed ibar app tracking with applications possessing a skip_taskbar window
+* EFM now respects device presentation hints
+* improved positioning of windows when using multiple monitors
+* compositor theme match dialog now functions as expected
+
+Changes since 0.18.2:
+---------------------
+
+* fixed canvas leak when using livethumb widget
+* fixed mounting errors when mounting native filesystems
+* fixed crashes in some cases involving menu scrolling
+* fixed rare compositor-related crash
+* fixed crash when using teamwork with specific types of links
+* fixed dnd handler leaks
+* fixed dnd to external application windows
+* fixed logout fade to reset after a delay involving applications failing to close
+* fixed slider up/down key wrong direction
+* use config_type to set parent profile when resetting bindings
+* allow use with Elementary >= 1.9
+* updates for Serbian and Italian translations
+
+Changes since 0.18.1:
+---------------------
+
+* fixed infinite printing of SLEEP
+* fixed suffix checking for screenshot filenames
+* fixed theme importing
+* improved reliability of startup splash version setting
+* updates for Serbian and Portuguese translations
+
+Changes since 0.18.0:
+---------------------
+
+* fixed issue where mixer would eat desklock events, making it impossible to unlock the screen
+
 Changes since 0.17.0:
 ---------------------

 Additions:
    Modules:
-        * conf2
        * music-control: control any mpris2-compatible music player
        * appmenu: externally show a menu of the current focused application
        * bluez4: control bluetoothd daemon
@ -15,7 +127,6 @@ Additions:
        * Added function to hide all active menus
        * Added enum for deskflip animation mode
        * Added e_win_elm_available()
-        * Added e_configure_option API
        * Added D-Bus notification to systray module
        * Added D-Bus menu support
        * Added e_comp namespace and E_EVENT_COMP events
--- a/configure.ac
+++ b/configure.ac
@ -2,13 +2,13 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [0])
 m4_define([v_min], [18])
-m4_define([v_mic], [0])
+m4_define([v_mic], [9])
 dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
 ##--   When released, remove the dnl on the below line
 dnl m4_undefine([v_rev])
-m4_define([relname], [0.17.99])
+m4_define([relname], [0.18.9])
 ##--   When doing snapshots - change soname. remove dnl on below line
-m4_define([relname], [ver-pre-01])
+m4_define([relname], [ver-00])
 dnl m4_define([v_rel], [-release relname])
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])])
@ -18,7 +18,7 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##

-AC_INIT([enlightenment], [v_ver-rc2], [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.52])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
@ -57,6 +57,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
 AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
 AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
 AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
+AC_DEFINE_UNQUOTED(E18_RELEASE_BUILD, [1], [Release mode enabled])
 version_info="lt_cur:lt_rev:lt_age"
 release_info="v_rel"
 AC_SUBST(version_info)
@ -93,9 +94,12 @@ extern char **environ;
 AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
    ])

-efl_version="1.8.0"
+efl_version="1.11.2"
 AC_SUBST(efl_version)

+elm_version="1.11.2"
+AC_SUBST(elm_version)
+
 AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])

 dnl AC_CHECK_HEADERS(X11/extensions/shape.h,, AC_MSG_ERROR([Cannot find X11/extensions/shape.h. Make sure your CFLAGS environment variable contains include lines for the location of this file]))
@ -552,7 +556,7 @@ PKG_CHECK_MODULES(E, [
  eina >= ${efl_version}
  eldbus >= ${efl_version}
  eio >= ${efl_version}
-  elementary >= ${efl_version}
+  elementary >= ${elm_version}
  emotion >= ${efl_version}
  $eeze_mount
  $udisks_mount
@ -574,7 +578,7 @@ efreet-trash >= ${efl_version} \
 eina >= ${efl_version} \
 eldbus >= ${efl_version} \
 eio >= ${efl_version} \
-elementary >= ${efl_version} \
+elementary >= ${elm_version} \
 emotion >= ${efl_version} \
 $udisks_mount \
 $eeze_mount \
--- a/data/etc/Makefile.am
+++ b/data/etc/Makefile.am
@ -10,7 +10,7 @@ menusdir = $(sysconfdir)/xdg/menus
 menus_DATA =

 if INSTALL_ENLIGHTENMENT_MENU
-menus_DATA += enlightenment.menu
+menus_DATA += e-applications.menu
 endif

 EXTRA_DIST = $(files_DATA) $(menus_DATA)
--- a/data/etc/e-applications.menu
+++ b/data/etc/e-applications.menu
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -78,6 +78,7 @@ src/bin/e_place.c
 src/bin/e_pointer.c
 src/bin/e_popup.c
 src/bin/e_prefix.c
+src/bin/e_randr.c
 src/bin/e_remember.c
 src/bin/e_resist.c
 src/bin/e_screensaver.c
@ -157,6 +158,7 @@ src/modules/conf_bindings/e_int_config_mousebindings.c
 src/modules/conf_bindings/e_int_config_signalbindings.c
 src/modules/conf_bindings/e_mod_main.c
 src/modules/conf_comp/e_mod_config.c
+src/modules/conf_comp/e_mod_config_match.c
 src/modules/conf_comp/e_mod_main.c
 src/modules/conf_dialogs/e_int_config_dialogs.c
 src/modules/conf_dialogs/e_int_config_profiles.c
@ -209,6 +211,8 @@ src/modules/conf_window_manipulation/e_int_config_window_process.c
 src/modules/conf_window_manipulation/e_mod_main.c
 src/modules/conf_window_remembers/e_int_config_remembers.c
 src/modules/conf_window_remembers/e_mod_main.c
+src/modules/connman/agent.c
+src/modules/connman/e_mod_config.c
 src/modules/connman/e_mod_main.c
 src/modules/cpufreq/e_mod_main.c
 src/modules/cpufreq/e_mod_config.c
@ -267,6 +271,7 @@ src/modules/start/e_mod_main.c
 src/modules/syscon/e_int_config_syscon.c
 src/modules/syscon/e_mod_main.c
 src/modules/syscon/e_syscon.c
+src/modules/syscon/e_syscon_gadget.c
 src/modules/systray/e_mod_main.c
 src/modules/systray/e_mod_xembed.c
 src/modules/tasks/e_mod_config.c
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/da.po
+++ b/po/da.po
@ -10,7 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2009-12-31 01:44+0000\n"
 "Last-Translator: nanker <Unknown>\n"
 "Language-Team: Danish\n"
-"Language: \n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
@ -34,7 +34,7 @@ msgstr ""
 "Last-Translator: Antoine Giniès <aginies.cooker@gmail.com>\n"
 "Language-Team: Enlightenment i18n French <enlightenment-intl@lists."
 "sourceforge.net>\n"
-"Language: \n"
+"Language: fr_CH\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2011-01-06 16:45+0900\n"
 "Last-Translator: Yasufumi Haga <yasufumi.haga@nifty.com>\n"
 "Language-Team: E17-jp <LL@li.org>\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/km.po
+++ b/po/km.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-09-03 09:15+0000\n"
 "Last-Translator: Chanrithy Thim <Unknown>\n"
 "Language-Team: Khmer <km@li.org>\n"
-"Language: \n"
+"Language: km\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/nb.po
+++ b/po/nb.po
@ -10,7 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2010-05-09 22:20+0100\n"
 "Last-Translator: Audun Gangsto <feitingen@gmail.com>\n"
 "Language-Team: E17-nb <LL@li.org>\n"
-"Language: \n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/nl.po
+++ b/po/nl.po
@ -12,7 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2011-12-06 00:23+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team: Dutch <kde-i18n-doc@kde.org>\n"
-"Language: \n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/pl.po
+++ b/po/pl.po
@ -14,8 +14,8 @@ msgstr ""
 "POT-Creation-Date: 2013-11-29 19:31+0900\n"
 "PO-Revision-Date: 2010-11-28 18:55+0100\n"
 "Last-Translator: Mariusz Kozakowski <11mariom@gmail.com>\n"
-"Language-Team: \n"
-"Language: \n"
+"Language-Team: General\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/pt.po
+++ b/po/pt.po
@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-11-29 19:31+0900\n"
-"PO-Revision-Date: 2013-11-20 14:46-0000\n"
+"PO-Revision-Date: 2013-12-26 16:05-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese\n"
 "Language: pt\n"
@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Launchpad-Export-Date: 2013-05-02 10:08+0000\n"
-"X-Generator: Poedit 1.6beta2\n"
+"X-Generator: Poedit 1.6.3\n"

 #: src/bin/e_about.c:17
 msgid "About Enlightenment"
@ -819,6 +819,9 @@ msgid ""
 "compiled or installed for<br>Evas or Ecore-Evas. Falling back to software "
 "engine."
 msgstr ""
+"O controlador gráfico não tem suporte a OpenGL ou<br>não existem mecanismos "
+"OpenGL compilados/instalados para<br>Evas ou Ecore-Evas. Será utilizado o "
+"mecanismo pré-definido."

 #: src/bin/e_comp.c:4280 src/bin/e_comp.c:4302
 msgid "Compositor Error"
@ -826,13 +829,15 @@ msgstr "Erro de composição"

 #: src/bin/e_comp.c:4280
 msgid "Another compositor is already running<br>on your display server."
-msgstr ""
+msgstr "Já existe um mecanismo de composição<br>em execução."

 #: src/bin/e_comp.c:4302
 msgid ""
 "Your display server does not support the<br>compositor overlay window. This "
 "is needed<br>for it to function."
 msgstr ""
+"O servidor de ecrã não possui suporte à<br>janela de cobertura. Esta função "
+"requer<br>este suporte."

 #: src/bin/e_comp.c:4689
 msgid ""
@ -840,12 +845,18 @@ msgid ""
 "without XComposite support. Note that for composite support you will also "
 "need XRender and XFixes support in X11 and Ecore."
 msgstr ""
+"O seu servidor de ecrã não tem suporte a XComposite ou o Ecore-X foi "
+"compilado sem suporte a XComposite. Tenha em atenção que, para ativar a "
+"composição, também precisa de suporte a XRender e XFixes nos pacote X11 e "
+"Ecore."

 #: src/bin/e_comp.c:4698
 msgid ""
 "Your display server does not support XDamage or Ecore was built without "
 "XDamage support."
 msgstr ""
+"O seu servidor de ecrã não tem suporte a XDamage ou o Ecore foi compilado "
+"sem suporte a XDamage."

 #: src/bin/e_comp.c:4781 src/bin/e_comp.c:4787
 msgid "Compositor"
@ -897,9 +908,9 @@ msgid ""
 "<br>As a result, all bindings have been reloaded from defaults.<br>Sorry for "
 "the inconvenience.<br>"
 msgstr ""
-"A versão das suas definições de associação não coincidem com as atuais "
-"versões<br>Todas as associações foram repostas para as originais."
-"<br>Desculpe qualquer inconveniente.<br>"
+"A versão das definições de associação não coincidem com as atuais versões."
+"<br>Todas as associações foram repostas para as originais.<br>Desculpe "
+"qualquer inconveniente.<br>"

 #: src/bin/e_config.c:1694 src/bin/e_config.c:2355
 msgid "Enlightenment Settings Write Problems"
@ -1600,7 +1611,7 @@ msgstr "Lista"

 #: src/bin/e_fm.c:9573 src/modules/everything/evry_config.c:458
 msgid "Default View"
-msgstr "Visualização padrão"
+msgstr "Vista pré-definida"

 #: src/bin/e_fm.c:9594
 #, c-format
@ -1684,11 +1695,11 @@ msgstr "Remover imagem de fundo"

 #: src/bin/e_fm.c:10011 src/bin/e_fm.c:10240
 msgid "Set overlay..."
-msgstr "Definir sobreposição"
+msgstr "Definir cobertura..."

 #: src/bin/e_fm.c:10017
 msgid "Clear overlay"
-msgstr "Remover sobreposição"
+msgstr "Remover cobertura"

 #: src/bin/e_fm.c:10334 src/bin/e_fm.c:10676
 #, c-format
@ -1886,7 +1897,7 @@ msgstr "Pré-visualização"
 #: src/bin/e_fm_prop.c:527 src/modules/bluez4/e_mod_main.c:198
 #: src/modules/everything/evry_config.c:426
 msgid "Default"
-msgstr "Padrão"
+msgstr "Pré-definido"

 #: src/bin/e_fm_prop.c:530
 msgid "Thumbnail"
@ -2308,7 +2319,7 @@ msgstr "Escolha o tipo de contorno"

 #: src/bin/e_int_border_menu.c:1224
 msgid "Use Enlightenment Default Icon Preference"
-msgstr "Utilizar ícones do Enlightenment"
+msgstr "Utilizar ícones pré-definidos do Enlightenment"

 #: src/bin/e_int_border_menu.c:1232
 msgid "Use Application Provided Icon"
@ -2972,7 +2983,7 @@ msgstr "%.2f segundos"

 #: src/bin/e_int_shelf_config.c:273
 msgid "Don't adjust windows when overlapping the shelf"
-msgstr "Não ajustar janelas ao sobrepor o painel"
+msgstr "Não ajustar as janelas ao cobrir o painel"

 #: src/bin/e_int_shelf_config.c:278
 msgid "Auto Hide"
@ -3652,7 +3663,7 @@ msgid "Module does not contain all needed functions"
 msgstr "O módulo não contém as funções necessárias"

 #: src/bin/e_module.c:355
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Module API Error<br>Error initializing Module: %s<br>It requires a module "
 "API version of: %i.<br>The module API advertized by Enlightenment is: %i.<br>"
@ -4028,6 +4039,9 @@ msgid ""
 "latest version is:<br><br>%s<br><br>Please visit www.enlightenment.org<br>or "
 "update your system packages<br>to get a new version."
 msgstr ""
+"A sua versão do Enlightenment<br>não é a versão mais recente.<br>A versão "
+"mais recente é a:<br><br>%s<br><br>Por favor aceda a www.enlightenment."
+"org<br>ou atualize os pacotes do sistema<br>para obter a nova versão."

 #: src/bin/e_utils.c:185 src/modules/conf_intl/e_int_config_imc.c:262
 #: src/modules/conf_intl/e_int_config_imc.c:511
@ -4533,36 +4547,39 @@ msgstr "Recusar"

 #: src/modules/bluez4/agent.c:133
 msgid "Pin Code Requested"
-msgstr ""
+msgstr "Pedido de código PIN"

 #: src/modules/bluez4/agent.c:134
 msgid ""
 "Enter the PinCode above. It should have 1-16 characters and can be "
 "alphanumeric."
 msgstr ""
+"Introduza o código PIN em cima. Deve ser alfanumérico e possuir entre 1 e 16 "
+"caracteres."

 #: src/modules/bluez4/agent.c:145
 msgid "Passkey Requested"
-msgstr ""
+msgstr "Pedido de chave-mestra"

 #: src/modules/bluez4/agent.c:146
 msgid "Enter the Passkey above. It should be a numeric value between 0-999999."
 msgstr ""
+"Introduza a chave-mestra em cima. Deve ser um valor numérico e estar entre 0 "
+"e 999999."

 #: src/modules/bluez4/agent.c:163
 #, c-format
 msgid "%d keys were typed on %s. Passkey is %06d"
-msgstr ""
+msgstr "%d chaves introduzidas em %s. A chave-mestra é %06d"

 #: src/modules/bluez4/agent.c:165
-#, fuzzy
 msgid "Display Passkey"
-msgstr "Mostrar classe"
+msgstr "Mostrar chave-mestra"

 #: src/modules/bluez4/agent.c:178
 #, c-format
 msgid "Pincode for %s is %s"
-msgstr "O PIN para %s é %s"
+msgstr "O PIN de %s é %s"

 #: src/modules/bluez4/agent.c:179
 msgid "Display Pincode"
@ -4571,7 +4588,7 @@ msgstr "Mostrar código PIN"
 #: src/modules/bluez4/agent.c:193
 #, c-format
 msgid "%06d is the passkey presented in %s?"
-msgstr ""
+msgstr "%06d é a chave-mestra existente em %s?"

 #: src/modules/bluez4/agent.c:196
 msgid "Confirm Request"
@ -4603,7 +4620,7 @@ msgstr "Erro Bluez"

 #: src/modules/bluez4/e_mod_main.c:119
 msgid "Searching for Devices..."
-msgstr ""
+msgstr "Procura de dispositivos..."

 #: src/modules/bluez4/e_mod_main.c:190 src/modules/bluez4/e_mod_main.c:461
 msgid "Adapter Settings"
@ -4618,9 +4635,8 @@ msgid "Visible"
 msgstr "Visível"

 #: src/modules/bluez4/e_mod_main.c:217
-#, fuzzy
 msgid "Pairable"
-msgstr "Disponível"
+msgstr "Emparelhável"

 #: src/modules/bluez4/e_mod_main.c:264
 msgid "Adapters Available"
@ -4665,7 +4681,7 @@ msgstr "Ocorreu um erro"
 #: src/modules/bluez4/ebluez4.c:218 src/modules/bluez4/ebluez4.c:460
 #, c-format
 msgid "Property of %s changed, but could not be read"
-msgstr ""
+msgstr "A propriedade de %s foi alterada mas pôde ser lida"

 #: src/modules/bluez4/ebluez4.c:435
 msgid "Error reading list of devices"
@ -4677,15 +4693,15 @@ msgstr "Erro ao ler a lista de adaptadores"

 #: src/modules/bluez4/ebluez4.c:616
 msgid "Error reading path of Default Adapter"
-msgstr ""
+msgstr "Erro ao ler o caminho do adaptador pré-definido"

 #: src/modules/bluez4/ebluez4.c:676
 msgid "Error reading path of Removed Adapter"
-msgstr ""
+msgstr "Erro ao ler o caminho do adaptador removido"

 #: src/modules/bluez4/ebluez4.c:692
 msgid "Error reading path of Added Adapter"
-msgstr ""
+msgstr "Erro ao ler o caminho do adaptador adicionado"

 #: src/modules/clock/e_mod_config.c:36
 msgid "Clock Settings"
@ -4772,11 +4788,9 @@ msgid "Show configurations in menu"
 msgstr "Mostrar configurações no menu"

 #: src/modules/conf/e_mod_main.c:270
-#, fuzzy
 msgid "conf module cannot be loaded when conf2 module is already loaded!"
 msgstr ""
-"O módulo de composição não pode ser carregado. O Enlightenment já possui "
-"composição."
+"O módulo conf não pode ser carregado se o módulo conf2 estiver carregado!"

 #: src/modules/conf/e_mod_main.c:278 src/modules/conf/e_mod_main.c:282
 #: src/modules/conf/e_mod_main.c:458
@ -4835,7 +4849,7 @@ msgstr "Lançadores de aplicações"
 #: src/modules/conf_applications/e_int_config_defapps.c:304
 #: src/modules/conf_applications/e_mod_main.c:53
 msgid "Default Applications"
-msgstr "Aplicações padrão"
+msgstr "Aplicações pré-definidas"

 #: src/modules/conf_applications/e_int_config_defapps.c:297
 msgid "Custom Browser Command"
@ -5139,7 +5153,7 @@ msgstr "Eliminar tudo"
 #: src/modules/conf_bindings/e_int_config_mousebindings.c:306
 #: src/modules/conf_bindings/e_int_config_signalbindings.c:784
 msgid "Restore Default Bindings"
-msgstr "Restaurar associações padrão"
+msgstr "Restaurar associações originais"

 #: src/modules/conf_bindings/e_int_config_edgebindings.c:293
 msgid "Mouse Button"
@ -5443,7 +5457,7 @@ msgstr "Editar ocorrências de janelas"
 #: src/modules/conf_comp/e_mod_config.c:193
 #: src/modules/conf_comp/e_mod_config.c:572
 msgid "Select default style"
-msgstr "Escolha o estilo padrão"
+msgstr "Escolha o estilo pré-definido"

 #: src/modules/conf_comp/e_mod_config.c:199
 msgid "Styles"
@ -5524,9 +5538,8 @@ msgstr "Não compor janelas em ecrã completo"

 #: src/modules/conf_comp/e_mod_config.c:255
 #: src/modules/conf_comp/e_mod_config.c:554
-#, fuzzy
 msgid "Don't fade backlight"
-msgstr "Não ocultar gadgets"
+msgstr "Não desvanecer iluminação"

 #: src/modules/conf_comp/e_mod_config.c:259
 #: src/modules/conf_comp/e_mod_config.c:598
@ -6244,8 +6257,8 @@ msgid ""
 msgstr ""
 "Definiu algumas variáveis de ambiente<br>que podem interferir com o idioma "
 "escolhido.<br>Se não as quiser afetar, utilize as<br>definições das "
-"variáveis de ambiente para <br>não as utilizar. <br>As variáveis de ambiente "
-"que podem afetar o seu idioma são:<br>%s."
+"variáveis de ambiente para <br>as desativar.  As variáveis de ambiente que "
+"podem<br>afetar o seu idioma são:<br>%s."

 #: src/modules/conf_intl/e_int_config_intl.c:966
 msgid "Possible Locale problems"
@ -6284,11 +6297,11 @@ msgstr "Definições do menu"

 #: src/modules/conf_menus/e_int_config_menus.c:175
 msgid "Enlightenment Default"
-msgstr "Padrões do Enlightenment"
+msgstr "Pré-definições do Enlightenment"

 #: src/modules/conf_menus/e_int_config_menus.c:183
 msgid "Personal Default"
-msgstr "Padrões do utilizador"
+msgstr "Pré-definições do utilizador"

 #: src/modules/conf_menus/e_int_config_menus.c:258
 msgid "Main Menu"
@ -6437,7 +6450,7 @@ msgstr "Caminhos Enlightenment"

 #: src/modules/conf_paths/e_int_config_paths.c:195
 msgid "Default Directories"
-msgstr "Diretórios padrão"
+msgstr "Diretórios pré-definidos"

 #: src/modules/conf_paths/e_int_config_paths.c:202
 msgid "User Defined Directories"
@ -7066,7 +7079,7 @@ msgstr "Ativar classes personalizadas de letras"
 #: src/modules/conf_theme/e_int_config_fonts.c:449
 #: src/modules/conf_theme/e_int_config_fonts.c:669
 msgid "English 012 #!? 日本語 にほんご ソフト 中文 華語 한국"
-msgstr "Português 012 #!? 日本語 にほんご ソフト 中文 華語 한국"
+msgstr "Português 012 #!? ABCDEFGHIJKLMNOPQRSTUVWXYZ"

 #: src/modules/conf_theme/e_int_config_fonts.c:628
 msgid "Font Classes"
@ -7566,7 +7579,7 @@ msgstr "Ao mover"
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:139
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:150
 msgid "Display information"
-msgstr "Exibir informações"
+msgstr "Mostrar informações"

 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:142
 #: src/modules/conf_window_manipulation/e_int_config_window_display.c:153
@ -7978,13 +7991,12 @@ msgid "Powersaving behavior"
 msgstr "Comportamento da poupança de energia"

 #: src/modules/cpufreq/e_mod_main.c:409
-#, fuzzy
 msgid "Power State Min"
-msgstr "Botão de energia"
+msgstr "Estado mín. de energia"

 #: src/modules/cpufreq/e_mod_main.c:415
 msgid "Power State Max"
-msgstr ""
+msgstr "Estado máx. de energia"

 #: src/modules/cpufreq/e_mod_main.c:508
 msgid ""
@ -8013,12 +8025,11 @@ msgstr ""
 "do<br>utilitário setfreq."

 #: src/modules/cpufreq/e_mod_main.c:592
-#, fuzzy
 msgid ""
 "There was an error trying to set the<br>cpu power state setting via the "
 "module's<br>setfreq utility."
 msgstr ""
-"Ocorreu um erro ao tentar definir a<br>frequência do cpu através "
+"Ocorreu um erro ao tentar definir a<br>estado de energia do cpu através "
 "do<br>utilitário setfreq."

 #: src/modules/cpufreq/e_mod_main.c:1335
@ -8061,14 +8072,12 @@ msgid "Update poll interval"
 msgstr "Intervalo entre atualizações"

 #: src/modules/cpufreq/e_mod_config.c:107
-#, fuzzy
 msgid "Minimum Power State"
-msgstr "Botão de energia"
+msgstr "Estado mínimo de energia"

 #: src/modules/cpufreq/e_mod_config.c:113
-#, fuzzy
 msgid "Maximum Power State"
-msgstr "Botão de energia"
+msgstr "Estado máximo de energia"

 #: src/modules/everything/e_mod_main.c:49
 #: src/modules/everything/evry_plugin.c:179
@ -8807,9 +8816,8 @@ msgid "Background"
 msgstr "Imagem de fundo"

 #: src/modules/gadman/e_mod_config.c:22
-#, fuzzy
 msgid "Overlay (Action Toggle)"
-msgstr "Invisível (trocar com teclas)"
+msgstr "Cobertura (Troca de ação)"

 #: src/modules/gadman/e_mod_config.c:79 src/modules/gadman/e_mod_config.c:156
 #: src/modules/gadman/e_mod_main.c:163
@ -8850,9 +8858,8 @@ msgid "Background Options"
 msgstr "Opções de fundo"

 #: src/modules/gadman/e_mod_gadman.c:127
-#, fuzzy
 msgid "Desktop Overlay"
-msgstr "Ficheiro .desktop"
+msgstr "Cobertura da área de trabalho"

 #: src/modules/gadman/e_mod_gadman.c:1066
 msgid "Begin move/resize"
@ -8904,11 +8911,11 @@ msgstr "Bloquear movimentação de ícones"

 #: src/modules/ibar/e_mod_config.c:149
 msgid "Don't add items on launch"
-msgstr ""
+msgstr "Não adicionar itens ao arrancar"

 #: src/modules/ibar/e_mod_config.c:151
 msgid "Track launch"
-msgstr "Acompanhar aplicações"
+msgstr "Acompanhar arranque"

 #: src/modules/ibar/e_mod_config.c:184
 msgid "Create new IBar source"
@ -9145,7 +9152,7 @@ msgstr "Urgência"

 #: src/modules/notification/e_mod_config.c:100
 msgid "Levels of urgency to display:"
-msgstr "Níveis de urgência a exibir:"
+msgstr "Níveis de urgência a mostrar:"

 #: src/modules/notification/e_mod_config.c:106
 msgid "Critical"
@ -9153,7 +9160,7 @@ msgstr "Crítica"

 #: src/modules/notification/e_mod_config.c:110
 msgid "Default Timeout"
-msgstr "Duração"
+msgstr "Duração pré-definida"

 #: src/modules/notification/e_mod_config.c:111
 msgid "Force timeout for all notifications"
@ -9918,7 +9925,7 @@ msgstr "Ação predefinida após o tempo limite"

 #: src/modules/syscon/e_int_config_syscon.c:172
 msgid "Default Action"
-msgstr "Ações"
+msgstr "Ação pré-definida"

 #: src/modules/syscon/e_mod_main.c:31
 msgid "System Controls"
@ -9979,11 +9986,11 @@ msgstr "Tarefas"

 #: src/modules/teamwork/e_mod_config.c:80
 msgid "Disable remote media fetching"
-msgstr "Desativar obtenção de multimédia remota"
+msgstr "Desativar obtenção de dados remotos"

 #: src/modules/teamwork/e_mod_config.c:83
 msgid "Maximum media size to fetch"
-msgstr ""
+msgstr "Tamanho máximo de dados a obter"

 #: src/modules/teamwork/e_mod_config.c:85
 #, c-format
@ -9992,7 +9999,7 @@ msgstr "%2.0f MiB"

 #: src/modules/teamwork/e_mod_config.c:88
 msgid "Maximum media cache size in RAM"
-msgstr ""
+msgstr "Tamanho máximo de dados em RAM"

 #: src/modules/teamwork/e_mod_config.c:90
 #, c-format
@ -10001,7 +10008,7 @@ msgstr "%4.0f MiB"

 #: src/modules/teamwork/e_mod_config.c:92
 msgid "Maximum media cache age on disk"
-msgstr ""
+msgstr "Antiguidade máxima de dados em cache"

 #: src/modules/teamwork/e_mod_config.c:94
 #, c-format
@ -10013,37 +10020,33 @@ msgid "Cache"
 msgstr "Cache"

 #: src/modules/teamwork/e_mod_config.c:103
-#, fuzzy
 msgid "Disable video previews"
-msgstr "Pré-visualização"
+msgstr "Desativar pré-visualização de vídeos"

 #: src/modules/teamwork/e_mod_config.c:106
-#, fuzzy
 msgid "Mouse-out hide delay"
-msgstr "Rodas do rato"
+msgstr "Atraso para ocultar o rato ao sair"

 #: src/modules/teamwork/e_mod_config.c:110
 msgid "Maximum size (Percentage of screens size)"
-msgstr ""
+msgstr "Tamanho máximo (em percentagem do tamanho dos ecrãs)"

 #: src/modules/teamwork/e_mod_config.c:119
 msgid "Popups"
 msgstr "Alertas"

 #: src/modules/teamwork/e_mod_config.c:169
-#, fuzzy
 msgid "Teamwork Settings"
-msgstr "Definições da área de trabalho"
+msgstr "Definições Teamwork"

 #: src/modules/teamwork/e_mod_main.c:14 src/modules/teamwork/e_mod_main.c:120
 #: src/modules/teamwork/e_mod_main.c:130
 msgid "Teamwork"
-msgstr ""
+msgstr "Teamwork"

 #: src/modules/teamwork/e_mod_main.c:15
-#, fuzzy
 msgid "Toggle Popup Visibility"
-msgstr "Alternar visibilidade"
+msgstr "Alternar visibilidade do alerta"

 #: src/modules/temperature/e_mod_config.c:56
 msgid "Temperature Settings"
@ -10244,7 +10247,7 @@ msgstr "Ir para a área de trabalho"

 #: src/modules/winlist/e_int_config_winlist.c:225
 msgid "Move to current desk after switch"
-msgstr ""
+msgstr "Mover para a área de trabalho atual ao trocar"

 #: src/modules/winlist/e_int_config_winlist.c:229
 msgid "Selecting"
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
@ -9,7 +9,7 @@ msgstr ""
 "PO-Revision-Date: 2009-08-07 11:08+0000\n"
 "Last-Translator: milboy <Unknown>\n"
 "Language-Team: Slovakian\n"
-"Language: \n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sv.po
+++ b/po/sv.po
@ -11,7 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2009-03-08 02:01+0000\n"
 "Last-Translator: ersi <Unknown>\n"
 "Language-Team: Swedish\n"
-"Language: \n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2013-11-29 19:31+0900\n"
 "PO-Revision-Date: 2013-01-01 12:48+0800\n"
 "Last-Translator: Ray Chen <swyear@gmail.com>\n"
-"Language-Team: none\n"
-"Language: \n"
+"Language-Team: General\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@ -2829,13 +2829,13 @@ ACT_FN_END_MOUSE(delayed_action, )
   _delayed_action_mouse_del(obj, params, ev);
 }

-ACT_FN_GO_ACPI(dim_screen, __UNUSED__)
+ACT_FN_GO(dim_screen, __UNUSED__)
 {
   E_Zone *zone = _e_actions_zone_get(obj);
   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_DIM);
 }

-ACT_FN_GO_ACPI(undim_screen, __UNUSED__)
+ACT_FN_GO(undim_screen, __UNUSED__)
 {
   E_Zone *zone = _e_actions_zone_get(obj);
   e_backlight_mode_set(zone, E_BACKLIGHT_MODE_NORMAL);
@ -3253,10 +3253,10 @@ e_actions_init(void)
                            "screen_send_by", NULL,
                            "syntax: N-offset, example: -2", 1);

-   ACT_GO_ACPI(dim_screen);
+   ACT_GO(dim_screen);
   e_action_predef_name_set(N_("Screen"), N_("Dim"), "dim_screen",
                            NULL, NULL, 0);
-   ACT_GO_ACPI(undim_screen);
+   ACT_GO(undim_screen);
   e_action_predef_name_set(N_("Screen"), N_("Undim"), "undim_screen",
                            NULL, NULL, 0);
   ACT_GO(backlight_set);
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@ -209,7 +209,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
   if (val < 0.0) val = 0.0;
   else if (val > 1.0)
     val = 1.0;
-   if ((val == bl_val) && (!bl_anim)) return;
+   if ((fabs(val - bl_val) < DBL_EPSILON) && (!bl_anim)) return;
   if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
   ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL);
   bl_now = bl_val;
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@ -464,6 +464,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
   /* FIXME: if first_map is 1 then we should ignore the first hide event
    * or ensure the window is already hidden and events flushed before we
    * create a border for it */
+   bd->zone = e_zone_current_get(con);
   if (first_map)
     {
        // printf("##- FIRST MAP\n");
@ -474,9 +475,11 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map, int internal)
        // needed to be 1 for internal windw and on restart.
        // bd->ignore_first_unmap = 2;
     }
+   else
+     bd->x = bd->zone->x, bd->y = bd->zone->y;
+

   bd->client.win = win;
-   bd->zone = e_zone_current_get(con);

   _e_border_hook_call(E_BORDER_HOOK_NEW_BORDER, bd);

@ -1023,8 +1026,11 @@ e_border_hide(E_Border *bd,
     _e_border_action_finish();

   e_container_shape_hide(bd->shape);
-   if ((!bd->iconic) && (!bd->delete_requested))
-     e_hints_window_hidden_set(bd);
+   if (!bd->iconic)
+     {
+        e_hints_window_hidden_set(bd);
+        bd->delete_requested = 0;
+     }

   bd->visible = 0;
   bd->changes.visible = 1;
@ -3341,14 +3347,16 @@ e_border_idler_before(void)
                       bd->changes.visible = 0;
                    }

-                  if (bd->zone && (!bd->new_client) &&
-                      (!E_INSIDE(bd->x, bd->y, 0, 0, bd->zone->w - 5, bd->zone->h - 5)) &&
-                      (!E_INSIDE(bd->x, bd->y, 0 - bd->w + 5, 0 - bd->h + 5, bd->zone->w - 5, bd->zone->h - 5))
+                  if ((!bd->new_client) &&
+                      (!E_INSIDE(bd->x, bd->y, 0, 0, bd->zone->container->manager->w - 5, bd->zone->container->manager->h - 5)) &&
+                      (!E_INSIDE(bd->x, bd->y, 0 - bd->w + 5, 0 - bd->h + 5, bd->zone->container->manager->w - 5, bd->zone->container->manager->h - 5))
                      )
                    {
                       if (e_config->screen_limits != E_SCREEN_LIMITS_COMPLETELY)
                         _e_border_move_lost_window_to_center(bd);
                    }
+                  else
+                    e_border_zone_set(bd, e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y));
               }
             e_container_border_list_free(bl);

@ -4911,8 +4919,12 @@ _e_border_del(E_Border *bd)
        if (bd->exe_inst->phony && (eina_list_count(bd->exe_inst->borders) == 1))
          e_exec_phony_del(bd->exe_inst);
        else
-          bd->exe_inst->borders = eina_list_remove(bd->exe_inst->borders, bd);
-        bd->exe_inst = NULL;
+          {
+             if (!bd->exe_inst->deleted)
+               bd->exe_inst->borders = eina_list_remove(bd->exe_inst->borders, bd);
+          }
+        if (!bd->exe_inst->deleted)
+          bd->exe_inst = NULL;
     }

   if (bd->fullscreen) bd->desk->fullscreen_borders--;
@ -5300,13 +5312,19 @@ _e_border_cb_window_configure_request(void *data  __UNUSED__,
                    }
                  else
                    {
-                       if ((e_config->screen_limits != E_SCREEN_LIMITS_COMPLETELY) && bd->zone &&
-                           (!E_INSIDE(x, y, 0, 0, bd->zone->w - 5, bd->zone->h - 5)) &&
-                           (!E_INSIDE(x, y, 0 - bd->w + 5, 0 - bd->h + 5, bd->zone->w - 5, bd->zone->h - 5))
+                       if ((e_config->screen_limits != E_SCREEN_LIMITS_COMPLETELY) &&
+                           (!E_INSIDE(x, y, 0, 0, bd->zone->container->manager->w - 5, bd->zone->container->manager->h - 5)) &&
+                           (!E_INSIDE(x, y, 0 - bd->zone->container->manager->w + 5, 0 - bd->zone->container->manager->h + 5, bd->zone->container->manager->w - 5, bd->zone->container->manager->h - 5))
                          )
                         _e_border_move_lost_window_to_center(bd);
                       else
-                         e_border_move(bd, x, y);
+                         {
+                            E_Zone *zone;
+
+                            zone = e_container_zone_at_point_get(bd->zone->container, x, y);
+                            e_border_zone_set(bd, zone);
+                            e_border_move(bd, x, y);
+                         }
                    }
               }
          }
@ -8479,14 +8497,11 @@ _e_border_eval(E_Border *bd)
                       /* some application failing to correctly center a window */
                       if (eina_list_count(bd->zone->container->zones) > 1)
                         {
-                            if (((abs((bd->zone->container->w / 2) - bd->x) < 3) || //bd->x is center of container
-                                 ((abs((bd->zone->container->w / 2) - bd->x - bd->w) < 3) || //bd->x - bd->w is center of container
-                                  (abs((bd->zone->container->w / 2) - bd->x - (bd->w / 2)) < 3))) || //bd->x - bd->w/2 is center of container
-                                ((abs((bd->zone->container->h / 2) - bd->y) < 3) || //bd->y is center of container
-                                 ((abs((bd->zone->container->h / 2) - bd->y - bd->h) < 3) || //bd->y - bd->h is center of container
-                                  (abs((bd->zone->container->h / 2) - bd->y - (bd->h / 2)) < 3))) //bd->y - bd->h/2 is center of container
-                                )
-                              e_border_center(bd);
+                            if (abs((bd->zone->container->manager->w / 2) - bd->x - (bd->w / 2)) < 3)
+                              bd->x = ((bd->zone->x + bd->zone->w) / 2) - (bd->w / 2);
+                            if (abs((bd->zone->container->manager->h / 2) - bd->y - (bd->h / 2)) < 3)
+                              bd->y = ((bd->zone->y + bd->zone->h) / 2) - (bd->h / 2);
+                            e_border_zone_set(bd, e_container_zone_at_point_get(bd->zone->container, bd->x, bd->y));
                         }
                       bd->changes.pos = 1;
                       bd->placed = 1;
@ -9932,11 +9947,11 @@ static E_Border *
 _e_border_under_pointer_helper(E_Desk *desk, E_Border *exclude, int x, int y)
 {
   E_Border *bd = NULL, *cbd;
-   Eina_List *l;
+   E_Border_List *bl;

-   EINA_LIST_FOREACH(e_border_raise_stack_get(), l, cbd)
+   bl = e_container_border_list_last(desk->zone->container);
+   while ((cbd = e_container_border_list_prev(bl)))
     {
-        if (!cbd) continue;
        /* If a border was specified which should be excluded from the list
         * (because it will be closed shortly for example), skip */
        if ((exclude) && (cbd == exclude)) continue;
@ -9948,6 +9963,7 @@ _e_border_under_pointer_helper(E_Desk *desk, E_Border *exclude, int x, int y)
        if (!bd || (cbd->layer > bd->layer))
          bd = cbd;
     }
+   e_container_border_list_free(bl);
   return bd;
 }

@ -9967,6 +9983,13 @@ e_border_under_pointer_get(E_Desk *desk,
   else
     return NULL;

+   if (!desk)
+     {
+        desk = exclude->desk;
+        if (!desk)
+          desk = e_desk_current_get(exclude->zone);
+     }
+
   return _e_border_under_pointer_helper(desk, exclude, x, y);
 }

--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@ -643,7 +643,7 @@ _e_comp_win_update(E_Comp_Win *cw)
   pw = cw->pw, ph = cw->ph;
   if (cw->shape_changed)
     {
-        if (cw->free_shape)
+        if ((cw->shape) && (cw->free_shape))
          {
             ecore_x_window_geometry_get(cw->win, NULL, NULL, &(cw->w), &(cw->h));
             rects = (Eina_Rectangle*)ecore_x_window_shape_rectangles_get(cw->win, &num);
@ -656,7 +656,7 @@ _e_comp_win_update(E_Comp_Win *cw)
                  e_container_shape_input_rects_set(cw->shape, rects, num);
               }
          }
-        if (cw->shape->shape_rects)
+        if ((cw->shape) && (cw->shape->shape_rects))
          {
             for (i = 0; i < cw->shape->shape_rects_num; i++)
               {
@ -664,7 +664,7 @@ _e_comp_win_update(E_Comp_Win *cw)
                    cw->shape->shape_rects[i].w, cw->shape->shape_rects[i].h, 0, 0, (int)cw->w, (int)cw->h);
               }
          }
-        if (cw->shape->shape_input_rects)
+        if ((cw->shape) && (cw->shape->shape_input_rects))
          {
             for (i = 0; i < cw->shape->shape_input_rects_num; i++)
               {
@ -672,8 +672,11 @@ _e_comp_win_update(E_Comp_Win *cw)
                    cw->shape->shape_input_rects[i].w, cw->shape->shape_input_rects[i].h, 0, 0, (int)cw->w, (int)cw->h);
               }
          }
-        cw->shaped = _e_comp_win_shaped_check(cw, cw->shape->shape_rects, cw->shape->shape_rects_num);
-        evas_object_precise_is_inside_set(cw->obj, cw->shaped);
+        if (cw->shape)
+          {
+             cw->shaped = _e_comp_win_shaped_check(cw, cw->shape->shape_rects, cw->shape->shape_rects_num);
+             evas_object_precise_is_inside_set(cw->obj, cw->shaped);
+          }
     }

   if (cw->dmg_updates && (((!cw->pixmap) || (cw->needpix)) &&
@ -943,7 +946,7 @@ _e_comp_win_update(E_Comp_Win *cw)
                    }
               }
             free(r);
-             if (cw->shaped || cw->shape_changed)
+             if ((cw->shape) && (cw->shaped || cw->shape_changed))
               _e_comp_win_shape_rectangles_apply(cw, cw->shape->shape_rects, cw->shape->shape_rects_num);
             cw->shape_changed = 0;
          }
@ -2147,6 +2150,7 @@ _e_comp_win_shape_init(E_Comp_Win *cw, int w, int h)
 {
   int i;

+   if (!cw->shape) return;
   for (i = 0; i < cw->shape->shape_rects_num; i++)
     E_RECTS_CLIP_TO_RECT(cw->shape->shape_rects[i].x, cw->shape->shape_rects[i].y,
                          cw->shape->shape_rects[i].w, cw->shape->shape_rects[i].h, 0, 0, w, h);
@ -2893,6 +2897,7 @@ _e_comp_win_shape_create(E_Comp_Win *cw, int x, int y, int w, int h)
        break;
     }
   if (!cw->shape) cw->shape = e_container_shape_add(eina_list_data_get(cw->c->man->containers));
+   if (!cw->shape) return;
   e_container_shape_resize(cw->shape, w, h);
   rects = (Eina_Rectangle*)ecore_x_window_shape_rectangles_get(cw->win, &num);
   e_container_shape_rects_set(cw->shape, rects, num);
@ -2984,7 +2989,7 @@ _e_comp_hide(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
   if (!cw) return ECORE_CALLBACK_PASS_ON;
   if (!cw->visible) return ECORE_CALLBACK_PASS_ON;
   _e_comp_win_real_hide(cw);
-   if (cw->free_shape) e_container_shape_hide(cw->shape);
+   if ((cw->shape) && (cw->free_shape)) e_container_shape_hide(cw->shape);
   return ECORE_CALLBACK_PASS_ON;
 }

@ -3038,7 +3043,7 @@ _e_comp_configure(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
         (cw->border == ev->border)))
     {
        _e_comp_win_configure(cw, ev->x, ev->y, ev->w, ev->h, ev->border);
-        if (cw->free_shape)
+        if ((cw->shape) && (cw->free_shape))
          {
             if (cw->visible)
               e_container_shape_move(cw->shape, cw->x, cw->y);
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@ -349,6 +349,7 @@ _e_config_edd_init(Eina_Bool old)
   E_CONFIG_VAL(D, T, prop.icon_preference, UCHAR);
   E_CONFIG_VAL(D, T, prop.desktop_file, STR);
   E_CONFIG_VAL(D, T, prop.offer_resistance, UCHAR);
+   E_CONFIG_VAL(D, T, prop.opacity, UCHAR);

   _e_config_color_class_edd = E_CONFIG_DD_NEW("E_Color_Class", E_Color_Class);
 #undef T
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@ -221,7 +221,7 @@ e_desk_show(E_Desk *desk)
   E_Event_Desk_Show *ev;
   E_Event_Desk_Before_Show *eev;
   E_Event_Desk_After_Show *eeev;
-   Edje_Message_Float_Set *msg;
+   Edje_Message_Int_Set *msg;
   Eina_List *l;
   E_Shelf *es;
   int was_zone = 0, x, y, dx = 0, dy = 0;
--- a/src/bin/e_desktop_editor.c
+++ b/src/bin/e_desktop_editor.c
@ -1049,7 +1049,7 @@ _e_desktop_edit_cb_exec_select_ok(void *data, E_Dialog *dia)
   E_FREE(cfdata->exec);
   cfdata->exec = eina_str_escape(file);
   E_FREE(cfdata->try_exec);
-   IFDUP(cfdata->try_exec, cfdata->exec);
+   IFDUP(cfdata->exec, cfdata->try_exec);

   _e_desktop_edit_cb_exec_select_cancel(data, dia);
 }
--- a/src/bin/e_dialog.c
+++ b/src/bin/e_dialog.c
@ -53,7 +53,7 @@ _e_dialog_internal_new(E_Container *con, const char *name, const char *class, in
   e_widget_on_focus_hook_set(o, _e_dialog_cb_wid_on_focus, dia);
   dia->box_object = o;
   edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
-   edje_object_signal_emit(dia->bg_object, "e,state,no_resizeble", "e");
+   edje_object_signal_emit(dia->bg_object, "e,state,no_resizable", "e");

   o = evas_object_rectangle_add(e_win_evas_get(dia->win));
   dia->event_object = o;
@ -221,13 +221,13 @@ e_dialog_resizable_set(E_Dialog *dia, int resizable)
          {
             e_win_size_max_set(dia->win, 99999, 99999);
             e_util_win_auto_resize_fill(dia->win);
-             edje_object_signal_emit(dia->bg_object, "e,state,resizeble", "e");
+             edje_object_signal_emit(dia->bg_object, "e,state,resizable", "e");
          }
        else
          {
             e_win_resize(dia->win, dia->min_w, dia->min_h);
             e_win_size_max_set(dia->win, dia->min_w, dia->min_h);
-             edje_object_signal_emit(dia->bg_object, "e,state,no_resizeble", "e");
+             edje_object_signal_emit(dia->bg_object, "e,state,no_resizable", "e");
          }
     }
 }
--- a/src/bin/e_dnd.c
+++ b/src/bin/e_dnd.c
@ -111,7 +111,7 @@ e_dnd_init(void)
   _text_atom = ecore_x_atom_get("text/plain");

   _drop_win_hash = eina_hash_string_superfast_new(NULL);
-   _drop_handlers_responsives = eina_hash_string_superfast_new(NULL);
+   _drop_handlers_responsives = eina_hash_int32_new(NULL);

   E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_MOUSE_BUTTON_UP, _e_dnd_cb_mouse_up, NULL);
   E_LIST_HANDLER_APPEND(_event_handlers, ECORE_EVENT_MOUSE_MOVE, _e_dnd_cb_mouse_move, NULL);
@ -457,10 +457,19 @@ EAPI void
 e_drop_handler_del(E_Drop_Handler *handler)
 {
   unsigned int i;
+   Eina_List *l;
+   Ecore_X_Window hwin;

   if (!handler)
     return;

+   hwin = _e_drag_win_get(handler, 1);
+   if (hwin)
+     {
+        l = eina_hash_find(_drop_handlers_responsives, &hwin);
+        if (l)
+          eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_remove(l, handler));
+     }
   _drop_handlers = eina_list_remove(_drop_handlers, handler);
   if (handler->active)
     _active_handlers = eina_list_remove(_active_handlers, handler);
@ -496,18 +505,20 @@ EAPI void
 e_drop_handler_responsive_set(E_Drop_Handler *handler)
 {
   Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
-   const char *wid = e_util_winid_str_get(hwin);
+   Eina_List *l;

-   eina_hash_add(_drop_handlers_responsives, wid, (void *)handler);
+   l = eina_hash_find(_drop_handlers_responsives, &hwin);
+   eina_hash_set(_drop_handlers_responsives, &hwin, eina_list_append(l, handler));
 }

 EAPI int
 e_drop_handler_responsive_get(const E_Drop_Handler *handler)
 {
   Ecore_X_Window hwin = _e_drag_win_get(handler, 1);
-   const char *wid = e_util_winid_str_get(hwin);
+   Eina_List *l;

-   return eina_hash_find(_drop_handlers_responsives, wid) == (void *)handler;
+   l = eina_hash_find(_drop_handlers_responsives, &hwin);
+   return l && eina_list_data_find(l, handler);
 }

 EAPI void
@ -822,6 +833,7 @@ _e_drag_update(Ecore_X_Window root, int x, int y, Ecore_X_Atom action)

   if (_drag_current)
     {
+        if (_drag_current->ended) return 0;
        if (_drag_current->visible) e_popup_show(_drag_current->pop);
        else e_popup_hide(_drag_current->pop);
        _e_drag_move(_drag_current, x, y);
@ -958,10 +970,8 @@ _e_drag_end(int x, int y)
        if (_drag_current->cb.finished)
          _drag_current->cb.finished(_drag_current, dropped);
        _drag_current->cb.finished = NULL;
+        _drag_current->ended = 1;

-        if (_drag_current && (!_xdnd))
-          e_object_del(E_OBJECT(_drag_current));
-        //e_grabinput_release(_drag_win, _drag_win);
        return;
     }

@ -1342,8 +1352,8 @@ _e_dnd_cb_event_dnd_finished(void *data __UNUSED__, int type __UNUSED__, void *e
   if (!ev->completed) return ECORE_CALLBACK_PASS_ON;
 */

-   if (_drag_win) ecore_x_window_free(_drag_win);
-   _drag_win = 0;
+   if (_drag_current && (!_xdnd))
+     e_object_del(E_OBJECT(_drag_current));
   return ECORE_CALLBACK_PASS_ON;
 }

--- a/src/bin/e_dnd.h
+++ b/src/bin/e_dnd.h
@ -48,6 +48,8 @@ struct _E_Drag

   E_Layer            layer;
   unsigned char      visible : 1;
+   Eina_Bool          ended : 1;
+

   unsigned int       num_types;
   const char        *types[];
--- a/src/bin/e_entry.c
+++ b/src/bin/e_entry.c
@ -243,12 +243,14 @@ EAPI void
 e_entry_size_min_get(Evas_Object *entry, Evas_Coord *minw, Evas_Coord *minh)
 {
   E_Entry_Smart_Data *sd;
+   int vw;

   if (evas_object_smart_smart_get(entry) != _e_entry_smart) SMARTERRNR();
   if ((!entry) || (!(sd = evas_object_smart_data_get(entry))))
     return;

-   if (minw) *minw = sd->theme_width + sd->min_width;
+   e_scrollframe_child_viewport_size_get(sd->scroll_object, &vw, NULL);
+   if (minw) *minw = sd->theme_width + vw;
   if (minh) *minh = sd->theme_height + sd->height;
 }

--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@ -51,6 +51,7 @@ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, cha
 static Eina_Bool        _e_exec_cb_expire_timer(void *data);
 static Eina_Bool        _e_exec_cb_exit(void *data, int type, void *event);
 static void        _e_exec_cb_exec_new_free(void *data, void *event);
+static void _e_exec_cb_exec_new_client_free(void *data, void *ev);
 static void        _e_exec_cb_exec_del_free(void *data, void *event);
 static void _e_exe_instance_watchers_call(E_Exec_Instance *inst, E_Exec_Watch_Type type);
 static Eina_Bool        _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data);
@ -346,10 +347,11 @@ e_exec_instance_found(E_Exec_Instance *inst)
 EAPI void
 e_exec_instance_client_add(E_Exec_Instance *inst, E_Border *bd)
 {
+   e_object_ref(E_OBJECT(bd));
   inst->borders = eina_list_append(inst->borders, bd);
   bd->exe_inst = inst;
   inst->ref++;
-   ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_free, inst);
+   ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, bd);
 }

 EAPI void
@ -649,6 +651,7 @@ _e_exec_instance_free(E_Exec_Instance *inst)
   if (!inst->deleted)
     {
        inst->deleted = 1;
+        E_LIST_FOREACH(inst->borders, e_object_ref);
        ecore_event_add(E_EVENT_EXEC_DEL, inst, _e_exec_cb_exec_del_free, inst);
        return;
     }
@ -657,7 +660,10 @@ _e_exec_instance_free(E_Exec_Instance *inst)
                                             inst->desktop);
   if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
   EINA_LIST_FREE(inst->borders, bd)
-     bd->exe_inst = NULL;
+     {
+        bd->exe_inst = NULL;
+        e_object_unref(E_OBJECT(bd));
+     }
   if (inst->desktop) efreet_desktop_free(inst->desktop);
   if (inst->exe) ecore_exe_data_set(inst->exe, NULL);
   free(inst);
@ -672,6 +678,16 @@ _e_exec_instance_free(E_Exec_Instance *inst)
   }
 */

+static void
+_e_exec_cb_exec_new_client_free(void *data, void *ev)
+{
+   E_Exec_Instance *inst = ev;
+
+   inst->ref--;
+   _e_exec_instance_free(inst);
+   e_object_unref(data);
+}
+
 static void
 _e_exec_cb_exec_new_free(void *data, void *ev EINA_UNUSED)
 {
--- a/src/bin/e_flowlayout.c
+++ b/src/bin/e_flowlayout.c
@ -824,7 +824,7 @@ _e_flowlayout_smart_extents_calcuate(E_Smart_Data *sd)
               sd->cols = 1;
             count = eina_list_count(sd->items);
             sd->rows = sd->h / minh;
-             if (count < sd->cols) sd->rows = count;
+             if (count < sd->rows) sd->rows = count;
             sd->cols = 0;
             if (sd->rows > 0)
               {
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@ -1099,6 +1099,15 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
     }
   if (real_path && (sd->realpath == real_path)) return;

+   E_FREE_FUNC(sd->scan_timer, ecore_timer_del);
+   E_FREE_FUNC(sd->sort_idler, ecore_idler_del);
+   if (sd->busy_count)
+     sd->busy_count--;
+   if (sd->busy_count == 0)
+     {
+        edje_object_signal_emit(sd->overlay, "e,state,busy,stop", "e");
+        e_fm2_custom_file_flush();
+     }
   if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath);
   sd->listing = EINA_FALSE;
   if (sd->new_file.thread) ecore_thread_cancel(sd->new_file.thread);
@ -8400,6 +8409,13 @@ _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd)

             EINA_LIST_FOREACH(rg->list, ll, ic)
               {
+                  const char *th[] =
+                  {
+                   "list/fixed",
+                   "list_odd/fixed",
+                  };
+                  Evas_Object *prev;
+
                  if (!ic->realized) continue;
                  if (!_e_fm2_icon_visible(ic))
                    {
@ -8423,14 +8439,15 @@ _e_fm2_obj_icons_place(E_Fm2_Smart_Data *sd)
                   * 6 if icon is inserted into current viewport during 4.5, even/odd for surrounding items
                   *   will always be wrong (ticket #1579)
                   */
-                  if (ic->odd)
-                    _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
-                                                 "base/theme/widgets",
-                                                 "list_odd/fixed");
-                  else
-                    _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
-                                                 "base/theme/widgets",
-                                                 "list/fixed");
+
+                   prev = edje_object_part_swallow_get(ic->obj, "e.swallow.icon");
+                   _e_fm2_theme_edje_object_set(ic->sd, ic->obj,
+                                                "base/theme/widgets",
+                                                th[ic->odd]);
+                   edje_object_part_swallow(ic->obj, "e.swallow.icon", prev);
+                   _e_fm2_icon_label_set(ic, ic->obj);
+                   if (ic->selected)
+                     edje_object_signal_emit(ic->obj, "e,state,selected", "e");
               }
          }
     }
@ -10132,11 +10149,16 @@ _e_fm2_desktop_open(E_Fm2_Smart_Data *sd)
   Eina_Bool ret;

   snprintf(buf, sizeof(buf), "%s/.directory.desktop", sd->realpath);
+   if (sd->desktop)
+     {
+        if (!e_util_strcmp(buf, sd->desktop->orig_path)) return 1;
+     }
   ret = ecore_file_exists(buf) ? ecore_file_can_write(buf)
     : ecore_file_can_write(sd->realpath);
   if (!ret) return -1;
   ef = efreet_desktop_new(buf);
   if (!ef) return 0;
+   efreet_desktop_free(sd->desktop);
   sd->desktop = ef;
   return 1;
 }
@ -11668,6 +11690,7 @@ EAPI Efreet_Desktop *
 e_fm2_desktop_get(Evas_Object *obj)
 {
   EFM_SMART_CHECK(NULL);
+   if (_e_fm2_desktop_open(sd) != 1) return NULL;
   return sd->desktop;
 }

--- a/src/bin/e_fm/e_fm_main_eeze.c
+++ b/src/bin/e_fm/e_fm_main_eeze.c
@ -545,15 +545,15 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)

   if (v->fstype)
     {
-        if ((!strcmp(v->fstype, "vfat")) ||
+        if ((!strstr(v->fstype, "fat")) ||
            (!strcmp(v->fstype, "ntfs")) ||
            (!strcmp(v->fstype, "iso9660")) ||
            (!strcmp(v->fstype, "jfs")))
          {
-             opts |= EEZE_DISK_MOUNTOPT_UTF8;
+             opts |= EEZE_DISK_MOUNTOPT_UTF8 | EEZE_DISK_MOUNTOPT_UID;
          }
     }
-   opts |= EEZE_DISK_MOUNTOPT_UID | EEZE_DISK_MOUNTOPT_NOSUID | EEZE_DISK_MOUNTOPT_NODEV | EEZE_DISK_MOUNTOPT_NOEXEC;
+   opts |= EEZE_DISK_MOUNTOPT_NOSUID | EEZE_DISK_MOUNTOPT_NODEV | EEZE_DISK_MOUNTOPT_NOEXEC;

   _e_fm_main_eeze_mount_point_set(v);
   if (!v->mount_point) goto error;
--- a/src/bin/e_fm/e_fm_main_udisks.c
+++ b/src/bin/e_fm/e_fm_main_udisks.c
@ -498,6 +498,17 @@ _e_fm_main_udisks_cb_vol_prop(void *data, const Eldbus_Message *msg,
                  return;
               }
          }
+        else if (!strcmp(key, "DevicePresentationHide"))
+          {
+             Eina_Bool hid;
+             eldbus_message_iter_arguments_get(var, "b", &hid);
+             if (hid)
+               {
+                  DBG("removing is hidden %s", v->dbus_path);
+                  ecore_idler_add(_idler_volume_del, v->dbus_path);
+                  return;
+               }
+          }
        else if (!strcmp(key, "DeviceIsMediaChangeDetectionInhibited"))
          {
             Eina_Bool inibited;
--- a/src/bin/e_fm_op.c
+++ b/src/bin/e_fm_op.c
@ -1796,7 +1796,7 @@ _e_fm_op_destroy_atom(E_Fm_Op_Task *task)
   return 1;

 finish:
-   close(fd);
+   if (fd != -1) close(fd);
   fd = -1;
   E_FREE(buf);
   task->finished = 1;
--- a/src/bin/e_focus.c
+++ b/src/bin/e_focus.c
@ -30,7 +30,8 @@ e_focus_event_mouse_in(E_Border *bd)
   if ((e_config->focus_policy == E_FOCUS_MOUSE) ||
       (e_config->focus_policy == E_FOCUS_SLOPPY))
     {
-        e_border_focus_set(bd, 1, 1);
+        if (bd != e_border_focused_get())
+          e_border_focus_set(bd, 1, 1);
     }
   if (bd->raise_timer) ecore_timer_del(bd->raise_timer);
   bd->raise_timer = NULL;
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@ -93,6 +93,8 @@ e_init_show(void)
   edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e",
                                   _e_init_cb_signal_done_ok, NULL);
   _e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL);
+   e_init_title_set(_("Enlightenment"));
+   e_init_version_set(VERSION);
 }

 EAPI void
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@ -1488,7 +1488,7 @@ _e_int_menus_clients_title_abbrv(const char *title)
   len = 0;
   for (len2 = (max_len / 2); len2; len2--)
 #if (EINA_VERSION_MAJOR > 1) || (EINA_VERSION_MINOR >= 8)
-     eina_unicode_utf8_next_get(title, &len);
+     if (!eina_unicode_utf8_next_get(title, &len)) break;
 #else
     eina_unicode_utf8_get_next(title, &len);
 #endif
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.c
@ -687,14 +687,14 @@ e_intl_locale_parts_get(const char *locale)
                  codeset[tmp_idx] = 0;
                  tmp_idx = 0;
               }
-             else if (tmp_idx < 32)
+             else if (tmp_idx < 31)
               codeset[tmp_idx++] = locale_char;
             else
               return NULL;
             break;

           case 3: /* Gathering modifier */
-             if (tmp_idx < 32)
+             if (tmp_idx < 31)
               modifier[tmp_idx++] = locale_char;
             else
               return NULL;
--- a/src/bin/e_livethumb.c
+++ b/src/bin/e_livethumb.c
@ -14,6 +14,7 @@ struct _E_Smart_Data
   Evas_Object *evas_obj;
   Evas_Object *thumb_obj;
   Evas        *evas;
+   Ecore_Evas  *ee;
   Evas_Coord   vw, vh;
 };

@ -135,18 +136,19 @@ _e_smart_add(Evas_Object *obj)
   sd->vh = 1;

   sd->evas_obj = ecore_evas_object_image_new(ecore_evas_ecore_evas_get(evas_object_evas_get(obj)));
-   ecore_evas_alpha_set(evas_object_data_get(sd->evas_obj, "Ecore_Evas"), 1);
+   sd->ee = evas_object_data_get(sd->evas_obj, "Ecore_Evas");
+   ecore_evas_alpha_set(sd->ee, 1);
   evas_object_smart_member_add(sd->evas_obj, obj);
   evas_object_image_size_set(sd->evas_obj, sd->vw, sd->vh);
-   sd->evas = ecore_evas_get(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
-   e_canvas_add(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
+   sd->evas = ecore_evas_get(sd->ee);
+   e_canvas_add(sd->ee);
 }

 static void
 _e_smart_del(Evas_Object *obj)
 {
   INTERNAL_ENTRY;
-   e_canvas_del(evas_object_data_get(sd->evas_obj, "Ecore_Evas"));
+   e_canvas_del(sd->ee);
   evas_object_del(sd->evas_obj);
   free(sd);
 }
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@ -118,12 +118,13 @@ EAPI Eina_Bool e_nopause = EINA_FALSE;
 static void
 _xdg_data_dirs_augment(void)
 {
-   const char *s = getenv("XDG_DATA_DIRS");
+   const char *s;
   const char *p = e_prefix_get();
   char newpath[4096], buf[4096];

   if (!p) return;

+   s = getenv("XDG_DATA_DIRS");
   snprintf(newpath, sizeof(newpath), "%s:%s/share", e_prefix_data_get(), p);
   if (s)
     {
@ -139,6 +140,22 @@ _xdg_data_dirs_augment(void)
        e_util_env_set("XDG_DATA_DIRS", buf);
     }

+   s = getenv("XDG_CONFIG_DIRS");
+   snprintf(newpath, sizeof(newpath), "%s/etc/xdg", p);
+   if (s)
+     {
+        if (strncmp(s, newpath, strlen(newpath)))
+          {
+             snprintf(buf, sizeof(buf), "%s:%s", newpath, s);
+             e_util_env_set("XDG_CONFIG_DIRS", buf);
+          }
+     }
+   else
+     {
+        snprintf(buf, sizeof(buf), "%s:/etc/xdg", newpath);
+        e_util_env_set("XDG_CONFIG_DIRS", buf);
+     }
+
   if (!getenv("XDG_RUNTIME_DIR"))
     {
        const char *dir;
@ -148,6 +165,12 @@ _xdg_data_dirs_augment(void)
        if (!dir) dir = "/tmp";
        e_util_env_set("XDG_RUNTIME_DIR", dir);
     }
+
+   /* set menu prefix so we get our e menu */
+   if (!getenv("XDG_MENU_PREFIX"))
+     {
+        e_util_env_set("XDG_MENU_PREFIX", "e-");
+     }
 }

 static Eina_Bool
@ -646,11 +669,7 @@ main(int argc, char **argv)
        _e_main_shutdown_push(e_init_shutdown);
     }
   if (!((!e_config->show_splash) || (after_restart)))
-     {
-        e_init_title_set(_("Enlightenment"));
-        e_init_version_set(VERSION);
-        e_init_show();
-     }
+     e_init_show();

   if (!really_know)
     {
@ -1875,12 +1894,11 @@ _e_main_cb_idle_before(void *data __UNUSED__)
 static Eina_Bool
 _e_main_cb_idle_after(void *data __UNUSED__)
 {
-   static int first_idle;
+   static int first_idle = 1;

   edje_freeze();

 #ifdef E18_RELEASE_BUILD
-   first_idle = 1;
   if (first_idle)
     {
        TS("SLEEP");
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@ -1406,7 +1406,7 @@ static void
 _e_menu_item_realize(E_Menu_Item *mi)
 {
   Evas_Object *o;
-   Evas_Coord ww, hh;
+   Evas_Coord ww = 1, hh = 1;

   /* and set up initial item state */
   if (mi->separator)
@ -2662,10 +2662,10 @@ _e_menu_item_ensure_onscreen(E_Menu_Item *mi)

   if (!mi->menu) return;
   if (!mi->menu->zone) return;
-   x = mi->x;
-   y = mi->y;
-   w = mi->w;
-   h = mi->h;
+   x = mi->menu->cur.x;
+   y = mi->menu->cur.y;
+   w = mi->menu->cur.w;
+   h = mi->menu->cur.h;
   if ((x + w) > (mi->menu->zone->x + mi->menu->zone->w))
     dx = (mi->menu->zone->x + mi->menu->zone->w) - (x + w);
   else if (x < mi->menu->zone->x)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@ -899,7 +899,6 @@ _e_module_whitelist_check(void)
      "xkbswitch",
      "echievements",
      "music-control",
-      "conf2",
      "appmenu",
      NULL   // end marker
   };
--- a/src/bin/e_order.c
+++ b/src/bin/e_order.c
@ -32,12 +32,12 @@ e_order_init(void)
             char buf[PATH_MAX];

             E_FREE(menu_file);
-             snprintf(buf, sizeof(buf), "/etc/xdg/menus/enlightenment.menu");
+             snprintf(buf, sizeof(buf), "/etc/xdg/menus/e-applications.menu");
             if (ecore_file_exists(buf)) menu_file = strdup(buf);
             else
               {
                  snprintf(buf, sizeof(buf),
-                           "%s/etc/xdg/menus/enlightenment.menu",
+                           "%s/etc/xdg/menus/e-applications.menu",
                           e_prefix_get());
                  if (ecore_file_exists(buf)) menu_file = strdup(buf);
               }
--- a/src/bin/e_slider.c
+++ b/src/bin/e_slider.c
@ -434,8 +434,8 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
   E_Smart_Data *sd = data;

   if (sd->disabled) return;
-   if ((!strcmp(ev->keyname, "Up")) ||
-       (!strcmp(ev->keyname, "KP_Up")) ||
+   if ((!strcmp(ev->keyname, "Down")) ||
+       (!strcmp(ev->keyname, "KP_Down")) ||
       (!strcmp(ev->keyname, "Left")) ||
       (!strcmp(ev->keyname, "KP_Left")))
     {
@ -448,8 +448,8 @@ _e_smart_event_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSE
          edje_object_part_drag_step(sd->edje_obj, "e.dragable.slider", -1, -1);
        sd->direction = -1;
     }
-   else if ((!strcmp(ev->keyname, "Down")) ||
-            (!strcmp(ev->keyname, "KP_Down")) ||
+   else if ((!strcmp(ev->keyname, "Up")) ||
+            (!strcmp(ev->keyname, "KP_Up")) ||
            (!strcmp(ev->keyname, "Right")) ||
            (!strcmp(ev->keyname, "KP_Right")))
     {
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@ -650,6 +650,7 @@ _e_sys_cb_logout_timer(void *data __UNUSED__)
                  e_dialog_show(dia);
                  _e_sys_logout_begin_time = now;
               }
+             if (_e_sys_resume_func) _e_sys_resume_func();
             return ECORE_CALLBACK_RENEW;
          }
     }
--- a/src/bin/e_widget_entry.c
+++ b/src/bin/e_widget_entry.c
@ -200,6 +200,8 @@ _e_wid_del_hook(Evas_Object *obj)

   if (!(obj) || (!(wd = e_widget_data_get(obj))))
     return;
+   evas_object_event_callback_del(wd->o_inout, EVAS_CALLBACK_MOUSE_IN, _e_wid_in);
+   evas_object_event_callback_del(wd->o_inout, EVAS_CALLBACK_MOUSE_OUT, _e_wid_out);
   p = e_widget_pointer_get(obj);
   if (p) e_pointer_type_pop(p, obj, NULL);
   evas_object_del(wd->o_entry);
--- a/src/bin/e_win.c
+++ b/src/bin/e_win.c
@ -326,7 +326,8 @@ e_win_show(E_Win *win)
        if (!win->placed)
          win->border->re_manage = 0;
        win->border->internal = 1;
-        win->border->internal_ecore_evas = win->ecore_evas;
+        if (win->ecore_evas)
+          win->border->internal_ecore_evas = win->ecore_evas;
        if (win->state.no_remember) win->border->internal_no_remember = 1;
        win->border->internal_no_reopen = win->state.no_reopen;
     }
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@ -26,148 +26,77 @@ EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
 EDJE_FLAGS_VERBOSE_0 =
 EDJE_FLAGS_VERBOSE_1 = -v
 EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@
-
-if USE_MODULE_CONNMAN
+PHONIES =
 include Makefile_connman.am
-endif

-if USE_MODULE_BLUEZ4
 include Makefile_bluez4.am
-endif

-if USE_MODULE_IBAR
 include Makefile_ibar.am
-endif

-if USE_MODULE_CLOCK
 include Makefile_clock.am
-endif

-if USE_MODULE_PAGER
 include Makefile_pager.am
-endif

-if USE_MODULE_BATTERY
 include Makefile_battery.am
-endif

-if USE_MODULE_TEMPERATURE
 include Makefile_temperature.am
-endif

-if USE_MODULE_NOTIFICATION
 include Makefile_notification.am
-endif

-if USE_MODULE_CPUFREQ
 include Makefile_cpufreq.am
-endif

-if USE_MODULE_IBOX
 include Makefile_ibox.am
-endif

-if USE_MODULE_START
 include Makefile_start.am
-endif

-if USE_MODULE_WINLIST
 include Makefile_winlist.am
-endif

-if USE_MODULE_FILEMAN
 include Makefile_fileman.am
-endif

-if USE_MODULE_FILEMAN_OPINFO
 include Makefile_fileman_opinfo.am
-endif

-if USE_MODULE_WIZARD
 include Makefile_wizard.am
-endif

-if USE_MODULE_CONF
 include Makefile_conf.am
-endif

-if USE_MODULE_CONF_COMP
 include Makefile_conf_comp.am
-endif

-if USE_MODULE_CONF_WALLPAPER2
 include Makefile_conf_wallpaper2.am
-endif

-if USE_MODULE_CONF_THEME
 include Makefile_conf_theme.am
-endif

-if USE_MODULE_CONF_INTL
 include Makefile_conf_intl.am
-endif

-if USE_MODULE_MSGBUS
 include Makefile_msgbus.am
-endif

-if USE_MODULE_CONF_APPLICATIONS
 include Makefile_conf_applications.am
-endif

-if USE_MODULE_CONF_DISPLAY
 include Makefile_conf_display.am
-endif

-if USE_MODULE_CONF_SHELVES
 include Makefile_conf_shelves.am
-endif

-if USE_MODULE_CONF_BINDINGS
 include Makefile_conf_bindings.am
-endif

-if USE_MODULE_CONF_WINDOW_REMEMBERS
 include Makefile_conf_window_remembers.am
-endif

-if USE_MODULE_CONF_WINDOW_MANIPULATION
 include Makefile_conf_window_manipulation.am
-endif

-if USE_MODULE_CONF_MENUS
 include Makefile_conf_menus.am
-endif

-if USE_MODULE_CONF_DIALOGS
 include Makefile_conf_dialogs.am
-endif

-if USE_MODULE_CONF_PERFORMANCE
 include Makefile_conf_performance.am
-endif

-if USE_MODULE_CONF_PATHS
 include Makefile_conf_paths.am
-endif

-if USE_MODULE_CONF_INTERACTION
 include Makefile_conf_interaction.am
-endif

-if USE_MODULE_CONF_RANDR
 include Makefile_conf_randr.am
-endif

-if USE_MODULE_GADMAN
 include Makefile_gadman.am
-endif

-if USE_MODULE_MIXER
 include Makefile_mixer.am
-endif

-if USE_MODULE_ILLUME2
 include Makefile_illume2.am
 include Makefile_illume-home.am
 include Makefile_illume-home-toggle.am
@ -177,74 +106,41 @@ include Makefile_illume-indicator.am
 include Makefile_illume-kbd-toggle.am
 include Makefile_illume-mode-toggle.am
 include Makefile_illume-bluetooth.am
-endif

-if USE_MODULE_SYSCON
 include Makefile_syscon.am
-endif

-if USE_MODULE_EVERYTHING
 include Makefile_everything.am
-endif

-if USE_MODULE_SYSTRAY
 include Makefile_systray.am
-endif

-if USE_MODULE_APPMENU
 include Makefile_appmenu.am
-endif

-if USE_MODULE_QUICKACCESS
 include Makefile_quickaccess.am
-endif

-if USE_MODULE_TEAMWORK
 include Makefile_teamwork.am
-endif

-if USE_MODULE_SHOT
 include Makefile_shot.am
-endif

-if USE_MODULE_BACKLIGHT
 include Makefile_backlight.am
-endif

-if USE_MODULE_TASKS
 include Makefile_tasks.am
-endif

-if USE_MODULE_XKBSWITCH
 include Makefile_xkbswitch.am
-endif

-if USE_MODULE_TILING
 include Makefile_tiling.am
-endif

-if USE_MODULE_ACCESS
 include Makefile_access.am
-endif

-if USE_MODULE_MUSIC_CONTROL
 include Makefile_music_control.am
-endif

-if USE_MODULE_CONTACT
 include Makefile_contact.am
-endif

 #if HAVE_WAYLAND_DRM
 #include Makefile_wl_drm.am
-#endif

-if USE_MODULE_WL_DESKTOP_SHELL
 include Makefile_wl_desktop_shell.am
-endif

-if USE_MODULE_WL_SCREENSHOT
 include Makefile_wl_screenshot.am
-endif

 install-data-hook: $(INSTALL_DATA_HOOKS)
+.PHONY: $(PHONIES)
--- a/src/modules/Makefile_access.am
+++ b/src/modules/Makefile_access.am
@ -1,7 +1,8 @@
+EXTRA_DIST += access/module.desktop.in
+if USE_MODULE_ACCESS
 accessdir = $(MDIR)/access
 access_DATA = access/module.desktop

-EXTRA_DIST += $(access_DATA)

 accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
 accesspkg_LTLIBRARIES = access/module.la
@ -10,6 +11,7 @@ access_module_la_SOURCES = access/e_mod_main.c \
 			   access/e_mod_main.h \
 			   access/e_mod_config.c

-.PHONY: access install-access
+PHONIES += access install-access
 access: $(accesspkg_LTLIBRARIES) $(access_DATA)
 install-access: install-accessDATA install-accesspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_appmenu.am
+++ b/src/modules/Makefile_appmenu.am
@ -1,8 +1,10 @@
+EXTRA_DIST += appmenu/module.desktop.in \
+appmenu/e-module-appmenu.edj
+if USE_MODULE_APPMENU
 appmenudir = $(MDIR)/appmenu
 appmenu_DATA = appmenu/module.desktop \
               appmenu/e-module-appmenu.edj

-EXTRA_DIST += $(appmenu_DATA)

 appmenupkgdir = $(MDIR)/appmenu/$(MODULE_ARCH)
 appmenupkg_LTLIBRARIES = appmenu/module.la
@ -13,6 +15,7 @@ appmenu_module_la_SOURCES = appmenu/e_mod_main.c \
                            appmenu/e_mod_appmenu_private.h


-.PHONY: appmenu install-appmenu
+PHONIES += appmenu install-appmenu
 appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA)
 install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_backlight.am
+++ b/src/modules/Makefile_backlight.am
@ -1,14 +1,17 @@
+EXTRA_DIST += backlight/module.desktop.in \
+backlight/e-module-backlight.edj
+if USE_MODULE_BACKLIGHT
 backlightdir = $(MDIR)/backlight
 backlight_DATA = backlight/e-module-backlight.edj \
 		 backlight/module.desktop

-EXTRA_DIST += $(backlight_DATA)

 backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH)
 backlightpkg_LTLIBRARIES = backlight/module.la

 backlight_module_la_SOURCES = backlight/e_mod_main.c

-.PHONY: backlight install-backlight
+PHONIES += backlight install-backlight
 backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA)
 install-backlight: install-backlightDATA install-backlightpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_battery.am
+++ b/src/modules/Makefile_battery.am
@ -1,8 +1,10 @@
+EXTRA_DIST += battery/module.desktop.in \
+battery/e-module-battery.edj
+if USE_MODULE_BATTERY
 batterydir = $(MDIR)/battery
 battery_DATA = battery/e-module-battery.edj \
 	       battery/module.desktop

-EXTRA_DIST += $(battery_DATA)

 batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH)
 batterypkg_LTLIBRARIES = battery/module.la
@ -34,6 +36,7 @@ battery_batget_SOURCES = battery/batget.c
 battery_batget_LDADD   = @BATTERY_LIBS@
 battery_batget_LDFLAGS = @BATTERY_LDFLAGS@

-.PHONY: battery install-battery
+PHONIES += battery install-battery
 battery: $(batterypkg_LTLIBRARIES) $(battery_DATA) $(batget_PROGRAMS)
 install-battery: install-batteryDATA install-batterypkgLTLIBRARIES install-batgetPROGRAMS
+endif
--- a/src/modules/Makefile_bluez4.am
+++ b/src/modules/Makefile_bluez4.am
@ -1,8 +1,10 @@
+EXTRA_DIST += bluez4/module.desktop.in \
+bluez4/e-module-bluez4.edj
+if USE_MODULE_BLUEZ4
 bluez4dir = $(MDIR)/bluez4
 bluez4_DATA = bluez4/e-module-bluez4.edj \
 	      bluez4/module.desktop

-EXTRA_DIST += $(bluez4_DATA)

 bluez4pkgdir = $(MDIR)/bluez4/$(MODULE_ARCH)
 bluez4pkg_LTLIBRARIES = bluez4/module.la
@ -17,6 +19,7 @@ bluez4_module_la_SOURCES = bluez4/e_mod_main.h \
 bluez4_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
 bluez4_module_la_LIBADD = @BLUEZ4_LIBS@

-.PHONY: bluez4 install-bluez4
+PHONIES += bluez4 install-bluez4
 bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA)
 install-bluez4: install-bluez4DATA install-bluez4pkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_clock.am
+++ b/src/modules/Makefile_clock.am
@ -1,8 +1,10 @@
+EXTRA_DIST += clock/module.desktop.in \
+clock/e-module-clock.edj
+if USE_MODULE_CLOCK
 clockdir = $(MDIR)/clock
 clock_DATA = clock/e-module-clock.edj \
 	     clock/module.desktop

-EXTRA_DIST += $(clock_DATA)

 clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH)
 clockpkg_LTLIBRARIES = clock/module.la
@ -11,6 +13,7 @@ clock_module_la_SOURCES = clock/e_mod_main.h \
 			  clock/e_mod_main.c \
 			  clock/e_mod_config.c

-.PHONY: clock install-clock
+PHONIES += clock install-clock
 clock: $(clockpkg_LTLIBRARIES) $(clock_DATA)
 install-clock: install-clockDATA install-clockpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf.am
+++ b/src/modules/Makefile_conf.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf/module.desktop.in \
+conf/e-module-conf.edj
+if USE_MODULE_CONF
 confdir = $(MDIR)/conf
 conf_DATA = conf/e-module-conf.edj \
 	    conf/module.desktop

-EXTRA_DIST += $(conf_DATA)

 confpkgdir = $(MDIR)/conf/$(MODULE_ARCH)
 confpkg_LTLIBRARIES = conf/module.la
@ -12,6 +14,7 @@ conf_module_la_SOURCES = conf/e_mod_main.c \
 			 conf/e_conf.c \
 			 conf/e_mod_config.c

-.PHONY: conf install-conf
+PHONIES += conf install-conf
 conf: $(confpkg_LTLIBRARIES) $(conf_DATA)
 install-conf: install-confDATA install-confpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_applications.am
+++ b/src/modules/Makefile_conf_applications.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_applications/module.desktop.in \
+conf_applications/e-module-conf_applications.edj
+if USE_MODULE_CONF_APPLICATIONS
 conf_applicationsdir = $(MDIR)/conf_applications
 conf_applications_DATA = conf_applications/e-module-conf_applications.edj \
 			 conf_applications/module.desktop

-EXTRA_DIST += $(conf_applications_DATA)

 conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH)
 conf_applicationspkg_LTLIBRARIES = conf_applications/module.la
@ -14,6 +16,7 @@ conf_applications_module_la_SOURCES = conf_applications/e_mod_main.c \
 			      conf_applications/e_int_config_deskenv.c \
 			      conf_applications/e_int_config_apps_personal.c

-.PHONY: conf_applications install-conf_applications
+PHONIES += conf_applications install-conf_applications
 conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA)
 install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_bindings.am
+++ b/src/modules/Makefile_conf_bindings.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_bindings/module.desktop.in
+if USE_MODULE_CONF_BINDINGS
 conf_bindingsdir = $(MDIR)/conf_bindings
 conf_bindings_DATA = conf_bindings/module.desktop

-EXTRA_DIST += $(conf_bindings_DATA)

 conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH)
 conf_bindingspkg_LTLIBRARIES = conf_bindings/module.la
@ -14,6 +15,7 @@ conf_bindings_module_la_SOURCES = conf_bindings/e_mod_main.c \
 			     conf_bindings/e_int_config_signalbindings.c \
 			     conf_bindings/e_int_config_acpibindings.c

-.PHONY: conf_bindings install-conf_bindings
+PHONIES += conf_bindings install-conf_bindings
 conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA)
 install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_comp.am
+++ b/src/modules/Makefile_conf_comp.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_comp/module.desktop.in
+if USE_MODULE_CONF_COMP
 conf_compdir = $(MDIR)/conf_comp
 conf_comp_DATA = conf_comp/module.desktop

-EXTRA_DIST += $(comp_DATA)

 conf_comppkgdir = $(MDIR)/conf_comp/$(MODULE_ARCH)
 conf_comppkg_LTLIBRARIES = conf_comp/module.la
@ -11,6 +12,7 @@ conf_comp_module_la_SOURCES  = conf_comp/e_mod_main.h \
 			       conf_comp/e_mod_config.c \
 			       conf_comp/e_mod_config_match.c

-.PHONY: conf_comp install-conf_comp
+PHONIES += conf_comp install-conf_comp
 conf_comp: $(conf_mppkg_LTLIBRARIES) $(conf_comp_DATA)
 install-conf_comp: install-conf_compDATA install-conf_comppkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_dialogs.am
+++ b/src/modules/Makefile_conf_dialogs.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_dialogs/module.desktop.in \
+conf_dialogs/e-module-conf_dialogs.edj
+if USE_MODULE_CONF_DIALOGS
 conf_dialogsdir = $(MDIR)/conf_dialogs
 conf_dialogs_DATA = conf_dialogs/e-module-conf_dialogs.edj \
 		    conf_dialogs/module.desktop

-EXTRA_DIST += $(conf_dialogs_DATA)

 conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH)
 conf_dialogspkg_LTLIBRARIES = conf_dialogs/module.la
@ -12,6 +14,7 @@ conf_dialogs_module_la_SOURCES = conf_dialogs/e_mod_main.c \
 				 conf_dialogs/e_int_config_dialogs.c \
 				 conf_dialogs/e_int_config_profiles.c

-.PHONY: conf_dialogs install-conf_dialogs
+PHONIES += conf_dialogs install-conf_dialogs
 conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA)
 install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_display.am
+++ b/src/modules/Makefile_conf_display.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_display/module.desktop.in
+if USE_MODULE_CONF_DISPLAY
 conf_displaydir = $(MDIR)/conf_display
 conf_display_DATA = conf_display/module.desktop

-EXTRA_DIST += $(conf_display_DATA)

 conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
 conf_displaypkg_LTLIBRARIES = conf_display/module.la
@ -16,6 +17,7 @@ conf_display_module_la_SOURCES = conf_display/e_mod_main.c \
 				 conf_display/e_int_config_desks.c \
 				 conf_display/e_int_config_desk.c

-.PHONY: conf_display install-conf_display
+PHONIES += conf_display install-conf_display
 conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA)
 install-conf_display: install-conf_displayDATA install-conf_displaypkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_interaction.am
+++ b/src/modules/Makefile_conf_interaction.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_interaction/module.desktop.in \
+conf_interaction/e-module-conf_interaction.edj
+if USE_MODULE_CONF_INTERACTION
 conf_interactiondir = $(MDIR)/conf_interaction
 conf_interaction_DATA = conf_interaction/e-module-conf_interaction.edj \
 			conf_interaction/module.desktop

-EXTRA_DIST += $(conf_interaction_DATA)

 conf_interactionpkgdir = $(MDIR)/conf_interaction/$(MODULE_ARCH)
 conf_interactionpkg_LTLIBRARIES = conf_interaction/module.la
@ -12,6 +14,7 @@ conf_interaction_module_la_SOURCES = conf_interaction/e_mod_main.c \
 			     conf_interaction/e_int_config_interaction.c \
 			     conf_interaction/e_int_config_mouse.c

-.PHONY: conf_interaction install-conf_interaction
+PHONIES += conf_interaction install-conf_interaction
 conf_interaction: $(conf_interactionpkg_LTLIBRARIES) $(conf_interaction_DATA)
 install-conf_interaction: install-conf_interactionDATA install-conf_interactionpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_intl.am
+++ b/src/modules/Makefile_conf_intl.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_intl/module.desktop.in
+if USE_MODULE_CONF_INTL
 conf_intldir = $(MDIR)/conf_intl
 conf_intl_DATA = conf_intl/module.desktop

-EXTRA_DIST += $(conf_intl_DATA)

 conf_intlpkgdir = $(MDIR)/conf_intl/$(MODULE_ARCH)
 conf_intlpkg_LTLIBRARIES = conf_intl/module.la
@ -12,6 +13,7 @@ conf_intl_module_la_SOURCES = conf_intl/e_mod_main.c \
 			      conf_intl/e_int_config_imc_import.c \
 			      conf_intl/e_int_config_imc.c

-.PHONY: conf_intl install-conf_intl
+PHONIES += conf_intl install-conf_intl
 conf_intl: $(conf_intlpkg_LTLIBRARIES) $(conf_intl_DATA)
 install-conf_intl: install-conf_intlDATA install-conf_intlpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_menus.am
+++ b/src/modules/Makefile_conf_menus.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_menus/module.desktop.in \
+conf_menus/e-module-conf_menus.edj
+if USE_MODULE_CONF_MENUS
 conf_menusdir = $(MDIR)/conf_menus
 conf_menus_DATA = conf_menus/e-module-conf_menus.edj \
 		  conf_menus/module.desktop

-EXTRA_DIST += $(conf_menus_DATA)

 conf_menuspkgdir = $(MDIR)/conf_menus/$(MODULE_ARCH)
 conf_menuspkg_LTLIBRARIES = conf_menus/module.la
@ -11,6 +13,7 @@ conf_menus_module_la_SOURCES = conf_menus/e_mod_main.c \
 			       conf_menus/e_mod_main.h \
 			       conf_menus/e_int_config_menus.c

-.PHONY: conf_menus install-conf_menus
+PHONIES += conf_menus install-conf_menus
 conf_menus: $(conf_menuspkg_LTLIBRARIES) $(conf_menus_DATA)
 install-conf_menus: install-conf_menusDATA install-conf_menuspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_paths.am
+++ b/src/modules/Makefile_conf_paths.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_paths/module.desktop.in \
+conf_paths/e-module-conf_paths.edj
+if USE_MODULE_CONF_PATHS
 conf_pathsdir = $(MDIR)/conf_paths
 conf_paths_DATA = conf_paths/e-module-conf_paths.edj \
 		  conf_paths/module.desktop

-EXTRA_DIST += $(conf_paths_DATA)

 conf_pathspkgdir = $(MDIR)/conf_paths/$(MODULE_ARCH)
 conf_pathspkg_LTLIBRARIES = conf_paths/module.la
@ -12,6 +14,7 @@ conf_paths_module_la_SOURCES = conf_paths/e_mod_main.c \
 			       conf_paths/e_int_config_paths.c \
 			       conf_paths/e_int_config_env.c

-.PHONY: conf_paths install-conf_paths
+PHONIES += conf_paths install-conf_paths
 conf_paths: $(conf_pathspkg_LTLIBRARIES) $(conf_paths_DATA)
 install-conf_paths: install-conf_pathsDATA install-conf_pathspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_performance.am
+++ b/src/modules/Makefile_conf_performance.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_performance/module.desktop.in \
+conf_performance/e-module-conf_performance.edj
+if USE_MODULE_CONF_PERFORMANCE
 conf_performancedir = $(MDIR)/conf_performance
 conf_performance_DATA = conf_performance/e-module-conf_performance.edj \
 			conf_performance/module.desktop

-EXTRA_DIST += $(conf_performance_DATA)

 conf_performancepkgdir = $(MDIR)/conf_performance/$(MODULE_ARCH)
 conf_performancepkg_LTLIBRARIES = conf_performance/module.la
@ -13,6 +15,7 @@ conf_performance_module_la_SOURCES = conf_performance/e_mod_main.c \
 			     conf_performance/e_int_config_engine.c \
 			     conf_performance/e_int_config_powermanagement.c

-.PHONY: conf_performance install-conf_performance
+PHONIES += conf_performance install-conf_performance
 conf_performance: $(conf_performancepkg_LTLIBRARIES) $(conf_performance_DATA)
 install-conf_performance: install-conf_performanceDATA install-conf_performancepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_randr.am
+++ b/src/modules/Makefile_conf_randr.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_randr/module.desktop.in \
+conf_randr/e-module-conf_randr.edj
+if USE_MODULE_CONF_RANDR
 conf_randrdir = $(MDIR)/conf_randr
 conf_randr_DATA = conf_randr/e-module-conf_randr.edj \
 		  conf_randr/module.desktop

-EXTRA_DIST += $(conf_randr_DATA)

 conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH)
 conf_randrpkg_LTLIBRARIES = conf_randr/module.la
@ -16,6 +18,7 @@ conf_randr_module_la_SOURCES = conf_randr/e_mod_main.c \
                               conf_randr/e_smart_monitor.c \
                               conf_randr/e_smart_monitor.h

-.PHONY: conf_randr install-conf_randr
+PHONIES += conf_randr install-conf_randr
 conf_randr: $(conf_randrpkg_LTLIBRARIES) $(conf_randr_DATA)
 install-conf_randr: install-conf_randrDATA install-conf_randrpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_shelves.am
+++ b/src/modules/Makefile_conf_shelves.am
@ -1,8 +1,10 @@
+EXTRA_DIST += conf_shelves/module.desktop.in \
+conf_shelves/e-module-conf_shelves.edj
+if USE_MODULE_CONF_SHELVES
 conf_shelvesdir = $(MDIR)/conf_shelves
 conf_shelves_DATA = conf_shelves/e-module-conf_shelves.edj \
 		    conf_shelves/module.desktop

-EXTRA_DIST += $(conf_shelves_DATA)

 conf_shelvespkgdir = $(MDIR)/conf_shelves/$(MODULE_ARCH)
 conf_shelvespkg_LTLIBRARIES = conf_shelves/module.la
@ -12,6 +14,7 @@ conf_shelves_module_la_SOURCES = conf_shelves/e_mod_main.c \
 				 conf_shelves/e_int_config_shelf.c \
 				 conf_shelves/e_int_config_shelf.h

-.PHONY: conf_shelves install-conf_shelves
+PHONIES += conf_shelves install-conf_shelves
 conf_shelves: $(conf_shelvespkg_LTLIBRARIES) $(conf_shelves_DATA)
 install-conf_shelves: install-conf_shelvesDATA install-conf_shelvespkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_theme.am
+++ b/src/modules/Makefile_conf_theme.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_theme/module.desktop.in
+if USE_MODULE_CONF_THEME
 conf_themedir = $(MDIR)/conf_theme
 conf_theme_DATA = conf_theme/module.desktop

-EXTRA_DIST += $(conf_theme_DATA)

 conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH)
 conf_themepkg_LTLIBRARIES = conf_theme/module.la
@ -18,6 +19,7 @@ conf_theme_module_la_SOURCES = conf_theme/e_mod_main.c \
 			       conf_theme/e_int_config_wallpaper.c \
 			       conf_theme/e_int_config_xsettings.c

-.PHONY: conf_theme install-conf_theme
+PHONIES += conf_theme install-conf_theme
 conf_theme: $(conf_themepkg_LTLIBRARIES) $(conf_theme_DATA)
 install-conf_theme: install-conf_themeDATA install-conf_themepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_wallpaper2.am
+++ b/src/modules/Makefile_conf_wallpaper2.am
@ -1,7 +1,8 @@
+EXTRA_DIST += conf_wallpaper2/module.desktop.in
+if USE_MODULE_CONF_WALLPAPER2
 conf_wallpaper2dir = $(MDIR)/conf_wallpaper2
 conf_wallpaper2_DATA = conf_wallpaper2/module.desktop

-EXTRA_DIST += $(conf_wallpaper2_DATA)

 conf_wallpaper2pkgdir = $(MDIR)/conf_wallpaper2/$(MODULE_ARCH)
 conf_wallpaper2pkg_LTLIBRARIES = conf_wallpaper2/module.la
@ -10,6 +11,7 @@ conf_wallpaper2_module_la_SOURCES = conf_wallpaper2/e_mod_main.c \
 				    conf_wallpaper2/e_mod_main.h \
 				    conf_wallpaper2/e_int_config_wallpaper.c

-.PHONY: conf_wallpaper2 install-conf_wallpaper2
+PHONIES += conf_wallpaper2 install-conf_wallpaper2
 conf_wallpaper2: $(conf_wallpaper2pkg_LTLIBRARIES) $(conf_wallpaper2_DATA)
 install-conf_wallpaper2: install-conf_wallpaper2DATA install-conf_wallpaper2pkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_window_manipulation.am
+++ b/src/modules/Makefile_conf_window_manipulation.am
@ -1,7 +1,9 @@
+EXTRA_DIST += conf_window_manipulation/module.desktop.in \
+conf_window_manipulation/e-module-conf_winmanip.edj
+if USE_MODULE_CONF_WINDOW_MANIPULATION
 conf_window_manipulationdir = $(MDIR)/conf_window_manipulation
 conf_window_manipulation_DATA = conf_window_manipulation/module.desktop

-EXTRA_DIST += $(conf_window_manipulation_DATA)

 conf_window_manipulationpkgdir = $(MDIR)/conf_window_manipulation/$(MODULE_ARCH)
 conf_window_manipulationpkg_LTLIBRARIES = conf_window_manipulation/module.la
@ -14,6 +16,7 @@ conf_window_manipulation_module_la_SOURCES = conf_window_manipulation/e_mod_main
 		      conf_window_manipulation/e_int_config_focus.c \
 		      conf_window_manipulation/e_int_config_clientlist.c

-.PHONY: conf_window_manipulation install-conf_window_manipulation
+PHONIES += conf_window_manipulation install-conf_window_manipulation
 conf_window_manipulation: $(conf_window_manipulationpkg_LTLIBRARIES) $(conf_window_manipulation_DATA)
 install-conf_window_manipulation: install-conf_window_manipulationDATA install-conf_window_manipulationpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_conf_window_remembers.am
+++ b/src/modules/Makefile_conf_window_remembers.am
@ -1,9 +1,11 @@
+EXTRA_DIST += conf_window_remembers/module.desktop.in \
+conf_window_remembers/e-module-conf_window_remembers.edj
+if USE_MODULE_CONF_WINDOW_REMEMBERS
 conf_window_remembersdir = $(MDIR)/conf_window_remembers
 conf_window_remembers_DATA = \
 conf_window_remembers/e-module-conf_window_remembers.edj \
 conf_window_remembers/module.desktop

-EXTRA_DIST += $(conf_window_remembers_DATA)

 conf_window_rememberspkgdir = $(MDIR)/conf_window_remembers/$(MODULE_ARCH)
 conf_window_rememberspkg_LTLIBRARIES = conf_window_remembers/module.la
@ -12,6 +14,7 @@ conf_window_remembers_module_la_SOURCES = conf_window_remembers/e_mod_main.c \
 			      conf_window_remembers/e_mod_main.h \
 			      conf_window_remembers/e_int_config_remembers.c

-.PHONY: conf_window_remembers install-conf_window_remembers
+PHONIES += conf_window_remembers install-conf_window_remembers
 conf_window_remembers: $(conf_window_rememberspkg_LTLIBRARIES) $(conf_window_remembers_DATA)
 install-conf_window_remembers: install-conf_window_remembersDATA install-conf_window_rememberspkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_connman.am
+++ b/src/modules/Makefile_connman.am
@ -1,8 +1,10 @@
+EXTRA_DIST += connman/module.desktop.in \
+connman/e-module-connman.edj
+if USE_MODULE_CONNMAN
 connmandir = $(MDIR)/connman
 connman_DATA = connman/e-module-connman.edj \
 	       connman/module.desktop

-EXTRA_DIST += $(connman_DATA)

 connmanpkgdir = $(MDIR)/connman/$(MODULE_ARCH)
 connmanpkg_LTLIBRARIES = connman/module.la
@ -17,6 +19,7 @@ connman_module_la_SOURCES = connman/e_mod_main.h \
 connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
 connman_module_la_LIBADD = @ECONNMAN_LIBS@

-.PHONY: connman install-connman
+PHONIES += connman install-connman
 connman: $(connmanpkg_LTLIBRARIES) $(connman_DATA)
 install-connman: install-connmanDATA install-connmanpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_contact.am
+++ b/src/modules/Makefile_contact.am
@ -1,10 +1,10 @@
+EXTRA_DIST += contact/module.desktop.in \
+contact/e-module-contact.edj
+if USE_MODULE_CONTACT
 contactdir = $(MDIR)/contact
 contact_DATA = contact/e-module-contact.edj \
 	       contact/module.desktop

-EXTRA_DIST += contact/e-module-contact.edj \
-	      contact/module.desktop.in
-
 contactpkgdir = $(MDIR)/contact/$(MODULE_ARCH)
 contactpkg_LTLIBRARIES = contact/module.la

@ -16,6 +16,7 @@ contact_module_la_SOURCES = contact/e_mod_main.c \
                            contact/e_edges.h

 # TODO: incomplete
-.PHONY: contact install-contact
+PHONIES += contact install-contact
 contact: $(contactpkg_LTLIBRARIES) $(contact_DATA)
 install-contact: install-contactDATA install-contactpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_cpufreq.am
+++ b/src/modules/Makefile_cpufreq.am
@ -1,8 +1,10 @@
+EXTRA_DIST += cpufreq/module.desktop.in \
+cpufreq/e-module-cpufreq.edj
+if USE_MODULE_CPUFREQ
 cpufreqdir = $(MDIR)/cpufreq
 cpufreq_DATA = cpufreq/e-module-cpufreq.edj \
 	       cpufreq/module.desktop

-EXTRA_DIST += $(cpufreq_DATA)

 cpufreqpkgdir = $(MDIR)/cpufreq/$(MODULE_ARCH)
 cpufreqpkg_LTLIBRARIES = cpufreq/module.la
@ -27,6 +29,7 @@ cpufreq-install-data-hook:

 INSTALL_DATA_HOOKS += cpufreq-install-data-hook

-.PHONY: cpufreq install-cpufreq
+PHONIES += cpufreq install-cpufreq
 cpufreq: $(cpufreqpkg_LTLIBRARIES) $(cpufreq_DATA) $(freqset_PROGRAMS)
 install-cpufreq: install-cpufreqDATA install-cpufreqpkgLTLIBRARIES install-freqsetPROGRAMS
+endif
--- a/src/modules/Makefile_everything.am
+++ b/src/modules/Makefile_everything.am
@ -1,9 +1,12 @@
+EXTRA_DIST += everything/module.desktop.in \
+everything/e-module-everything.edj \
+everything/e-module-everything-start.edj
+if USE_MODULE_EVERYTHING
 everythingdir = $(MDIR)/everything
 everything_DATA = everything/e-module-everything.edj \
 		  everything/e-module-everything-start.edj \
 		  everything/module.desktop

-EXTRA_DIST += $(everything_DATA)

 everythingpkgdir = $(MDIR)/everything/$(MODULE_ARCH)
 everythingpkg_LTLIBRARIES = everything/module.la
@ -41,9 +44,9 @@ dist_everything_headers_DATA = $(EVRYHEADERS)

 everything_pkgconfigdir = $(libdir)/pkgconfig
 everything_pkgconfig_DATA = everything/everything.pc
-EXTRA_DIST += everything/everything.pc.in
 DISTCLEANFILES = everything/everything.pc

-.PHONY: everything install-everything
+PHONIES += everything install-everything
 everything: $(everythingpkg_LTLIBRARIES) $(everything_DATA)
 install-everything: install-everythingDATA install-everythingpkgLTLIBRARIES install-everything_pkgconfig_DATA
+endif
--- a/src/modules/Makefile_fileman.am
+++ b/src/modules/Makefile_fileman.am
@ -1,8 +1,10 @@
+EXTRA_DIST += fileman/module.desktop.in \
+fileman/e-module-fileman.edj
+if USE_MODULE_FILEMAN
 filemandir = $(MDIR)/fileman
 fileman_DATA = fileman/e-module-fileman.edj \
 	       fileman/module.desktop

-EXTRA_DIST += $(fileman_DATA)

 filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH)
 filemanpkg_LTLIBRARIES = fileman/module.la
@ -17,6 +19,7 @@ fileman_module_la_SOURCES = fileman/e_mod_main.c \
 			    fileman/e_mod_dbus.c \
 			    fileman/e_mod_menu.c

-.PHONY: fileman install-fileman
+PHONIES += fileman install-fileman
 fileman: $(filemanpkg_LTLIBRARIES) $(fileman_DATA)
 install-fileman: install-filemanDATA install-filemanpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_fileman_opinfo.am
+++ b/src/modules/Makefile_fileman_opinfo.am
@ -1,14 +1,17 @@
+EXTRA_DIST += fileman_opinfo/module.desktop.in \
+fileman_opinfo/e-module-fileman_opinfo.edj
+if USE_MODULE_FILEMAN_OPINFO
 fileman_opinfodir = $(MDIR)/fileman_opinfo
 fileman_opinfo_DATA = fileman_opinfo/e-module-fileman_opinfo.edj \
 		      fileman_opinfo/module.desktop

-EXTRA_DIST += $(fileman_opinfo_DATA)

 fileman_opinfopkgdir = $(MDIR)/fileman_opinfo/$(MODULE_ARCH)
 fileman_opinfopkg_LTLIBRARIES = fileman_opinfo/module.la

 fileman_opinfo_module_la_SOURCES = fileman_opinfo/e_mod_main.c

-.PHONY: fileman_opinfo install-fileman_opinfo
+PHONIES += fileman_opinfo install-fileman_opinfo
 fileman_opinfo: $(fileman_opinfopkg_LTLIBRARIES) $(fileman_opinfo_DATA)
 install-fileman_opinfo: install-fileman_opinfoDATA install-fileman_opinfopkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_gadman.am
+++ b/src/modules/Makefile_gadman.am
@ -1,8 +1,10 @@
+EXTRA_DIST += gadman/module.desktop.in \
+gadman/e-module-gadman.edj
+if USE_MODULE_GADMAN
 gadmandir = $(MDIR)/gadman
 gadman_DATA = gadman/e-module-gadman.edj \
 	      gadman/module.desktop

-EXTRA_DIST += $(gadman_DATA)

 gadmanpkgdir = $(MDIR)/gadman/$(MODULE_ARCH)
 gadmanpkg_LTLIBRARIES = gadman/module.la
@ -12,6 +14,7 @@ gadman_module_la_SOURCES = gadman/e_mod_main.c \
 			   gadman/e_mod_gadman.c \
 			   gadman/e_mod_gadman.h

-.PHONY: gadman install-gadman
+PHONIES += gadman install-gadman
 gadman: $(gadmanpkg_LTLIBRARIES) $(gadman_DATA)
 install-gadman: install-gadmanDATA install-gadmanpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_ibar.am
+++ b/src/modules/Makefile_ibar.am
@ -1,8 +1,10 @@
+EXTRA_DIST += ibar/module.desktop.in \
+ibar/e-module-ibar.edj
+if USE_MODULE_IBAR
 ibardir = $(MDIR)/ibar
 ibar_DATA = ibar/e-module-ibar.edj \
 	    ibar/module.desktop

-EXTRA_DIST += $(ibar_DATA)

 ibarpkgdir = $(MDIR)/ibar/$(MODULE_ARCH)
 ibarpkg_LTLIBRARIES = ibar/module.la
@ -11,6 +13,7 @@ ibar_module_la_SOURCES = ibar/e_mod_main.c \
 			 ibar/e_mod_main.h \
 			 ibar/e_mod_config.c

-.PHONY: ibar install-ibar
+PHONIES += ibar install-ibar
 ibar: $(ibarpkg_LTLIBRARIES) $(ibar_DATA)
 install-ibar: install-ibarDATA install-ibarpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_ibox.am
+++ b/src/modules/Makefile_ibox.am
@ -1,8 +1,10 @@
+EXTRA_DIST += ibox/module.desktop.in \
+ibox/e-module-ibox.edj
+if USE_MODULE_IBOX
 iboxdir = $(MDIR)/ibox
 ibox_DATA = ibox/e-module-ibox.edj \
 	    ibox/module.desktop

-EXTRA_DIST += $(ibox_DATA)

 iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH)
 iboxpkg_LTLIBRARIES = ibox/module.la
@ -11,6 +13,7 @@ ibox_module_la_SOURCES = ibox/e_mod_main.c \
 			 ibox/e_mod_main.h \
 			 ibox/e_mod_config.c

-.PHONY: ibox install-ibox
+PHONIES += ibox install-ibox
 ibox: $(iboxpkg_LTLIBRARIES) $(ibox_DATA)
 install-ibox: install-iboxDATA install-iboxpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-bluetooth.am
+++ b/src/modules/Makefile_illume-bluetooth.am
@ -1,14 +1,17 @@
+EXTRA_DIST += illume-bluetooth/module.desktop.in \
+illume-bluetooth/e-module-illume-bluetooth.edj
+if USE_MODULE_ILLUME2
 illume_bluetoothdir = $(MDIR)/illume-bluetooth
 illume_bluetooth_DATA = illume-bluetooth/e-module-illume-bluetooth.edj \
 			illume-bluetooth/module.desktop

-EXTRA_DIST += $(illume_bluetooth_DATA)

 illume_bluetoothpkgdir = $(MDIR)/illume-bluetooth/$(MODULE_ARCH)
 illume_bluetoothpkg_LTLIBRARIES = illume-bluetooth/module.la

 illume_bluetooth_module_la_SOURCES = illume-bluetooth/e_mod_main.c

-.PHONY: illume_bluetooth install-illume_bluetooth
+PHONIES += illume_bluetooth install-illume_bluetooth
 illume_bluetooth: $(illume_bluetoothpkg_LTLIBRARIES) $(illume_bluetooth_DATA)
 install-illume_bluetooth: install-illume_bluetoothDATA install-illume_bluetoothpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-home-toggle.am
+++ b/src/modules/Makefile_illume-home-toggle.am
@ -1,14 +1,17 @@
+EXTRA_DIST += illume-home-toggle/module.desktop.in \
+illume-home-toggle/e-module-illume-home-toggle.edj
+if USE_MODULE_ILLUME2
 illume_home_toggledir = $(MDIR)/illume-home-toggle
 illume_home_toggle_DATA = illume-home-toggle/e-module-illume-home-toggle.edj \
 			  illume-home-toggle/module.desktop

-EXTRA_DIST += $(illume_home_toggle_DATA)

 illume_home_togglepkgdir = $(MDIR)/illume-home-toggle/$(MODULE_ARCH)
 illume_home_togglepkg_LTLIBRARIES = illume-home-toggle/module.la

 illume_home_toggle_module_la_SOURCES = illume-home-toggle/e_mod_main.c

-.PHONY: illume_home_toggle install-illume_home_toggle
+PHONIES += illume_home_toggle install-illume_home_toggle
 illume_home_toggle: $(illume_home_togglepkg_LTLIBRARIES) $(illume_home_toggle_DATA)
 install-illume_home_toggle: install-illume_home_toggleDATA install-illume_home_togglepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-home.am
+++ b/src/modules/Makefile_illume-home.am
@ -1,8 +1,10 @@
+EXTRA_DIST += illume-home/module.desktop.in \
+illume-home/e-module-illume-home.edj
+if USE_MODULE_ILLUME2
 illume_homedir = $(MDIR)/illume-home
 illume_home_DATA = illume-home/e-module-illume-home.edj \
 		   illume-home/module.desktop

-EXTRA_DIST += $(illume_home_DATA)

 illume_homepkgdir = $(MDIR)/illume-home/$(MODULE_ARCH)
 illume_homepkg_LTLIBRARIES = illume-home/module.la
@ -14,6 +16,7 @@ illume_home_module_la_SOURCES = illume-home/e_mod_main.c \
 				illume-home/e_busycover.c \
 				illume-home/e_busycover.h

-.PHONY: illume_home install-illume_home
+PHONIES += illume_home install-illume_home
 illume_home: $(illume_homepkg_LTLIBRARIES) $(illume_home_DATA)
 install-illume_home: install-illume_homeDATA install-illume_homepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-indicator.am
+++ b/src/modules/Makefile_illume-indicator.am
@ -1,8 +1,9 @@
+EXTRA_DIST += illume-indicator/module.desktop.in \
+illume-indicator/e-module-illume-indicator.edj
+if USE_MODULE_ILLUME2
 illume_indicatordir = $(MDIR)/illume-indicator
 illume_indicator_DATA = illume-indicator/e-module-illume-indicator.edj \
 			illume-indicator/module.desktop
-EXTRA_DIST += illume-indicator/module.desktop.in \
-	      illume-indicator/e-module-illume-indicator.edj

 illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH)
 illume_indicatorpkg_LTLIBRARIES = illume-indicator/module.la
@ -21,6 +22,7 @@ endif

 illume_indicator_module_la_LIBADD = @ENOTIFY_LIBS@

-.PHONY: illume_indicator install-illume_indicator
+PHONIES += illume_indicator install-illume_indicator
 illume_indicator: $(illume_indicatorpkg_LTLIBRARIES) $(illume_indicator_DATA)
 install-illume_indicator: install-illume_indicatorDATA install-illume_indicatorpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-kbd-toggle.am
+++ b/src/modules/Makefile_illume-kbd-toggle.am
@ -1,14 +1,17 @@
+EXTRA_DIST += illume-kbd-toggle/module.desktop.in \
+illume-kbd-toggle/e-module-illume-kbd-toggle.edj
+if USE_MODULE_ILLUME2
 illume_kbd_toggledir = $(MDIR)/illume-kbd-toggle
 illume_kbd_toggle_DATA = illume-kbd-toggle/e-module-illume-kbd-toggle.edj \
 			 illume-kbd-toggle/module.desktop

-EXTRA_DIST += $(illume_kbd_toggle_DATA)

 illume_kbd_togglepkgdir = $(MDIR)/illume-kbd-toggle/$(MODULE_ARCH)
 illume_kbd_togglepkg_LTLIBRARIES = illume-kbd-toggle/module.la

 illume_kbd_toggle_module_la_SOURCES = illume-kbd-toggle/e_mod_main.c

-.PHONY: illume_kbd_toggle install-illume_kbd_toggle
+PHONIES += illume_kbd_toggle install-illume_kbd_toggle
 illume_kbd_toggle: $(illume_kbd_togglepkg_LTLIBRARIES) $(illume_kbd_toggle_DATA)
 install-illume_kbd_toggle: install-illume_kbd_toggleDATA install-illume_kbd_togglepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-keyboard.am
+++ b/src/modules/Makefile_illume-keyboard.am
@ -1,10 +1,29 @@
+EXTRA_DIST += illume-keyboard/e-module-illume-keyboard.edj \
+illume-keyboard/module.desktop.in \
+illume-keyboard/keyboards/ignore_built_in_keyboards \
+illume-keyboard/keyboards/Default.kbd \
+illume-keyboard/keyboards/alpha.png \
+illume-keyboard/keyboards/Numbers.kbd \
+illume-keyboard/keyboards/numeric.png \
+illume-keyboard/keyboards/Terminal.kbd \
+illume-keyboard/keyboards/qwerty.png \
+illume-keyboard/keyboards/up.png \
+illume-keyboard/keyboards/down.png \
+illume-keyboard/keyboards/left.png \
+illume-keyboard/keyboards/right.png \
+illume-keyboard/keyboards/shift.png \
+illume-keyboard/keyboards/tab.png \
+illume-keyboard/keyboards/enter.png \
+illume-keyboard/keyboards/backspace.png \
+illume-keyboard/dicts/English_US.dic \
+illume-keyboard/dicts/English_US_Small.dic
+
+
+if USE_MODULE_ILLUME2
 illume_keyboarddir = $(MDIR)/illume-keyboard
 illume_keyboard_DATA = illume-keyboard/e-module-illume-keyboard.edj \
 		       illume-keyboard/module.desktop

-EXTRA_DIST += illume-keyboard/e-module-illume-keyboard.edj \
-	      illume-keyboard/module.desktop.in
-

 # keyboards
 illumekeyboardsdir = $(MDIR)/illume-keyboard/keyboards
@ -24,14 +43,12 @@ illumekeyboards_DATA = illume-keyboard/keyboards/ignore_built_in_keyboards \
 		       illume-keyboard/keyboards/enter.png \
 		       illume-keyboard/keyboards/backspace.png

-EXTRA_DIST += $(illumekeyboards_DATA)

 # dicts
 illumedictsdir = $(MDIR)/illume-keyboard/dicts
 illumedicts_DATA = illume-keyboard/dicts/English_US.dic \
 		   illume-keyboard/dicts/English_US_Small.dic

-EXTRA_DIST += $(illumedicts_DATA)


 illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH)
@ -51,6 +68,7 @@ illume_keyboard_module_la_SOURCES = illume-keyboard/e_mod_main.c \
 				    illume-keyboard/e_mod_config.h

 # TODO: incomplete
-.PHONY: illume_keyboard install-illume_keyboard
+PHONIES += illume_keyboard install-illume_keyboard
 illume_keyboard: $(illume_keyboardpkg_LTLIBRARIES) $(illume_keyboard_DATA)
 install-illume_keyboard: install-illume_keyboardDATA install-illume_keyboardpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-mode-toggle.am
+++ b/src/modules/Makefile_illume-mode-toggle.am
@ -1,14 +1,17 @@
+EXTRA_DIST += illume-mode-toggle/module.desktop.in \
+illume-mode-toggle/e-module-illume-mode-toggle.edj
+if USE_MODULE_ILLUME2
 illume_mode_toggledir = $(MDIR)/illume-mode-toggle
 illume_mode_toggle_DATA = illume-mode-toggle/e-module-illume-mode-toggle.edj \
 			 illume-mode-toggle/module.desktop

-EXTRA_DIST += $(illume_mode_toggle_DATA)

 illume_mode_togglepkgdir = $(MDIR)/illume-mode-toggle/$(MODULE_ARCH)
 illume_mode_togglepkg_LTLIBRARIES = illume-mode-toggle/module.la

 illume_mode_toggle_module_la_SOURCES = illume-mode-toggle/e_mod_main.c

-.PHONY: illume_mode_toggle install-illume_mode_toggle
+PHONIES += illume_mode_toggle install-illume_mode_toggle
 illume_mode_toggle: $(illume_mode_togglepkg_LTLIBRARIES) $(illume_mode_toggle_DATA)
 install-illume_mode_toggle: install-illume_mode_toggleDATA install-illume_mode_togglepkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume-softkey.am
+++ b/src/modules/Makefile_illume-softkey.am
@ -1,10 +1,10 @@
+EXTRA_DIST += illume-softkey/module.desktop.in \
+illume-softkey/e-module-illume-softkey.edj
+if USE_MODULE_ILLUME2
 illume_softkeydir = $(MDIR)/illume-softkey
 illume_softkey_DATA = illume-softkey/e-module-illume-softkey.edj \
 		      illume-softkey/module.desktop

-EXTRA_DIST += illume-softkey/e-module-illume-softkey.edj \
-	      illume-softkey/module.desktop.in
-

 illume_softkeypkgdir = $(MDIR)/illume-softkey/$(MODULE_ARCH)
 illume_softkeypkg_LTLIBRARIES = illume-softkey/module.la
@ -16,6 +16,7 @@ illume_softkey_module_la_SOURCES = illume-softkey/e_mod_main.c \
 				   illume-softkey/e_mod_config.c \
 				   illume-softkey/e_mod_config.h

-.PHONY: illume_softkey install-illume_softkey
+PHONIES += illume_softkey install-illume_softkey
 illume_softkey: $(illume_softkeypkg_LTLIBRARIES) $(illume_softkey_DATA)
 install-illume_softkey: install-illume_softkeyDATA install-illume_softkeypkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_illume2.am
+++ b/src/modules/Makefile_illume2.am
@ -1,14 +1,14 @@
+EXTRA_DIST += illume2/module.desktop.in \
+illume2/e-module-illume2.edj \
+illume2/keyboards/ignore_built_in_keyboards
+if USE_MODULE_ILLUME2
 illume2dir = $(MDIR)/illume2
 illume2_DATA = illume2/e-module-illume2.edj \
 	       illume2/module.desktop

-EXTRA_DIST += illume2/e-module-illume2.edj \
-	      illume2/module.desktop.in
-
 # keyboards
 illume2keyboardsdir = $(MDIR)/illume2/keyboards
 illume2keyboards_DATA = illume2/keyboards/ignore_built_in_keyboards
-EXTRA_DIST += $(illume2keyboards_DATA)

 # policies
 ## illume
@ -53,6 +53,7 @@ illume2_module_la_SOURCES = illume2/e_mod_main.c \
 			    illume2/e_mod_config.c

 # TODO: incomplete
-.PHONY: illume2 install-illume2
+PHONIES += illume2 install-illume2
 illume2: $(illume2pkg_LTLIBRARIES) $(illume2_DATA)
 install-illume2: install-illume2DATA install-illume2pkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_mixer.am
+++ b/src/modules/Makefile_mixer.am
@ -1,8 +1,10 @@
+EXTRA_DIST += mixer/module.desktop.in \
+mixer/e-module-mixer.edj
+if USE_MODULE_MIXER
 mixerdir = $(MDIR)/mixer
 mixer_DATA = mixer/e-module-mixer.edj \
 	     mixer/module.desktop

-EXTRA_DIST += $(mixer_DATA)

 mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
 mixerpkg_LTLIBRARIES = mixer/module.la
@ -38,6 +40,7 @@ mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@
 mixer_module_la_LIBADD += @ENOTIFY_LIBS@
 endif

-.PHONY: mixer install-mixer
+PHONIES += mixer install-mixer
 mixer: $(mixerpkg_LTLIBRARIES) $(mixer_DATA)
 install-mixer: install-mixerDATA install-mixerpkgLTLIBRARIES
+endif
--- a/src/modules/Makefile_msgbus.am
+++ b/src/modules/Makefile_msgbus.am
@ -1,8 +1,10 @@
+EXTRA_DIST += msgbus/module.desktop.in \
+msgbus/e-module-msgbus.edj
+if USE_MODULE_MSGBUS
 msgbusdir = $(MDIR)/msgbus
 msgbus_DATA = msgbus/e-module-msgbus.edj \
 	      msgbus/module.desktop

-EXTRA_DIST += $(msgbus_DATA)

 msgbuspkgdir = $(MDIR)/msgbus/$(MODULE_ARCH)
 msgbuspkg_LTLIBRARIES = msgbus/module.la
@ -13,6 +15,7 @@ msgbus_module_la_SOURCES = msgbus/e_mod_main.h \
 			   msgbus/msgbus_desktop.c \
 			   msgbus/msgbus_lang.c

-.PHONY: msgbus install-msgbus
+PHONIES += msgbus install-msgbus
 msgbus: $(msgbuspkg_LTLIBRARIES) $(msgbus_DATA)
 install-msgbus: install-msgbusDATA install-msgbuspkgLTLIBRARIES
+endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Carsten Haitzler	d884770f2d	Revert "rename pager theme stuff to pager_plain to match current elm" This reverts commit `4bca1ed0ef`. no - this breaks theme api. AGAIN ... like e18. see email to e-devel.	2014-09-11 16:29:00 +09:00
Mike Blumenkrantz	be2a592fea	18.9 release	2014-09-10 09:27:18 -04:00
Mike Blumenkrantz	4bca1ed0ef	rename pager theme stuff to pager_plain to match current elm	2014-09-10 09:26:56 -04:00
maxerba	9070d1c9ae	Updating esperanto and french translation	2014-08-29 14:47:34 +02:00
Mike Blumenkrantz	82d43487cc	bugfix: don't save mime info when opening .desktop files fix T1421	2014-07-16 10:49:46 -04:00
Wonguk Jeong	4b0f330546	bugfix: desktop_editor: selecting exe bug fix Summary: IFDUP source and destination were passed conversely fixes T1351 Test Plan: setting -> apps -> personal app launcher -> add -> open desktop editor -> open file selector -> select file -> check the exec field Reviewers: raster, zmike Subscribers: cedric, seoz Maniphest Tasks: T1351 Differential Revision: https://phab.enlightenment.org/D1189	2014-07-16 10:49:44 -04:00
Sebastian Dransfeld	325eaf76a7	e-xdg: augment XDG_CONFIG_DIRS as well (cherry picked from commit `2247fab472`) Signed-off-by: Thanatermesis <thanatermesis@gmail.com>	2014-06-12 16:42:35 +02:00
Sebastian Dransfeld	5d1e33351e	e: rename applications menu to fit xdg menu spec (cherry picked from commit `3b899f44fe`) Conflicts: data/etc/Makefile.mk	2014-06-12 16:41:56 +02:00
Sebastian Dransfeld	a2b3c6c837	e: set XDG_MENU_PREFIX so menus get merged (cherry picked from commit `edf3f90ca3`) Signed-off-by: Thanatermesis <thanatermesis@gmail.com>	2014-06-12 16:41:00 +02:00
Stefan Schmidt	ae193201de	po: Fix copy and paste error in Esperanto po file @fix Conflicts: po/eo.po	2014-06-10 11:58:44 +02:00
Stefan Schmidt	7b1b22f10f	po: Set initial values for Language and Language-Team Seems to be needed nowadays. Fixes our builds on jenkins. @fix	2014-06-10 11:18:49 +02:00
maxerba	db3d9a647b	Updating catalan translation	2014-06-06 13:28:58 +02:00
Carlos Rafael Giani	590eb392f1	bugfix: Fix buffer overflow in desk_show. Was the wrong structure type which caused writing after the allocated size and was generally bad and wrong. Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>	2014-06-01 15:13:25 +01:00
maxerba	0f1335f72d	Updating galician, lithuanian and turkish translations	2014-05-26 21:49:49 +02:00
Thanatermesis	384a9ad489	Esperanto: missing entry on wizard from Intl emodule The languages emodule included an extra Esperanto (eo_US.UTF-8) entry that was missing in the wizard list. Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com>	2014-05-22 19:58:40 -04:00
maxerba	c7860addde	Updating translations	2014-05-19 22:42:41 +02:00
Mike Blumenkrantz	7ff6901a9b	18.8 release	2014-05-12 03:57:36 -04:00
Mike Blumenkrantz	adfd1f331c	bugfix: screenshot now displays a helpful error message when it fails now that larger xinerama setups are getting more common, it's also the case that shm creation is more likely to fail due to SHMMAX defaults only working on displays smaller than than 8,388,609 total pixels. in this case, we print a helpful error message so the user can (optionally) increase SHMMAX	2014-05-09 10:47:22 -04:00
Mike Blumenkrantz	f5a9286752	bugfix: reset scanners/sorters and decrement busy state on efm path set no more arbitrarily loading file icons from other directories into the current view, mmk?	2014-05-08 17:07:45 -04:00
Mike Blumenkrantz	20b00d29a5	bugfix: reset efm icon image/text/state after applying even/odd fix T1222	2014-05-08 17:07:40 -04:00
Mike Blumenkrantz	a8af00aeb6	bugfix: fix syscon button signals fix T1155	2014-05-08 17:07:25 -04:00
Mike Blumenkrantz	ecafb752d8	bugfix: fix winlist alignment fix T1215	2014-05-08 17:07:14 -04:00
Daniel Kolesa	80f08a2710	resizeble -> resizable	2014-05-08 17:02:18 -04:00
Mike Blumenkrantz	3597a8cafa	bugfix: fix obviously-wrong winlist animator deletion fix T1215	2014-05-08 17:01:49 -04:00
Mike Blumenkrantz	3fb1bf05bf	bugfix: appindicator service name parsing now stringshares correctly fix T811	2014-05-08 17:01:11 -04:00
Mike Blumenkrantz	8f022542d1	> be in 2013 > still using sprintf	2014-05-08 17:01:05 -04:00
Mike Blumenkrantz	e42762d1ed	bugfix: fix systray appindicator icon loading fix T811	2014-05-08 17:00:57 -04:00
Mike Blumenkrantz	6869c05e3b	18.7 release	2014-04-14 07:08:10 -04:00
Mike Blumenkrantz	750cb40ed7	bugfix: unify temp module temperature_get_bus_files() functions CID 1039874	2014-04-04 14:52:00 -04:00
Mike Blumenkrantz	da295af384	bugfix: check notification icon size correctly CID 1039875	2014-04-04 14:43:01 -04:00
Mike Blumenkrantz	a17866ede6	bugfix: correctly check evry trigger matches CID 1039880	2014-04-04 14:15:42 -04:00
Mike Blumenkrantz	63a144ff32	bugfix: comp config dialog correctly detects effects disabled/fast states CID 1039957, 1039956	2014-04-04 13:57:00 -04:00
Mike Blumenkrantz	570651635a	bugfix: efm current .desktop fetching now returns the right .desktop fix T792	2014-03-28 12:23:26 -04:00
Mike Blumenkrantz	926ebca4bb	bugfix: swallow efm background objects after applying theme fix T792	2014-03-28 12:23:26 -04:00
Mike Blumenkrantz	95f99123b4	stringshare_replace in fwin: it exists for a reason, stop using macros ffs	2014-03-28 12:23:26 -04:00
Mike Blumenkrantz	5b82aa30b8	bugfix: ibar now scrolls correctly during drags fix T794	2014-03-28 12:23:26 -04:00
Stefan Schmidt	c4b4d2ed58	music-control: Do not leak the allocated metadata strings Fix for `ca07e7d505` Thanks are going to Davide Andreoli for spotting it.	2014-03-28 10:56:29 +01:00
Mike Blumenkrantz	b0458b0137	set border zone before using it	2014-03-27 18:32:19 -04:00
Mike Blumenkrantz	94f7b5efc2	bugfix: no longer place windows at 0,0 during restart fix T1107	2014-03-27 09:20:23 -04:00
Stefan Schmidt	f91f256817	bugfix: music_control: Use correct markup for metadata text. We piped the plain metadata text to edje TEXTBLOCK which might interpret some of the characters as markup. Better convert it to the correct markup first. The actual bug case was a & in the metadata cut off the rest of the text. Now we get the correct &amp before sending it of to edje. Fixes T1061	2014-03-27 12:53:06 +01:00
Mike Blumenkrantz	82d38bced8	18.6 release	2014-03-23 22:30:24 -04:00
Mike Blumenkrantz	d9b2f75abf	bugfix: wl_desktop_shell builds out of source tree fix T1115	2014-03-23 10:11:11 -04:00
Mike Blumenkrantz	49ef693cef	bugfix: get entry width based on viewport size, not entry size things like icon properties dialog now fit on a 4k monitor	2014-03-17 12:24:27 -04:00
Mike Blumenkrantz	8404615e3b	set delete_requested = 0 on hide `ad6aa3db71`	2014-03-14 11:23:19 -04:00
Mike Blumenkrantz	3268c5d535	remove unused var	2014-03-14 09:57:15 -04:00
Mike Blumenkrantz	bc0adb5710	bugfix: fix hiding of windows when delete is requested fix T1063	2014-03-14 09:56:14 -04:00
Mike Blumenkrantz	36fb654e9d	bugfix: don't deref teamwork pointer after null check CID 1040134	2014-03-13 13:08:00 -04:00
Mike Blumenkrantz	baa1e25d2a	bugfix: don't deref possibly-null value in mouse bindings CID 1040138	2014-03-13 13:06:38 -04:00
Mike Blumenkrantz	3788c69b09	bugfix: correctly calculate minimum flowlayout rows CID 1132740	2014-03-13 12:45:35 -04:00
Mike Blumenkrantz	4bfa007ec0	bugfix: efm_op no longer tries to close invalid fds during delete ops CID 1132741	2014-03-13 12:42:33 -04:00
Mike Blumenkrantz	d5954758d5	bugfix: don't use external log domain in systray CID 1132742	2014-03-13 12:40:52 -04:00
Mike Blumenkrantz	f9e289e2bf	bugfix: don't use external log domain in music player CID 1132743	2014-03-13 12:38:48 -04:00
Mike Blumenkrantz	1599672d87	bugfix: don't crash when saving screenshots with no file extension CID 1132744	2014-03-13 12:36:25 -04:00
Mike Blumenkrantz	cd6b8bb0a2	bugfix: don't crash on possibly-null gadman bg string extensions CID 1132749	2014-03-13 12:36:09 -04:00
Mike Blumenkrantz	496fc8d51b	bugfix: check for unicode string end in client menu CID 1186203	2014-03-13 11:52:42 -04:00
Mike Blumenkrantz	c032a79322	bugfix: don't crash when passing NULL desk to e_border_under_pointer_get CID 1186204	2014-03-13 11:48:25 -04:00
Mike Blumenkrantz	c39641c27c	bugfix: set connman pending.disconnect when disconnecting a service	2014-03-13 11:25:42 -04:00
Mike Blumenkrantz	9d88dcdcbe	bugfix: don't iterate with or access freed pointer in comp match dialog CID 1039740	2014-03-13 11:21:58 -04:00
Mike Blumenkrantz	a0cdb8a715	bugfix: ensure use of non-garbage values for menu item icon placeholders CID 1039769, 1039768	2014-03-13 11:11:26 -04:00
Mike Blumenkrantz	1b752ba5eb	bugfix: use more descriptive + accurate buffer size in batget iterator CID 1039801	2014-03-13 11:02:22 -04:00
Mike Blumenkrantz	dfa47b2b7d	bugfix: prevent out of bounds access in systray theme setup CID 1039843	2014-03-13 10:54:29 -04:00
Mike Blumenkrantz	baf0102007	bugfix: prevent out of bounds write in e_intl_locale_parts_get() CIDs 1039848, 1039847	2014-03-13 10:47:57 -04:00
Mike Blumenkrantz	0c4ebfa350	bugfix: ensure null termination of string in xsettings config CID 1039967	2014-03-13 10:43:38 -04:00
Mike Blumenkrantz	e7057f7cae	bugfix: dim/undim actions don't require acpi triggers fix T1067	2014-03-09 23:34:42 -04:00
Mike Blumenkrantz	a0b62bedbd	18.5 release	2014-03-04 09:01:32 -05:00
Tom Hacohen	138e4b4c92	bugfix: Fix selection of the standard profile in wizard. There was a bug there, that caused the one after the standard to be selected, instead of the standard one. This was caused because directories and the default profile were not properly ignored.	2014-03-04 12:13:29 +00:00
Mike Blumenkrantz	dd1406e407	remove another elm 1.8 requirement	2014-03-03 17:38:55 -05:00
Mike Blumenkrantz	9d3363d6ae	bugfix: pointer warp speed config slider correctly detects changed state fix T1020	2014-02-26 11:08:20 -05:00
Mike Blumenkrantz	551729ae53	bugfix: set border starting geometry from initial zone fix T1018	2014-02-25 10:01:07 -05:00
Mike Blumenkrantz	c898447e8f	bugfix: don't use raise stack for iterating borders	2014-02-21 17:57:05 -05:00
Chris Michael	fb23f86ce4	bugfix: Fix wl_desktop_shell compiler warning for Mike The keys array stores keys as unsigned int, so with a little bit of casting voodoo, we can avoid the nasty compiler warning messages about void pointers used in arithmetic. Signed-off-by: Chris Michael <devilhorns@comcast.net>	2014-02-21 17:22:57 -05:00
Mike Blumenkrantz	13c7adeb46	bugfix: evry string matching now handles UTF8 T152	2014-02-21 17:22:53 -05:00
Mike Blumenkrantz	d8f04b43b6	bugfix: remove efm nav SELF_RENAME handler this seems to be called completely erroneously and is worthless since all it does is trigger random directory changes T892	2014-02-20 12:48:16 -05:00
Mike Blumenkrantz	5800269e1d	better fix for 1bbcf1573a6024ae9882c2bff73afb6ea1ff2716: exec client removal	2014-02-18 06:58:08 -05:00
Mike Blumenkrantz	24305ac456	18.4 release	2014-02-17 17:31:03 -05:00
Mike Blumenkrantz	1bbcf1573a	bugfix: unref client when removing from exec if exec is deleted fixes a race condition where client would never be freed when closing lots of windows simultaneously	2014-02-17 17:31:03 -05:00
Mike Blumenkrantz	b1e0696891	bugfix: only remove an ibar no-order icon if ALL icon's clients are skip T953	2014-02-14 16:00:56 -05:00
Mike Blumenkrantz	5258dbe53a	break when finding a non-skip new ibar exec	2014-02-14 15:59:51 -05:00
Mike Blumenkrantz	c97277f603	bugfix: no more crashing when deleting entry widgets	2014-02-14 14:12:59 -05:00
Mike Blumenkrantz	29bcd22767	bugfix: adding/changing comp match window types is now possible	2014-02-14 13:08:09 -05:00
Mike Blumenkrantz	a0f9dd8d0b	bugfix: comp match adding once again functional	2014-02-14 12:46:05 -05:00
Mike Blumenkrantz	44a04c8813	feature: check udisks1 DevicePresentationHide flag from D505	2014-02-06 13:16:27 -05:00
Mike Blumenkrantz	bc58bc39e2	bugfix: race condition when deleting clients and their e_exec this occurred occasionally when a client was the last one on a phony exe	2014-02-05 20:56:57 -05:00
Mike Blumenkrantz	d767a51542	bugfix: building non-default modules from dist no longer fails T869 PS. fuck this build system.	2014-02-04 14:10:54 -05:00
Mike Blumenkrantz	f7d6dc2106	remove conf2 the rest of the way...	2014-02-04 13:35:08 -05:00
Mike Blumenkrantz	87b273d314	bugfix: initial client positioning with multiple monitors improved	2014-02-03 13:06:47 -05:00
Mike Blumenkrantz	7870eda74d	bugfix: screen limits policy no longer breaks X client positioning	2014-02-03 12:52:16 -05:00
Mike Blumenkrantz	ae385f7e98	bugfix: hide drag icons after dnd operation ends T797	2014-02-03 11:07:21 -05:00
Mike Blumenkrantz	8c73c7919a	bugfix: comp matching correctly edits in place and doesn't crash	2014-01-30 10:45:24 -05:00
Daniel Kolesa	0d5bc6a9d4	enlightenment: fix menu placement	2014-01-30 12:21:19 +00:00
Mike Blumenkrantz	03cf4568f6	more 18.3 NEWS updates	2014-01-27 11:32:50 -05:00
Mike Blumenkrantz	90f8e201f4	bugfix: use config_type to set parent profile when resetting bindings I added this a long time ago to fix binding resets and forgot to add the support in to binding resets. genius. T642	2014-01-27 11:30:40 -05:00
Mike Blumenkrantz	da9be060c9	18.3 version bump	2014-01-27 11:29:12 -05:00
Mike Blumenkrantz	6390d4fad4	18.3 news	2014-01-27 11:29:12 -05:00
Daniel Juyung Seo	6924e31fc8	bugfix: fix slider up/down key wrong direction bug. Up/Down key worked in the opposite directions from expected.	2014-01-28 00:18:49 +09:00
Carsten Haitzler	74fa647053	e sys - if logout has trouble - resume so user can see dialog	2014-01-24 09:30:52 -05:00
Mike Blumenkrantz	030ade5ad3	bugfix: remove drop handlers from responsive hash on deletion	2014-01-22 16:10:01 -05:00
Mike Blumenkrantz	cce603ea02	bugfix: efm dnd to external windows deleting the drag at this point deletes the window which owns the current selection, guaranteeing that the operation will fail	2014-01-22 16:09:56 -05:00
Mike Blumenkrantz	a581f5566f	bugfix: multiple drop handlers using same window no longer overwrite each other	2014-01-22 16:09:49 -05:00
Mike Blumenkrantz	d01d2f1b3b	no longer require elm < 1.9	2014-01-21 17:13:35 -05:00
Mike Blumenkrantz	084f447477	bugfix: backlight double comparison now less likely to fail	2014-01-21 17:13:24 -05:00
Mike Blumenkrantz	c7d344eaa1	bugfix: unset video flag when failing to find teamwork media	2014-01-14 23:38:32 -05:00
Carsten Haitzler	2e73c75dfa	resolve unhandled null shape pointer in some cases cw->shape is checked, others not. chekc in all cases. this should fix T742	2014-01-14 23:38:32 -05:00
maxerba	a8e4d74a15	Updating serbian translation	2014-01-05 21:42:55 +01:00
maxerba	11ce0d978b	Updating serbian translation	2014-01-05 15:56:19 +01:00
maxerba	5272d2d825	Updating serbian and italian translations	2014-01-04 01:35:55 -05:00
Mike Blumenkrantz	a64e4bea2c	bugfix: store opacity in remembers like we do in the other remember edd	2014-01-01 15:40:09 -05:00
Mike Blumenkrantz	3fb7879677	dear $EDITOR, thanks for removing that newline in the includes. I didn't need it, and it didn't break anything. no wait, fuck you. sincerely, zmike	2014-01-01 14:33:18 -05:00
Mike Blumenkrantz	bc648476b3	bugfix: no more crashes when being a jerk with Navigate menu scrolling this really only happens if you're TRYING to break things, but don't assume parent menu item is active item since it might not be	2014-01-01 14:26:58 -05:00
Mike Blumenkrantz	dc7d37102f	bugfix: only set uid for eeze mounting of disks which are not native linux fstypes T484	2013-12-31 14:12:11 -05:00
Carsten Haitzler	0aca731068	livethumb - fix problem where e canvas list didnt del the livethumb ee	2013-12-31 12:50:16 +09:00
Mike Blumenkrantz	5c270197b5	NEWS for previous commit	2013-12-26 22:29:12 -05:00
Mike Blumenkrantz	d0ab5b335b	bugfix: startup splash now updates the version number more reliably e_init_show() sets its own strings now so they get set on existing objects instead of failing silently	2013-12-26 22:27:23 -05:00
Mike Blumenkrantz	b1067a9ca7	18.2 version	2013-12-26 18:01:23 -05:00
Mike Blumenkrantz	e189e478eb	NEWS updates	2013-12-26 18:01:03 -05:00
Mike Blumenkrantz	7484838fdc	bugfix: use the right directory for user themes	2013-12-26 18:00:03 -05:00
maxerba	454a733588	Updating portuguese translation	2013-12-26 17:59:57 -05:00
maxerba	e7a64b96ff	Updating serbian translation	2013-12-26 17:59:52 -05:00
Mike Blumenkrantz	cd2eb2cc0e	NEWS for previous commit	2013-12-24 20:35:28 -05:00
Mike Blumenkrantz	e7b92479c4	bugfix: check shot filename for actual file extension, not just extension string T684	2013-12-24 20:34:32 -05:00
Mike Blumenkrantz	ad030f17d2	NEWS for previous fix	2013-12-24 20:32:34 -05:00
Mike Blumenkrantz	2105d9f5a0	bugfix: infinite printing of SLEEP with release build T690	2013-12-24 20:32:29 -05:00
Mike Blumenkrantz	421bcc87a8	NEWS...	2013-12-23 19:04:35 -05:00
Mike Blumenkrantz	ee64a02ae1	18.1 release	2013-12-23 18:52:17 -05:00
Mike Blumenkrantz	16969f24dc	bugfix: delete mixer's pulse exe handler after it's started so desklock doesn't break	2013-12-23 14:01:17 -05:00
Mike Blumenkrantz	3594dd69d5	remove cl/news entries about conf2	2013-12-21 16:03:57 -05:00
Mike Blumenkrantz	10646449b1	E18.0 release	2013-12-21 16:01:04 -05:00
Mike Blumenkrantz	905db54414	fix mixer regression which broke non-pulseaudio support	2013-12-21 09:27:29 -05:00
Igor Murzov	4fd80bc236	Update russian translation	2013-12-21 04:00:32 +04:00
Igor Murzov	1f2cfda6dd	Add more messages to the pot	2013-12-21 03:38:42 +04:00
Mike Blumenkrantz	723f1130b4	enable release build define	2013-12-20 17:34:47 -05:00
Mike Blumenkrantz	0492186b55	only set mouse-in focus if target window is not already the focused window T483 again	2013-12-20 15:50:53 -05:00
Mike Blumenkrantz	5a6dcf17f3	add separate elm version requirement elm versioning for stable series will be different than efl versioning, so these are not the same. also now that the theme for enlightenment is distributed with elementary, there may be (and is) a MAXIMUM usable version of elementary which will work with a given E version while I work to stabilize various api across the releases. as a result, e18 RELEASES will not be usable with elm >= 1.9 (current git and beyond). tl;dr: don't mix live versions with releases.	2013-12-20 10:50:40 -05:00
Mike Blumenkrantz	4bff603ccc	change version to 18.0, require efl+elementary 1.8.3	2013-12-20 10:14:49 -05:00