Menu
▾
▴
enlightenment-svn — SVN Commits Mailing List
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(281) |
Sep
(604) |
Oct
(993) |
Nov
(511) |
Dec
(520) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(476) |
Feb
(432) |
Mar
(524) |
Apr
(653) |
May
(393) |
Jun
(356) |
Jul
(329) |
Aug
(584) |
Sep
(683) |
Oct
(559) |
Nov
(690) |
Dec
(762) |
| 2010 |
Jan
(924) |
Feb
(912) |
Mar
(964) |
Apr
(859) |
May
(867) |
Jun
(593) |
Jul
(769) |
Aug
(1067) |
Sep
(1142) |
Oct
(1134) |
Nov
(1030) |
Dec
(691) |
| 2011 |
Jan
(822) |
Feb
(828) |
Mar
(791) |
Apr
(824) |
May
(799) |
Jun
(1039) |
Jul
(1035) |
Aug
(1121) |
Sep
(687) |
Oct
(852) |
Nov
(1138) |
Dec
(979) |
| 2012 |
Jan
(957) |
Feb
(893) |
Mar
(1265) |
Apr
(737) |
May
(1051) |
Jun
(1464) |
Jul
(1618) |
Aug
(1202) |
Sep
(1304) |
Oct
(1504) |
Nov
(1219) |
Dec
(1981) |
| 2013 |
Jan
(1566) |
Feb
(858) |
Mar
(83) |
Apr
(66) |
May
(9) |
Jun
(14) |
Jul
(13) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
|
From: Enlightenment S. <no-...@en...> - 2013-03-25 09:14:45
|
Log: try this size. Author: raster Date: 2013-03-25 02:14:37 -0700 (Mon, 25 Mar 2013) New Revision: 84459 Trac: http://trac.enlightenment.org/e/changeset/84459 Modified: trunk/web/www/p/about/terminology/en-body Modified: trunk/web/www/p/about/terminology/en-body =================================================================== --- trunk/web/www/p/about/terminology/en-body 2013-03-25 09:10:01 UTC (rev 84458) +++ trunk/web/www/p/about/terminology/en-body 2013-03-25 09:14:37 UTC (rev 84459) @@ -29,7 +29,7 @@ vacation in Thailand in June of 2012. So it is young and fresh, so it's not perfect, but it's getting there.</p> - <p><iframe width="640" height="480" src="http://youtu.be/ibPziLRGvkg?rel=0" frameborder="0" allowfullscreen></iframe></p> + <p><iframe width="672" height="560" src="http://www.youtube.com/embed/ibPziLRGvkg?rel=0" frameborder="0" allowfullscreen></iframe></p> <h3>What does it do?</h3> <p>It emulates a slightly extended vt100 with some extensions and |
|
From: Enlightenment S. <no-...@en...> - 2013-03-25 09:10:09
|
Log: try embed size that works? Author: raster Date: 2013-03-25 02:10:01 -0700 (Mon, 25 Mar 2013) New Revision: 84458 Trac: http://trac.enlightenment.org/e/changeset/84458 Modified: trunk/web/www/p/about/terminology/en-body Modified: trunk/web/www/p/about/terminology/en-body =================================================================== --- trunk/web/www/p/about/terminology/en-body 2013-03-25 08:59:45 UTC (rev 84457) +++ trunk/web/www/p/about/terminology/en-body 2013-03-25 09:10:01 UTC (rev 84458) @@ -29,7 +29,7 @@ vacation in Thailand in June of 2012. So it is young and fresh, so it's not perfect, but it's getting there.</p> - <p><iframe width="500" height="500" src="http://youtu.be/ibPziLRGvkg" frameborder="0" allowfullscreen></iframe></p> + <p><iframe width="640" height="480" src="http://youtu.be/ibPziLRGvkg?rel=0" frameborder="0" allowfullscreen></iframe></p> <h3>What does it do?</h3> <p>It emulates a slightly extended vt100 with some extensions and |
|
From: Enlightenment S. <no-...@en...> - 2013-03-25 08:59:52
|
Log: update terminology about. Author: raster Date: 2013-03-25 01:59:45 -0700 (Mon, 25 Mar 2013) New Revision: 84457 Trac: http://trac.enlightenment.org/e/changeset/84457 Modified: trunk/web/www/p/about/terminology/en-body Modified: trunk/web/www/p/about/terminology/en-body =================================================================== --- trunk/web/www/p/about/terminology/en-body 2013-03-24 12:43:46 UTC (rev 84456) +++ trunk/web/www/p/about/terminology/en-body 2013-03-25 08:59:45 UTC (rev 84457) @@ -25,18 +25,13 @@ </p></center> <h3>What is it?</h3> - <p>Terminology is a new terminal emulator. In fact as of the 12th - of July 2012, it is only 1 month old, so all you see here is the - result of some off-and-on work over approximately a month (so not - full-time effort). This is an indicator of what is possible to do - with EFL with some knowledge and effort in a fairly short space of - time. This time included having to learn how terminal emulation - works, pty's, escapes and so on and actually make a large selection - of terminal applications work, so it's not perfect, but it's - getting there.</p> + <p>Terminology is a new terminal emulator. It started life during a + vacation in Thailand in June of 2012. So it is young and fresh, so + it's not perfect, but it's getting there.</p> + <p><iframe width="500" height="500" src="http://youtu.be/ibPziLRGvkg" frameborder="0" allowfullscreen></iframe></p> + <h3>What does it do?</h3> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/V0C3Y7AFwIk" frameborder="0" allowfullscreen></iframe></p> <p>It emulates a slightly extended vt100 with some extensions and bling thrown in.</p> <p><ul> @@ -44,7 +39,7 @@ <li>Xterm 256 color escapes work</li> <li>Backgrounds (bitmap, scalable/vector, animated gif, videos)</li> <li>Transparency</li> - <li>Bitmap and scalable fonts</li> + <li>Bitmap and scalable fonts supported</li> <li>Themes for the layout and design</li> <li>URL, file path and email address detection and link-handling</li> <li>Inline display of link content</li> @@ -54,7 +49,18 @@ <li>Works directly in the linux framebuffer (fbcon)</li> <li>Can be finger/touch controlled</li> <li>Scan scale by UI scaling factors</li> - <li>Can render using OpenGL or OpenGL-ES2 (or not. not a requirement - just an option)<li> + <li>Can render using OpenGL or OpenGL-ES2 (not a requirement - just an option)</li> + <li>Can display inlined media content (images, video, documents)</li> + <li>Can do multiple "tabs"</li> + <li>Can do splitting into multiple panes</li> + <li>Block text selection</li> + <li>Drag and drop of text selections and links</li> + <li>Can stream media from URLs</li> + <li>Tab switcher has live thumbnail content</li> + <li>Single process, multiple windows/terminals support</li> + <li>Fast (gives urxvt a run for its money)</li> + <li>Themable visual bell</li> + <li>More...</li> </ul></p> <p>The above list of features and then then some work currently, with maybe some things not completely implemented yet. Much more @@ -65,62 +71,9 @@ ranging from the basic ones you'd expect, to things you never expected of a terminal.</p> - <p>There is a visual bell designed to get your attention. It's - totally able to be customized by the theme to do almost anything your - imagination desires.</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/BqFYIciDVjw" frameborder="0" allowfullscreen></iframe></p> - - <p>You can set a background (command-line only right now) that - can be anything you like. Far beyond most terminal emulators as - scalable vector graphics (PDF, PS and SVG) work, animated GIFs, Edje - files and of course even videos</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/iEJt-qfg0js" frameborder="0" allowfullscreen></iframe></p> - - <p>ANSI colors as well as the 256 mode Xterm colors are supported - for making sure your terminal text always looks bright and - interesting.</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/AD-BJThtNnc" frameborder="0" allowfullscreen></iframe></p> - - <p>You can change fonts and sizes on the fly, with bitmap fonts - supported (and shipped by default), as well as the usual scalable font - support you'd expect.</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/BYYfQrlXlcM" frameborder="0" allowfullscreen></iframe></p> - - <p>Links, full file paths and email addresses are "detected" in - the terminal when your mouse overs over them, providing a nice - underline allowing you to click and either have an external - application handle the link, or have Terminology handle it internally - for your viewing pleasure.</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/xhfN_RkLNVI" frameborder="0" allowfullscreen></iframe></p> - - <p>There are even other handy options to customize on the fly and - be automatically saved for the next time you need them.</p> - <p><iframe width="420" height="315" src="http://www.youtube.com/embed/Y92mPVyQMwc" frameborder="0" allowfullscreen></iframe></p> - - <h3>Why use Terminology?</h3> - <p>If you like your terminals to look nice, then this is the - terminal for you. If you want to have a terminal that is - expanding usability by placing content right at your fingertips and - directly in-line without needing an external window popping up, then - this is for you. If you want the same terminal you know and love - to work in the framebuffer when away from X11, then this is for - you. The mouse even works, as does video and animation, framebuffer, X11 - or in Wayland. If you like a terminal that scrolls more than 10 - times faster than gnome-terminal, much faster than Xterm or Konsole - and as fast as URXVT, then this is for you. If you like to save - memory compared to the big-desktop terminals (gnome-terminal and - Konsole) then this is for you.</p> - - <p>This project is not complete. It's barely a month old, but it - has indications of where it will go. Try it out and see. Finally - Enlightenment will have a terminal worth of calling its own.</p> - <p>You can find the source at:</p> - <p><a href=http://trac.enlightenment.org/e/browser/trunk/terminology>here</a></p> + <p><a href=http://git.enlightenment.org/apps/terminology.git/>here</a></p> - <p>Or check out the code with:</p> - <pre>svn checkout http://svn.enlightenment.org/svn/e/trunk/terminology</pre> - <p>Of course you can show us that you like this application specifically by Flattring it :</p> <p><a class="FlattrButton" style="display:none;" href="http://www.enlightenment.org/p.php?p=about/terminology"></a><noscript><a href="http://flattr.com/thing/860395/Terminology" target="_blank"><img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" border="0" /></a></noscript></p> |
|
From: Enlightenment S. <no-...@en...> - 2013-03-24 12:44:08
|
Log: terminology 0.3. Author: raster Date: 2013-03-24 05:43:46 -0700 (Sun, 24 Mar 2013) New Revision: 84456 Trac: http://trac.enlightenment.org/e/changeset/84456 Modified: trunk/web/www/p/about/terminology/en-body Modified: trunk/web/www/p/about/terminology/en-body =================================================================== --- trunk/web/www/p/about/terminology/en-body 2013-03-22 15:44:00 UTC (rev 84455) +++ trunk/web/www/p/about/terminology/en-body 2013-03-24 12:43:46 UTC (rev 84456) @@ -20,8 +20,8 @@ <center><p> <?php blinkdl("i/dl.png", - "DOWNLOAD TERMINOLOGY 0.2", - "http://download.enlightenment.org/releases/terminology-0.2.0.tar.gz");?> + "DOWNLOAD TERMINOLOGY 0.3", + "http://download.enlightenment.org/releases/terminology-0.3.0.tar.gz");?> </p></center> <h3>What is it?</h3> |
|
From: Enlightenment S. <no-...@en...> - 2013-03-22 15:44:08
|
Log: sh-agent actually works now. Author: onefang Date: 2013-03-22 08:44:00 -0700 (Fri, 22 Mar 2013) New Revision: 84455 Trac: http://trac.enlightenment.org/e/changeset/84455 Modified: trunk/devs/onefang/build_efl.lua Modified: trunk/devs/onefang/build_efl.lua =================================================================== --- trunk/devs/onefang/build_efl.lua 2013-03-21 11:33:38 UTC (rev 84454) +++ trunk/devs/onefang/build_efl.lua 2013-03-22 15:44:00 UTC (rev 84455) @@ -80,6 +80,7 @@ 'keys', 'ninestime', 'phonebook', 'rage', 'shellementary', 'shotgun', 'sticky-notes', 'terminology', 'vigrid' } local exportedEnvVars = '' +local saEnvVars = '' local startTime = os.time() @@ -178,20 +179,24 @@ end +-- Recreate the temporary directory. +os.execute('rm -fr /tmp/eflBuild') +os.execute('mkdir /tmp/eflBuild') + printf("G'day %s, let's start with your SVN and git ssh key, a password might be needed.\n", USER) -os.execute('eval `ssh-agent -s` >/dev/null && ssh-add') +os.execute('eval `ssh-agent -s` >/dev/null && ssh-add && echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK\\nSSH_AGENT_PID=$SSH_AGENT_PID" >/tmp/eflBuild/sa') +-- Grab the ssh-agent variables for later. +for line in io.lines('/tmp/eflBuild/sa') do + saEnvVars = saEnvVars .. 'export ' .. line .. '; ' +end printf('Now we need your sudo password.\n') -os.execute('sudo echo "https://en.wikipedia.org/wiki/Pseudo_Echo Welcome to the 80\'s"') -- There was an aussie band called that. lol +os.execute('sudo echo "https://en.wikipedia.org/wiki/Pseudo_Echo Welcome to the 80\'s"') -- There was an aussie band called that. lol -- Build the compile environment. for i, var in ipairs(envVars) do exportedEnvVars = exportedEnvVars .. 'export ' .. var .. '; ' end --- Recreate the temporary directory. -os.execute('rm -fr /tmp/eflBuild') -os.execute('mkdir /tmp/eflBuild') - -- Get the git repo list. os.execute('cd /tmp/eflBuild && wget http://git.enlightenment.org/repos.txt') -- Evil hack so we get the proper ones listed first. The evil part is that alphabetical order just happens to work. For now. @@ -199,7 +204,7 @@ printf("Updating SVN, this might take a while.\n") -- TODO - Should do a check out if it does not exist, like git does below. -os.execute('cd SVN && svn update --accept theirs-conflict 2>&1 | tee /tmp/eflBuild/subversion.log') +os.execute(saEnvVars .. 'cd SVN && svn update --accept theirs-conflict 2>&1 | tee /tmp/eflBuild/subversion.log') local i = 1 printf("Updating git, this might take a while.\n") @@ -210,11 +215,11 @@ table.insert(searchPaths, i, 'GIT/' .. string.gsub(path, "/[^/]+$", "", 1)) i = i + 1 if not fileExists('GIT/' .. path .. '/.git/HEAD') then - os.execute('mkdir -p GIT/`dirname ' .. path .. '` && cd GIT/`dirname ' .. path .. '` && git clone ssh://gi...@gi.../' .. line .. ' 2>&1 | tee /tmp/eflBuild/git.log') + os.execute(saEnvVars .. 'mkdir -p GIT/`dirname ' .. path .. '` && cd GIT/`dirname ' .. path .. '` && git clone ssh://gi...@gi.../' .. line .. ' 2>&1 | tee /tmp/eflBuild/git.log') else printf('Updating %s\n', path); -- TODO - Should throw in a stash, check which branch we are on, etc. - os.execute('cd GIT/' .. path .. ' && git checkout master && git pull --rebase 2>&1 | tee /tmp/eflBuild/git.log') + os.execute(saEnvVars .. 'cd GIT/' .. path .. ' && git checkout master && git pull --rebase 2>&1 | tee /tmp/eflBuild/git.log') end end |
|
From: Enlightenment S. <no-...@en...> - 2013-03-21 11:33:49
|
Log: Migrated etrophy to git. Author: tasn Date: 2013-03-21 04:33:38 -0700 (Thu, 21 Mar 2013) New Revision: 84454 Trac: http://trac.enlightenment.org/e/changeset/84454 Removed: trunk/PROTO/etrophy/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-19 18:53:14
|
Log: more efx build tweaks Author: discomfitor Date: 2013-03-19 11:53:05 -0700 (Tue, 19 Mar 2013) New Revision: 84453 Trac: http://trac.enlightenment.org/e/changeset/84453 Modified: trunk/efx/configure.ac trunk/efx/efx.pc.in Modified: trunk/efx/configure.ac =================================================================== --- trunk/efx/configure.ac 2013-03-19 18:42:52 UTC (rev 84452) +++ trunk/efx/configure.ac 2013-03-19 18:53:05 UTC (rev 84453) @@ -64,10 +64,7 @@ AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AC_LIBTOOL_WIN32_DLL -define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])dnl -define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl -AC_PROG_LIBTOOL +LT_INIT([win32-dll]) # Compiler AC_PROG_CC @@ -75,14 +72,6 @@ # pkg-config PKG_PROG_PKG_CONFIG -# Check whether pkg-config supports Requires.private -if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then - pkgconfig_requires_private="Requires.private" -else - pkgconfig_requires_private="Requires" -fi -AC_SUBST([pkgconfig_requires_private]) - # doxygen program for documentation building EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) Modified: trunk/efx/efx.pc.in =================================================================== --- trunk/efx/efx.pc.in 2013-03-19 18:42:52 UTC (rev 84452) +++ trunk/efx/efx.pc.in 2013-03-19 18:53:05 UTC (rev 84453) @@ -9,4 +9,4 @@ Version: @VERSION@ Libs: -L${libdir} -lefx Cflags: -I${includedir}/efx-@VMAJ@ -@pkgconfig_requires_private@: @requirements_pc_efx@ +Requires.private: @requirements_pc_efx@ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-19 18:43:24
|
Log: some small efx autotools changes from a windows demon Author: discomfitor Date: 2013-03-19 11:42:52 -0700 (Tue, 19 Mar 2013) New Revision: 84452 Trac: http://trac.enlightenment.org/e/changeset/84452 Modified: trunk/efx/configure.ac trunk/efx/src/lib/Makefile.am Modified: trunk/efx/configure.ac =================================================================== --- trunk/efx/configure.ac 2013-03-19 14:16:06 UTC (rev 84451) +++ trunk/efx/configure.ac 2013-03-19 18:42:52 UTC (rev 84452) @@ -92,14 +92,6 @@ requirements_pc_efx="eina >= 1.1.999 eet >= 1.5.0 evas >= 1.1.999 ecore >= 1.1.999" AC_SUBST([requirements_pc_efx]) -EFL_EFX_BUILD="" -case "$host_os" in - mingw*) - EFL_EFX_BUILD="-DEFL_EFX_BUILD" - ;; -esac -AC_SUBST([EFL_EFX_BUILD]) - PKG_CHECK_MODULES([EFX], [${requirements_pc_efx}]) if test "x$want_tests" != "xno"; then @@ -139,16 +131,6 @@ ]) -### Checks for linker characteristics -lt_enable_auto_import="" -case "${host_os}" in - mingw*) - lt_enable_auto_import="-Wl,--enable-auto-import" - ;; -esac -AC_SUBST([lt_enable_auto_import]) - - ### Checks for library functions AC_FUNC_ALLOCA Modified: trunk/efx/src/lib/Makefile.am =================================================================== --- trunk/efx/src/lib/Makefile.am 2013-03-19 14:16:06 UTC (rev 84451) +++ trunk/efx/src/lib/Makefile.am 2013-03-19 18:42:52 UTC (rev 84452) @@ -3,7 +3,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -@EFL_EFX_BUILD@ \ +-DEFL_EFX_BUILD \ @EFX_CFLAGS@ lib_LTLIBRARIES = libefx.la @@ -23,7 +23,7 @@ efx_private.h libefx_la_LIBADD = @EFX_LIBS@ -lm -libefx_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ +libefx_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ includes_HEADERS = Efx.h includesdir = $(includedir)/efx-@VMAJ@ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-19 14:16:20
|
Log: Remove shotgun as it is now in Git git://git.enlightenment.org/devs/discomfitor/maelstrom.git Signed-off-by: Daniel Willmann <d.w...@sa...> Author: asdfuser Date: 2013-03-19 07:16:06 -0700 (Tue, 19 Mar 2013) New Revision: 84451 Trac: http://trac.enlightenment.org/e/changeset/84451 Removed: trunk/PROTO/shotgun/.gitignore trunk/PROTO/shotgun/AUTHORS trunk/PROTO/shotgun/COPYING trunk/PROTO/shotgun/COPYING-ICONS trunk/PROTO/shotgun/Makefile.am trunk/PROTO/shotgun/README trunk/PROTO/shotgun/THANKS trunk/PROTO/shotgun/TODO trunk/PROTO/shotgun/autogen.sh trunk/PROTO/shotgun/configure.ac trunk/PROTO/shotgun/data/Makefile.am trunk/PROTO/shotgun/data/shotgun-128x128.png trunk/PROTO/shotgun/data/shotgun-64x64.png trunk/PROTO/shotgun/data/shotgun.desktop trunk/PROTO/shotgun/data/shotgun.png trunk/PROTO/shotgun/data/theme/Makefile.am trunk/PROTO/shotgun/data/theme/arrows_both.png trunk/PROTO/shotgun/data/theme/arrows_pending_left.png trunk/PROTO/shotgun/data/theme/arrows_pending_right.png trunk/PROTO/shotgun/data/theme/arrows_rejected.png trunk/PROTO/shotgun/data/theme/default.edc trunk/PROTO/shotgun/data/theme/dialog_ok.png trunk/PROTO/shotgun/data/theme/logout.png trunk/PROTO/shotgun/data/theme/settings.png trunk/PROTO/shotgun/data/theme/status.png trunk/PROTO/shotgun/data/theme/useradd.png trunk/PROTO/shotgun/data/theme/userdel.png trunk/PROTO/shotgun/data/theme/useroffline.png trunk/PROTO/shotgun/data/theme/userunknown.png trunk/PROTO/shotgun/data/theme/x.png trunk/PROTO/shotgun/m4/ac_attribute.m4 trunk/PROTO/shotgun/shotgun.pc.in trunk/PROTO/shotgun/src/Makefile.am trunk/PROTO/shotgun/src/bin/Makefile.am trunk/PROTO/shotgun/src/bin/azy.c trunk/PROTO/shotgun/src/bin/chat.c trunk/PROTO/shotgun/src/bin/chat_image.c trunk/PROTO/shotgun/src/bin/contact.c trunk/PROTO/shotgun/src/bin/contact_list.c trunk/PROTO/shotgun/src/bin/dbus.c trunk/PROTO/shotgun/src/bin/eet.c trunk/PROTO/shotgun/src/bin/events.c trunk/PROTO/shotgun/src/bin/getpass_x.c trunk/PROTO/shotgun/src/bin/logging.c trunk/PROTO/shotgun/src/bin/login.c trunk/PROTO/shotgun/src/bin/main.c trunk/PROTO/shotgun/src/bin/settings.c trunk/PROTO/shotgun/src/bin/ui.c trunk/PROTO/shotgun/src/bin/ui.h trunk/PROTO/shotgun/src/bin/util.c trunk/PROTO/shotgun/src/include/Shotgun.h trunk/PROTO/shotgun/src/lib/Makefile.am trunk/PROTO/shotgun/src/lib/cdecode.c trunk/PROTO/shotgun/src/lib/cdecode.h trunk/PROTO/shotgun/src/lib/cencode.c trunk/PROTO/shotgun/src/lib/cencode.h trunk/PROTO/shotgun/src/lib/iq.c trunk/PROTO/shotgun/src/lib/login.c trunk/PROTO/shotgun/src/lib/md5.c trunk/PROTO/shotgun/src/lib/md5.h trunk/PROTO/shotgun/src/lib/messaging.c trunk/PROTO/shotgun/src/lib/presence.c trunk/PROTO/shotgun/src/lib/pugiconfig.hpp trunk/PROTO/shotgun/src/lib/pugixml.cpp trunk/PROTO/shotgun/src/lib/pugixml.hpp trunk/PROTO/shotgun/src/lib/sha1.c trunk/PROTO/shotgun/src/lib/sha1.h trunk/PROTO/shotgun/src/lib/sha1wrap.c trunk/PROTO/shotgun/src/lib/shotgun.c trunk/PROTO/shotgun/src/lib/shotgun_private.h trunk/PROTO/shotgun/src/lib/shotgun_utils.c trunk/PROTO/shotgun/src/lib/xml.cpp trunk/PROTO/shotgun/src/lib/xml.h trunk/PROTO/shotgun/src/modules/sawed-off/Makefile.am trunk/PROTO/shotgun/src/modules/sawed-off/e-module-sawed-off.edc trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_config.c trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.c trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.h trunk/PROTO/shotgun/src/modules/sawed-off/module.desktop.in trunk/PROTO/shotgun/src/modules/sawed-off/sawed-off.c |
|
From: Enlightenment S. <no-...@en...> - 2013-03-19 13:04:57
|
Log: According to XEP-0071, when sending message having an xhtml-im part, even the text body must have its chars 'htmlized' to not get stream errors from the server. This patch adds this behavior so messages having '<', '>' and that kind of chars doesnt produce stream errors. Author: kuri Date: 2013-03-19 06:04:48 -0700 (Tue, 19 Mar 2013) New Revision: 84450 Trac: http://trac.enlightenment.org/e/changeset/84450 Modified: trunk/PROTO/shotgun/src/lib/shotgun_private.h trunk/PROTO/shotgun/src/lib/shotgun_utils.c trunk/PROTO/shotgun/src/lib/xml.cpp Modified: trunk/PROTO/shotgun/src/lib/shotgun_private.h =================================================================== --- trunk/PROTO/shotgun/src/lib/shotgun_private.h 2013-03-18 20:18:37 UTC (rev 84449) +++ trunk/PROTO/shotgun/src/lib/shotgun_private.h 2013-03-19 13:04:48 UTC (rev 84450) @@ -167,6 +167,7 @@ void shotgun_strtohex(unsigned char *digest, size_t len, char *ret); void shotgun_md5_hmac_encode(unsigned char *digest, const char *string, size_t size, const void *key, size_t ksize); +const char * shotgun_strtohtml(const char *s); Eina_Bool shotgun_login_con(Shotgun_Auth *auth, int type, Ecore_Con_Event_Server_Add *ev); void shotgun_login(Shotgun_Auth *auth, Ecore_Con_Event_Server_Data *ev); Modified: trunk/PROTO/shotgun/src/lib/shotgun_utils.c =================================================================== --- trunk/PROTO/shotgun/src/lib/shotgun_utils.c 2013-03-18 20:18:37 UTC (rev 84449) +++ trunk/PROTO/shotgun/src/lib/shotgun_utils.c 2013-03-19 13:04:48 UTC (rev 84450) @@ -121,3 +121,74 @@ { return sha1_buffer(data, len); } + +const char * +shotgun_strtohtml(const char *s) +{ + unsigned int block = 64, + i, + j, + k; + char *s1; + size_t s_len, + s1_len, + c_len; + Eina_Bool found; + struct _Html + { + const char s, + *h; + unsigned int l; + }; + struct _Html html[] = { + { '<', "<", 4 }, + { '>', ">", 4 }, + { '\'', "'", 6 }, + { '\"', """, 6 }, + { '&', "&", 5 }, + { '/', "⁄", 7 }, + { 0, NULL, 0 } + }; + + EINA_SAFETY_ON_NULL_RETURN_VAL(s, NULL); + + s_len = strlen(s); + s1_len = s_len + block; + c_len = 0; + + s1 = calloc(1, s1_len); + + for (i=j=0; i < s_len; i++,j++) + { + found = EINA_FALSE; + + for (k=0; html[k].s; k++) + { + if (s[i] != html[k].s) + continue; + + if ((c_len + html[k].l) >= s1_len) + { + s1 = realloc(s1, s1_len + block); + s1_len += block; + } + strcpy(s1 + j, html[k].h); + found = EINA_TRUE; + j += html[k].l - 1; + c_len += html[k].l; + break; + } + + if (found) + continue; + + if ((c_len - s1_len) < 2) + { + s1 = realloc(s1, s1_len + block); + s1_len += block; + } + s1[j] = s[i]; + c_len++; + } + return s1; +} Modified: trunk/PROTO/shotgun/src/lib/xml.cpp =================================================================== --- trunk/PROTO/shotgun/src/lib/xml.cpp 2013-03-18 20:18:37 UTC (rev 84449) +++ trunk/PROTO/shotgun/src/lib/xml.cpp 2013-03-19 13:04:48 UTC (rev 84450) @@ -1546,10 +1546,10 @@ if ((xhtml_im) && (auth->custom_emoticons) && (shotgun_hashtml(auth->custom_emoticons,msg))) { Eina_Strbuf *buf; - const char *message; + const char *message, + *message_text; char *message_html; - buf = eina_strbuf_new(); switch (status) { @@ -1571,8 +1571,8 @@ break; } - - message_html = shotgun_htmlize(auth->custom_emoticons, msg); + message_text = shotgun_strtohtml(msg); + message_html = shotgun_htmlize(auth->custom_emoticons, message_text); eina_strbuf_append_printf(buf, "<message type='chat' " "to='%s'><%s " @@ -1583,9 +1583,10 @@ "%s</body></html></message>", to, message, - msg, + message_text, message_html); free(message_html); + free((char *)message_text); xml_text = eina_strbuf_string_steal(buf); *len = strlen(xml_text); eina_strbuf_free(buf); |
|
From: Enlightenment S. <no-...@en...> - 2013-03-18 20:18:45
|
Log: python-efl: Disable edbus (v2) bindings build until we come up with a better solution. Author: kuuko Date: 2013-03-18 13:18:37 -0700 (Mon, 18 Mar 2013) New Revision: 84449 Trac: http://trac.enlightenment.org/e/changeset/84449 Modified: trunk/BINDINGS/python/python-efl/setup.py Modified: trunk/BINDINGS/python/python-efl/setup.py =================================================================== --- trunk/BINDINGS/python/python-efl/setup.py 2013-03-15 16:15:52 UTC (rev 84448) +++ trunk/BINDINGS/python/python-efl/setup.py 2013-03-18 20:18:37 UTC (rev 84449) @@ -106,13 +106,13 @@ modules.append(emotion_ext) # EDBus - edbus_cflags, edbus_libs = pkg_config('EDBus', 'edbus2', "1.7.99") - pydbus_cflags, pydbus_libs = pkg_config('dbus-python', 'dbus-python') - edbus_ext = Extension("efl.edbus", ["efl/edbus/edbus.pyx"], - include_dirs = ['include/'], - extra_compile_args = edbus_cflags + pydbus_cflags + ecore_cflags, - extra_link_args = edbus_libs) - modules.append(edbus_ext) + #edbus_cflags, edbus_libs = pkg_config('EDBus', 'edbus2', "1.7.99") + #pydbus_cflags, pydbus_libs = pkg_config('dbus-python', 'dbus-python') + #edbus_ext = Extension("efl.edbus", ["efl/edbus/edbus.pyx"], + #include_dirs = ['include/'], + #extra_compile_args = edbus_cflags + pydbus_cflags + ecore_cflags, + #extra_link_args = edbus_libs) + #modules.append(edbus_ext) # Elementary elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', "1.7.99") |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 16:16:09
|
Log: python-efl: Small elm.genlist documentation correction. Author: kuuko Date: 2013-03-15 09:15:52 -0700 (Fri, 15 Mar 2013) New Revision: 84448 Trac: http://trac.enlightenment.org/e/changeset/84448 Modified: trunk/BINDINGS/python/python-efl/efl/elementary/genlist.pyx Modified: trunk/BINDINGS/python/python-efl/efl/elementary/genlist.pyx =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/genlist.pyx 2013-03-15 16:14:19 UTC (rev 84447) +++ trunk/BINDINGS/python/python-efl/efl/elementary/genlist.pyx 2013-03-15 16:15:52 UTC (rev 84448) @@ -540,7 +540,7 @@ :param flags: defines special behavior of this item: - ELM_GENLIST_ITEM_NONE = 0 - - ELM_GENLIST_ITEM_SUBITEMS = 1 + - ELM_GENLIST_ITEM_TREE = 1 - ELM_GENLIST_ITEM_GROUP = 2 :param func: if not None, this must be a callable to be |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 16:14:26
|
Log: python-efl: Forgot this file from last commit. Author: kuuko Date: 2013-03-15 09:14:19 -0700 (Fri, 15 Mar 2013) New Revision: 84447 Trac: http://trac.enlightenment.org/e/changeset/84447 Modified: trunk/BINDINGS/python/python-efl/efl/elementary/enums.pxd Modified: trunk/BINDINGS/python/python-efl/efl/elementary/enums.pxd =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/enums.pxd 2013-03-15 16:12:37 UTC (rev 84446) +++ trunk/BINDINGS/python/python-efl/efl/elementary/enums.pxd 2013-03-15 16:14:19 UTC (rev 84447) @@ -45,6 +45,12 @@ ELM_CALENDAR_SELECT_MODE_NONE ELM_CALENDAR_SELECT_MODE_ONDEMAND + ctypedef enum Elm_Calendar_Selectable: + ELM_CALENDAR_SELECTABLE_NONE + ELM_CALENDAR_SELECTABLE_YEAR + ELM_CALENDAR_SELECTABLE_MONTH + ELM_CALENDAR_SELECTABLE_DAY + ctypedef enum Elm_Calendar_Weekday: ELM_DAY_SUNDAY ELM_DAY_MONDAY |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 16:12:58
|
Log: python-efl: elm.calendar: Add new functionality from 1.8 API Author: kuuko Date: 2013-03-15 09:12:37 -0700 (Fri, 15 Mar 2013) New Revision: 84446 Trac: http://trac.enlightenment.org/e/changeset/84446 Modified: trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pxd trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pyx Modified: trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pxd =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pxd 2013-03-15 14:09:59 UTC (rev 84445) +++ trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pxd 2013-03-15 16:12:37 UTC (rev 84446) @@ -1,6 +1,6 @@ from efl.evas cimport Eina_Bool, Eina_List, const_Eina_List, Evas_Object from enums cimport Elm_Calendar_Mark_Repeat_Type, Elm_Calendar_Select_Mode, \ - Elm_Calendar_Weekday + Elm_Calendar_Selectable, Elm_Calendar_Weekday from libc.string cimport const_char cdef extern from "string.h": @@ -33,7 +33,6 @@ const_char *mark_type Elm_Calendar_Mark_Repeat_Type repeat - # Calendar (api:TODO cb:DONE test:TODO doc:DONE py3:DONE) Evas_Object * elm_calendar_add(Evas_Object *parent) const_char ** elm_calendar_weekdays_names_get(Evas_Object *obj) void elm_calendar_weekdays_names_set(Evas_Object *obj, const_char *weekdays[]) @@ -43,14 +42,17 @@ Elm_Calendar_Select_Mode elm_calendar_select_mode_get(Evas_Object *obj) void elm_calendar_selected_time_set(Evas_Object *obj, tm *selected_time) Eina_Bool elm_calendar_selected_time_get(Evas_Object *obj, tm *selected_time) - void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func) + #TODO: void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func) Elm_Calendar_Mark * elm_calendar_mark_add(Evas_Object *obj, const_char *mark_type, tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat) void elm_calendar_mark_del(Elm_Calendar_Mark *mark) void elm_calendar_marks_clear(Evas_Object *obj) - const_Eina_List * elm_calendar_marks_get(Evas_Object *obj) + #TODO: const_Eina_List * elm_calendar_marks_get(Evas_Object *obj) void elm_calendar_marks_draw(Evas_Object *obj) void elm_calendar_interval_set(Evas_Object *obj, double interval) double elm_calendar_interval_get(Evas_Object *obj) void elm_calendar_first_day_of_week_set(Evas_Object *obj, Elm_Calendar_Weekday day) Elm_Calendar_Weekday elm_calendar_first_day_of_week_get(Evas_Object *obj) + void elm_calendar_selectable_set(Evas_Object *obj, Elm_Calendar_Selectable selectable) + Elm_Calendar_Selectable elm_calendar_selectable_get(Evas_Object *obj) + Eina_Bool elm_calendar_displayed_time_get(Evas_Object *obj, tm *displayed_time) Modified: trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pyx =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pyx 2013-03-15 14:09:59 UTC (rev 84445) +++ trunk/BINDINGS/python/python-efl/efl/elementary/calendar_elm.pyx 2013-03-15 16:12:37 UTC (rev 84446) @@ -73,6 +73,25 @@ Select on demand +.. rubric:: Selectable + +.. data:: ELM_CALENDAR_SELECTABLE_NONE + + None selectable + +.. data:: ELM_CALENDAR_SELECTABLE_YEAR + + Year is selectable + +.. data:: ELM_CALENDAR_SELECTABLE_MONTH + + Month is selectable + +.. data:: ELM_CALENDAR_SELECTABLE_DAY + + Day is selectable + + .. rubric:: Days .. data:: ELM_DAY_SUNDAY @@ -333,7 +352,7 @@ """ def __set__(self, format_func): pass - #elm_calendar_format_function_set(self.obj, format_func) + #TODO: elm_calendar_format_function_set(self.obj, format_func) def mark_add(self, mark_type, mark_time, repeat): """mark_add(mark_type, mark_time, repeat) -> CalendarMark @@ -393,9 +412,9 @@ :type: tuple of :py:class:`CalendarMark` """ - #def __get__(self): + #TODO: def __get__(self): #const_Eina_List *elm_calendar_marks_get(self.obj) - #def __set__(self, value): + #TODO: def __set__(self, value): def __del__(self): elm_calendar_marks_clear(self.obj) @@ -457,6 +476,32 @@ def __set__(self, day): elm_calendar_first_day_of_week_set(self.obj, day) + property selectable: + """How selected_time manages a date + + :type: Selectable + + """ + def __set__(self, Elm_Calendar_Selectable selectable): + elm_calendar_selectable_set(self.obj, selectable) + + def __get__(self): + return int(elm_calendar_selectable_get(self.obj)) + + property displayed_time: + """Get the current time displayed in the widget + + :type: datetime.date + + """ + def __get__(self): + cdef tm time + elm_calendar_displayed_time_get(self.obj, &time) + ret = date( time.tm_year + 1900, + time.tm_mon + 1, + time.tm_mday) + return ret + def callback_changed_add(self, func, *args, **kwargs): """Emitted when the date in the calendar is changed.""" self._callback_add("changed", func, *args, **kwargs) |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 14:10:09
|
Log: Migrated E16 and imlib2 to git. Author: tasn Date: 2013-03-15 07:09:59 -0700 (Fri, 15 Mar 2013) New Revision: 84445 Trac: http://trac.enlightenment.org/e/changeset/84445 Removed: trunk/E16/ trunk/imlib2/ trunk/imlib2_loaders/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 13:52:04
|
Log: Migrated entrance to git. Author: tasn Date: 2013-03-15 06:51:50 -0700 (Fri, 15 Mar 2013) New Revision: 84444 Trac: http://trac.enlightenment.org/e/changeset/84444 Removed: trunk/PROTO/entrance/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-15 11:31:49
|
Log: Devs kiwi: Added kiwi back. Author: tasn Date: 2013-03-15 04:31:39 -0700 (Fri, 15 Mar 2013) New Revision: 84443 Trac: http://trac.enlightenment.org/e/changeset/84443 Added: trunk/devs/kiwi/ trunk/devs/kiwi/id_rsa.pub trunk/devs/kiwi/info.txt Added: trunk/devs/kiwi/id_rsa.pub =================================================================== --- trunk/devs/kiwi/id_rsa.pub (rev 0) +++ trunk/devs/kiwi/id_rsa.pub 2013-03-15 11:31:39 UTC (rev 84443) @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHqcjygIMufXX2ymlgqSKZlSYbWZx9Z4vW1ikLoMY4Se5PzumPPrpWxKAUkvge+NMfsD+rJJR0vRITQI7iYKMt3DAsjDoa/Zxu6PRu9WHUqMzxxrdwCC9qezEjxIZJOfA2IM8hdfUTCTzeVqkmupibbd3PFgLNENfb+gJPrcotANAeSA91JSQKjomnGMS8VmqTUuQwSOhHPWDYFzyQbazI4K/2FJ/CB1yGh99NHh+LboTRsizbv68OFZ6KKIaRmk5+jWF3AZVbBeUV4QfCRDa9nIAkkbyosUy6kupcTwjhESXMM9XRY0MGyEABWDVgjVMt0riO1jhDx28JWumvm/aTervVtwULFs6M94g8nxSzCTsJ3zLGYO/nFTMVIEdEZK5VHMNJ37ELLwArBc4mxvBEfszEIOU38q1f0pV8sBU44F7HZc5SGprdt1QZU5u8sk22Q/6iKrTOKppfxjSBcPdFKDry6HZ2H+/L8WsU4ZaJ6r9MmlbvhA/VVnS1b0YKwar4BRRmi8KBHaRjW5nRNHrsCaB4cSneJbd6MzB3zCSaJo0W914S6/qKWFx+puHFSHzXepVs8TMvOkLPkthiwQl6+xZMmUuD7k+odJaBk8nmxrILpNQXhd0jeJG3s9INJGI7+U2R6bmDT6Mzf8TOm8CRI5ZiJQiKspYFQxKRUMExJw== user@code Added: trunk/devs/kiwi/info.txt =================================================================== --- trunk/devs/kiwi/info.txt (rev 0) +++ trunk/devs/kiwi/info.txt 2013-03-15 11:31:39 UTC (rev 84443) @@ -0,0 +1,13 @@ +Login: kiwi +IRC Nick: glouglou +Cloak: developer/kiwi +Name: Laurent Ghigonis +GeoData: 48.85676, 2.35099 +Location: Paris, France +E-Mail: la...@p1... +WWW: none +Managing: egraph, e-modules-extra/elife +Contributing: e, edje, e-modules-extra/photo, e-modules-extra/news, e-modules-extra/alarm +Group: Libraries, Applications +Platform: Fedora (Linux), OpenBSD + |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 15:46:27
|
Log: Migrated geneet to git. Author: tasn Date: 2013-03-14 08:46:15 -0700 (Thu, 14 Mar 2013) New Revision: 84442 Trac: http://trac.enlightenment.org/e/changeset/84442 Removed: trunk/geneet/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 15:08:23
|
Log: Migrated FORMATTING to git. Author: tasn Date: 2013-03-14 08:08:16 -0700 (Thu, 14 Mar 2013) New Revision: 84441 Trac: http://trac.enlightenment.org/e/changeset/84441 Removed: trunk/FORMATTING/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 14:55:23
|
Log: Migrated EDI to git. Author: tasn Date: 2013-03-14 07:55:14 -0700 (Thu, 14 Mar 2013) New Revision: 84440 Trac: http://trac.enlightenment.org/e/changeset/84440 Removed: trunk/PROTO/edi/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 14:51:13
|
Log: Delete econnman and elev8 (moved to git as well). Author: tasn Date: 2013-03-14 07:51:03 -0700 (Thu, 14 Mar 2013) New Revision: 84439 Trac: http://trac.enlightenment.org/e/changeset/84439 Removed: trunk/PROTO/elev8/ trunk/econnman/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 14:50:31
|
Log: Delete Eterm and libast. Author: tasn Date: 2013-03-14 07:50:22 -0700 (Thu, 14 Mar 2013) New Revision: 84438 Trac: http://trac.enlightenment.org/e/changeset/84438 Removed: trunk/eterm/Eterm/ trunk/eterm/libast/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-14 14:02:38
|
Log: shotgun gui is now completely curl-free, using azy for all image fetching Author: discomfitor Date: 2013-03-14 07:02:26 -0700 (Thu, 14 Mar 2013) New Revision: 84437 Trac: http://trac.enlightenment.org/e/changeset/84437 Modified: trunk/PROTO/shotgun/configure.ac trunk/PROTO/shotgun/src/bin/Makefile.am trunk/PROTO/shotgun/src/bin/chat_image.c trunk/PROTO/shotgun/src/bin/dbus.c trunk/PROTO/shotgun/src/bin/events.c trunk/PROTO/shotgun/src/bin/main.c trunk/PROTO/shotgun/src/bin/settings.c trunk/PROTO/shotgun/src/bin/ui.h Modified: trunk/PROTO/shotgun/configure.ac =================================================================== --- trunk/PROTO/shotgun/configure.ac 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/configure.ac 2013-03-14 14:02:26 UTC (rev 84437) @@ -85,7 +85,7 @@ if test "x$want_gui" != "xno"; then PKG_CHECK_MODULES([GUI], - [eet >= 1.4.0 evas >= 1.7 ecore-file >= 1.7 ecore-imf >= 1.7 edje >= 1.7 elementary efx], + [eet >= 1.4.0 evas >= 1.7 ecore-file >= 1.7 ecore-imf >= 1.7 edje >= 1.7 elementary efx azy], [have_gui="yes"], [have_gui="no"] ) @@ -102,29 +102,6 @@ ],[edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc]) AC_SUBST(edje_cc) -have_azy="no" -want_azy="no" -AC_ARG_ENABLE([azy], - [AC_HELP_STRING([--disable-azy], [disable azy support. @<:@default=detect@:>@])], - [want_azy=no], []) -## [want_azy=$enableval], []) - -if test "x$want_azy" != "xno"; then - PKG_CHECK_MODULES([AZY], - [azy >= 1.0.0], - [ - AC_DEFINE(HAVE_AZY, 1, [Azy support]) - have_azy="yes" - ], - [have_azy="no"] - ) -else - have_azy="no" -fi -if test "x$want_azy" = "xyes" -a "x$have_azy" = "xno"; then - AC_MSG_ERROR([azy support requested, but not found by pkg-config.]) -fi - have_edbus="no" want_edbus="auto" AC_ARG_ENABLE([edbus], Modified: trunk/PROTO/shotgun/src/bin/Makefile.am =================================================================== --- trunk/PROTO/shotgun/src/bin/Makefile.am 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/Makefile.am 2013-03-14 14:02:26 UTC (rev 84437) @@ -1,6 +1,5 @@ AM_CFLAGS = \ @SHOTGUN_CFLAGS@ \ - @AZY_CFLAGS@ \ @GUI_CFLAGS@ \ @edbus_CFLAGS@ \ @enotify_CFLAGS@ \ @@ -17,7 +16,6 @@ shotgun_LDADD = \ @SHOTGUN_LIBS@ \ - @AZY_LIBS@ \ @GUI_LIBS@ \ @edbus_LIBS@ \ @enotify_LIBS@ \ Modified: trunk/PROTO/shotgun/src/bin/chat_image.c =================================================================== --- trunk/PROTO/shotgun/src/bin/chat_image.c 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/chat_image.c 2013-03-14 14:02:26 UTC (rev 84437) @@ -39,6 +39,7 @@ elm_win_screen_constrain_set(tt, EINA_TRUE); elm_image_object_size_get(ic, &w, &h); elm_image_resizable_set(ic, 0, 0); + elm_image_smooth_set(ic, 1); if (elm_image_animated_available_get(ic)) { elm_image_animated_set(ic, EINA_TRUE); @@ -103,6 +104,79 @@ return 1; } +Eina_Error +_chat_image_complete(Azy_Client *cli, Azy_Content *content, Eina_Binbuf *buf) +{ + Image *i = azy_client_data_get(cli); + int status; + const char *h; + Azy_Net *net = azy_content_net_get(content); + + status = azy_net_code_get(net); + DBG("%i code for image: %s", status, azy_net_uri_get(net)); + if (i->buf) eina_binbuf_free(i->buf); + i->buf = buf; + if (status != 200) + { + if (i->buf) eina_binbuf_free(i->buf); + i->buf = NULL; + if (++i->tries < IMAGE_FETCH_TRIES) + { + Azy_Client_Call_Id id; + + id = azy_client_blank(i->client, AZY_NET_TYPE_GET, NULL, NULL, NULL); + if (id) + azy_client_callback_set(i->client, id, (Azy_Client_Transfer_Complete_Cb)_chat_image_complete); + else + { + ERR("fetch retry failed: img(%s)!", i->addr); + ui_eet_dummy_add(i->addr); + i->dummy = EINA_TRUE; + azy_client_free(i->client); + i->client = NULL; + } + } + return ECORE_CALLBACK_RENEW; + } + h = azy_net_header_get(net, "content-type"); + if (h) + { + if (strncasecmp(h, "image/", 6)) + { + ui_eet_dummy_add(i->addr); + i->dummy = EINA_TRUE; + if (i->buf) eina_binbuf_free(i->buf); + i->buf = NULL; + if (i->client) azy_client_free(i->client); + i->client = NULL; + } + } + if (status != 200) + { + i->cl->image_list = eina_inlist_remove(i->cl->image_list, EINA_INLIST_GET(i)); + eina_hash_del_by_key(i->cl->images, i->addr); + return ECORE_CALLBACK_RENEW; + } + i->timestamp = (unsigned long long)ecore_time_unix_get(); + if (!i->dummy) + { + if (ui_eet_image_add(i->addr, i->buf, i->timestamp) == 1) + i->cl->image_size += eina_binbuf_length_get(i->buf); + if (i->client) azy_client_free(i->client); + i->client = NULL; + chat_image_cleanup(i->cl); + } + if (i->cl->dbus_image == i) + { + Elm_Entry_Anchor_Info e; + + memset(&e, 0, sizeof(Elm_Entry_Anchor_Info)); + e.name = i->addr; + chat_conv_image_show(i->cl, NULL, &e); + } + return ECORE_CALLBACK_RENEW; +} + void chat_conv_image_show(void *data, Evas_Object *obj, Elm_Entry_Anchor_Info *ev) { @@ -195,10 +269,23 @@ cl->image_size += eina_binbuf_length_get(i->buf); else { - i->url = ecore_con_url_new(url); - ecore_con_url_data_set(i->url, i); - if (!ecore_con_url_get(i->url)) + i->client = azy_client_util_connect(url); + if (i->client) { + Azy_Client_Call_Id id; + + azy_client_data_set(i->client, i); + id = azy_client_blank(i->client, AZY_NET_TYPE_GET, NULL, NULL, NULL); + if (id) + azy_client_callback_set(i->client, id, (Azy_Client_Transfer_Complete_Cb)_chat_image_complete); + else + { + azy_client_free(i->client); + i->client = NULL; + } + } + if (!i->client) + { /* don't even know how to deal with this */ ERR("IMAGE FETCHING FAILURE: %s", url); free(i); @@ -222,89 +309,13 @@ chat_conv_image_hide(NULL, i->cl->win, NULL); i->cl->dbus_image = NULL; } - if (i->url) ecore_con_url_free(i->url); + if (i->client) azy_client_free(i->client); if (i->buf) eina_binbuf_free(i->buf); ui_dbus_signal_link(i->cl, i->addr, EINA_TRUE, EINA_FALSE); eina_stringshare_del(i->addr); free(i); } -Eina_Bool -chat_image_data(void *d __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Url_Data *ev) -{ - Image *i = ecore_con_url_data_get(ev->url_con); - - //DBG("Received %i bytes of image: %s", ev->size, ecore_con_url_url_get(ev->url_con)); - if (!i->buf) i->buf = eina_binbuf_new(); - eina_binbuf_append_length(i->buf, &ev->data[0], ev->size); - return ECORE_CALLBACK_RENEW; -} - -Eina_Bool -chat_image_complete(void *d __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Url_Complete *ev) -{ - Image *i = ecore_con_url_data_get(ev->url_con); - const Eina_List *headers, *l; - const char *h; - DBG("%i code for image: %s", ev->status, ecore_con_url_url_get(ev->url_con)); - if (ev->status != 200) - { - if (i->buf) eina_binbuf_free(i->buf); - i->buf = NULL; - if (++i->tries < IMAGE_FETCH_TRIES) - { - if (!ecore_con_url_get(ev->url_con)) - { - ERR("fetch retry failed: img(%s)!", i->addr); - ui_eet_dummy_add(i->addr); - i->dummy = EINA_TRUE; - ecore_con_url_free(i->url); - i->url = NULL; - } - } - return ECORE_CALLBACK_RENEW; - } - headers = ecore_con_url_response_headers_get(ev->url_con); - EINA_LIST_FOREACH(headers, l, h) - { - if (strncasecmp(h, "content-type: ", sizeof("content-type: ") - 1)) continue; - h += sizeof("content-type: ") - 1; - - if (!strncasecmp(h, "image/", 6)) break; - ui_eet_dummy_add(ecore_con_url_url_get(ev->url_con)); - i->dummy = EINA_TRUE; - if (i->buf) eina_binbuf_free(i->buf); - i->buf = NULL; - if (i->url) ecore_con_url_free(i->url); - i->url = NULL; - break; - } - if (ev->status != 200) - { - i->cl->image_list = eina_inlist_remove(i->cl->image_list, EINA_INLIST_GET(i)); - eina_hash_del_by_key(i->cl->images, ecore_con_url_url_get(ev->url_con)); - return ECORE_CALLBACK_RENEW; - } - i->timestamp = (unsigned long long)ecore_time_unix_get(); - if (!i->dummy) - { - if (ui_eet_image_add(i->addr, i->buf, i->timestamp) == 1) - i->cl->image_size += eina_binbuf_length_get(i->buf); - if (i->url) ecore_con_url_free(i->url); - i->url = NULL; - chat_image_cleanup(i->cl); - } - if (i->cl->dbus_image == i) - { - Elm_Entry_Anchor_Info e; - - memset(&e, 0, sizeof(Elm_Entry_Anchor_Info)); - e.name = i->addr; - chat_conv_image_show(i->cl, NULL, &e); - } - return ECORE_CALLBACK_RENEW; -} - void chat_image_cleanup(Contact_List *cl) { Modified: trunk/PROTO/shotgun/src/bin/dbus.c =================================================================== --- trunk/PROTO/shotgun/src/bin/dbus.c 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/dbus.c 2013-03-14 14:02:26 UTC (rev 84437) @@ -69,7 +69,7 @@ i = eina_hash_find(cl->images, url); if (!i) break; // not gonna let people use us as wget if (!i->dummy) chat_image_add(cl, url); // update timestamp - if (i->url) + if (i->client) { cl->dbus_image = i; break; Modified: trunk/PROTO/shotgun/src/bin/events.c =================================================================== --- trunk/PROTO/shotgun/src/bin/events.c 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/events.c 2013-03-14 14:02:26 UTC (rev 84437) @@ -175,6 +175,7 @@ char *jid, *p; Eina_List *l = NULL; + INF("PRESENCE FOR %s", ev->jid); p = strchr(ev->jid, '/'); if (p) jid = strndupa(ev->jid, p - ev->jid); else jid = (char*)ev->jid; @@ -249,12 +250,15 @@ { /* if current resource has no photo, use low priority photo */ if (pres->photo && (!c->cur->photo)) - c->cur->photo = eina_stringshare_ref(pres->photo); + { + c->cur->photo = eina_stringshare_ref(pres->photo); + if (c->list_item) elm_genlist_item_fields_update(c->list_item, "elm.swallow.end", ELM_GENLIST_ITEM_FIELD_CONTENT); + } c->cur->vcard |= pres->vcard; - c->tooltip_changed = EINA_TRUE; /* if lower priority, add to plist */ if (ev->priority < c->cur->priority) { + c->tooltip_changed = EINA_TRUE; if (eina_list_data_get(l) != pres) c->plist = eina_list_sorted_insert(c->plist, (Eina_Compare_Cb)_list_sort_cb, pres); if (c->vcard_request) return ECORE_CALLBACK_RENEW; Modified: trunk/PROTO/shotgun/src/bin/main.c =================================================================== --- trunk/PROTO/shotgun/src/bin/main.c 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/main.c 2013-03-14 14:02:26 UTC (rev 84437) @@ -107,6 +107,7 @@ eina_init(); shotgun_init(); efx_init(); + azy_init(); elm_init(argc, argv); elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); @@ -119,8 +120,6 @@ } _setup_extension(); //eina_log_domain_level_set("ecore_con", EINA_LOG_LEVEL_DBG); - ecore_event_handler_add(ECORE_CON_EVENT_URL_DATA, (Ecore_Event_Handler_Cb)chat_image_data, NULL); - ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, (Ecore_Event_Handler_Cb)chat_image_complete, NULL); ch = ecore_event_handler_add(SHOTGUN_EVENT_CONNECT, (Ecore_Event_Handler_Cb)con, NULL); ecore_event_handler_add(SHOTGUN_EVENT_CONNECTION_STATE, (Ecore_Event_Handler_Cb)con_state, NULL); // eina_log_abort_on_critical_level_set(EINA_LOG_LEVEL_CRITICAL); Modified: trunk/PROTO/shotgun/src/bin/settings.c =================================================================== --- trunk/PROTO/shotgun/src/bin/settings.c 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/settings.c 2013-03-14 14:02:26 UTC (rev 84437) @@ -256,7 +256,6 @@ settings_new(UI_WIN *ui) { Evas_Object *scr, *ic, *back, *box, *ck, *fr, *frbox, *sl, *radio, *sradio; - int init; Contact_List *cl; Login_Window *lw; char buf[1024]; @@ -337,25 +336,13 @@ SETTINGS_CHECK("Disable notifications", disable_notify, "Disables use of notification popups"); #endif - init = ecore_con_url_init(); - if (init) - SETTINGS_FRAME("Images"); - else - SETTINGS_FRAME("Images (DISABLED: REQUIRES CURL SUPPORT IN ECORE)"); + SETTINGS_FRAME("Images"); elm_frame_collapse_set(fr, EINA_TRUE); SETTINGS_CHECK("Disable automatic image fetching", disable_image_fetch, "Disables background fetching of images"); - if (init) - { - SETTINGS_SLIDER("Max image age", "Number of days to save linked images on disk before deleting them", - "%1.0f days", 60, image_age); - SETTINGS_SLIDER("Max image memory", "Total size of images to keep in memory", - "%1.0f MB", 512, image_size); - } - else - { - elm_check_state_set(ck, EINA_TRUE); - elm_object_disabled_set(ck, EINA_TRUE); - } + SETTINGS_SLIDER("Max image age", "Number of days to save linked images on disk before deleting them", + "%1.0f days", 60, image_age); + SETTINGS_SLIDER("Max image memory", "Total size of images to keep in memory", + "%1.0f MB", 512, image_size); SETTINGS_FRAME("List"); elm_frame_collapse_set(fr, EINA_TRUE); Modified: trunk/PROTO/shotgun/src/bin/ui.h =================================================================== --- trunk/PROTO/shotgun/src/bin/ui.h 2013-03-13 13:06:01 UTC (rev 84436) +++ trunk/PROTO/shotgun/src/bin/ui.h 2013-03-14 14:02:26 UTC (rev 84437) @@ -24,13 +24,11 @@ #include <Ecore_Con.h> #include <Elementary.h> #include <Efx.h> +#include <Azy.h> #ifdef HAVE_DBUS # include <E_DBus.h> #endif -#ifdef HAVE_AZY -# include <Azy.h> #endif -#endif #ifndef __UNUSED__ # define __UNUSED__ __attribute__((unused)) #endif @@ -292,7 +290,7 @@ struct Image { EINA_INLIST; - Ecore_Con_Url *url; + Azy_Client *client; Eina_Binbuf *buf; const char *addr; unsigned long long timestamp; @@ -322,8 +320,6 @@ void chat_image_cleanup(Contact_List *cl); void chat_conv_image_show(void *data, Evas_Object *obj, Elm_Entry_Anchor_Info *ev); void chat_conv_image_hide(Contact *c, Evas_Object *obj, Elm_Entry_Anchor_Info *ev); -Eina_Bool chat_image_data(void *d __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Url_Data *ev); -Eina_Bool chat_image_complete(void *d __UNUSED__, int type __UNUSED__, Ecore_Con_Event_Url_Complete *ev); Shotgun_Event_Presence *contact_presence_get(Contact *c); void contact_presence_set(Contact *c, Shotgun_Event_Presence *cur); |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 13:06:12
|
Log: And also remove all empty dirs git-svn does not take care of Author: stefan Date: 2013-03-13 06:06:01 -0700 (Wed, 13 Mar 2013) New Revision: 84436 Trac: http://trac.enlightenment.org/e/changeset/84436 Removed: trunk/PROTO/elocation/ trunk/exactness/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 12:54:33
|
Log: exactness: Remove as it moved to the tool section in git.enlightenment.org http://git.enlightenment.org/tools/exactness.git/ Author: stefan Date: 2013-03-13 05:54:22 -0700 (Wed, 13 Mar 2013) New Revision: 84435 Trac: http://trac.enlightenment.org/e/changeset/84435 Removed: trunk/exactness/.gitignore trunk/exactness/AUTHORS trunk/exactness/COPYING trunk/exactness/ChangeLog trunk/exactness/INSTALL trunk/exactness/Makefile.am trunk/exactness/NEWS trunk/exactness/README trunk/exactness/autogen.sh trunk/exactness/configure.ac trunk/exactness/data/Makefile.am trunk/exactness/data/recordings/actionslider.rec trunk/exactness/data/recordings/anchorblock.rec trunk/exactness/data/recordings/anchorview.rec trunk/exactness/data/recordings/bg_image.rec trunk/exactness/data/recordings/bg_options.rec trunk/exactness/data/recordings/bg_plain.rec trunk/exactness/data/recordings/box_horiz.rec trunk/exactness/data/recordings/box_vert.rec trunk/exactness/data/recordings/box_vert2.rec trunk/exactness/data/recordings/bubble.rec trunk/exactness/data/recordings/button.rec trunk/exactness/data/recordings/calendar.rec trunk/exactness/data/recordings/check.rec trunk/exactness/data/recordings/colorselector.rec trunk/exactness/data/recordings/conformant.rec trunk/exactness/data/recordings/conformant2.rec trunk/exactness/data/recordings/ctxpopup.rec trunk/exactness/data/recordings/diskselector.rec trunk/exactness/data/recordings/evas_map_3d.rec trunk/exactness/data/recordings/fileselector.rec trunk/exactness/data/recordings/fileselector_button.rec trunk/exactness/data/recordings/fileselector_entry.rec trunk/exactness/data/recordings/focus.rec trunk/exactness/data/recordings/gengrid.rec trunk/exactness/data/recordings/gengrid2.rec trunk/exactness/data/recordings/gengrid_group.rec trunk/exactness/data/recordings/genlist.rec trunk/exactness/data/recordings/genlist2.rec trunk/exactness/data/recordings/genlist3.rec trunk/exactness/data/recordings/genlist4.rec trunk/exactness/data/recordings/genlist5.rec trunk/exactness/data/recordings/genlist7.rec trunk/exactness/data/recordings/genlist_group.rec trunk/exactness/data/recordings/genlist_group_tree.rec trunk/exactness/data/recordings/genlist_mode.rec trunk/exactness/data/recordings/genlist_reorder_mode.rec trunk/exactness/data/recordings/genlist_tree.rec trunk/exactness/data/recordings/grid.rec trunk/exactness/data/recordings/hover.rec trunk/exactness/data/recordings/hover2.rec trunk/exactness/data/recordings/hoversel.rec trunk/exactness/data/recordings/index.rec trunk/exactness/data/recordings/index2.rec trunk/exactness/data/recordings/inwin.rec trunk/exactness/data/recordings/inwin2.rec trunk/exactness/data/recordings/label.rec trunk/exactness/data/recordings/list.rec trunk/exactness/data/recordings/list2.rec trunk/exactness/data/recordings/list3.rec trunk/exactness/data/recordings/list4.rec trunk/exactness/data/recordings/list5.rec trunk/exactness/data/recordings/list_horizontal.rec trunk/exactness/data/recordings/naviframe.rec trunk/exactness/data/recordings/notify.rec trunk/exactness/data/recordings/pager.rec trunk/exactness/data/recordings/pager_slide.rec trunk/exactness/data/recordings/panel.rec trunk/exactness/data/recordings/panes.rec trunk/exactness/data/recordings/progressbar.rec trunk/exactness/data/recordings/radio.rec trunk/exactness/data/recordings/scaling.rec trunk/exactness/data/recordings/scaling2.rec trunk/exactness/data/recordings/scroller.rec trunk/exactness/data/recordings/scroller2.rec trunk/exactness/data/recordings/segment_control.rec trunk/exactness/data/recordings/separator.rec trunk/exactness/data/recordings/slider.rec trunk/exactness/data/recordings/spinner.rec trunk/exactness/data/recordings/table.rec trunk/exactness/data/recordings/table3.rec trunk/exactness/data/recordings/table4.rec trunk/exactness/data/recordings/table5.rec trunk/exactness/data/recordings/table6.rec trunk/exactness/data/recordings/table_homogeneous.rec trunk/exactness/data/recordings/tests.txt trunk/exactness/data/recordings/toggle.rec trunk/exactness/data/recordings/toolbar.rec trunk/exactness/data/recordings/toolbar2.rec trunk/exactness/data/recordings/toolbar3.rec trunk/exactness/data/recordings/toolbar4.rec trunk/exactness/data/recordings/toolbar5.rec trunk/exactness/data/recordings/toolbar6.rec trunk/exactness/data/recordings/tooltip.rec trunk/exactness/data/recordings/tooltip2.rec trunk/exactness/data/recordings/win_states.rec trunk/exactness/data/recordings/win_states2.rec trunk/exactness/src/Makefile.am trunk/exactness/src/lib/Makefile.am trunk/exactness/src/lib/tsuite_evas_hook.c trunk/exactness/src/lib/tsuite_file_data.c trunk/exactness/src/lib/tsuite_file_data.h trunk/exactness/src/scripts/Makefile.am trunk/exactness/src/scripts/write.sh trunk/exactness/tasn_is_a_lazy_bastard |
90 messages has been excluded from this view by a project administrator.
![http://api.flattr.com/button/flattr-badge-large.png"](http://api.flattr.com/button/flattr-badge-large.png"){kind=link}