E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_image_main.c Log Message: 1. dont free/realoc if no_free is set. 2. free then malloc otherwise realloc might ALSO have to memcpy if it cant resize the segment whihc means overhead we dont need/want. === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- evas_image_main.c 15 Apr 2008 15:20:53 - 1.61 +++ evas_image_main.c 3 May 2008 06:38:45 - 1.62 @@ -153,7 +153,14 @@ else siz = w * h * sizeof(DATA32); - im-image.data = realloc(im-image.data, siz); + if (im-image.no_free) + im-image.data = malloc(siz); + else + { +// im-image.data = realloc(im-image.data, siz); + if (im-image.data) free(im-image.data); + im-image.data = malloc(siz); + } if (im-image.data == NULL) return -1; #ifdef HAVE_VALGRIND - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: ecore_x_events.c Log Message: gak! al the siginfo handlign was wrong. u'd get bogus siginfo data from whatever child exited last - not the one u wanted, not to mention all other signals. now there's a queue at least. 256 long. moight be a bit too long. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -3 -r1.100 -r1.101 --- ecore_x_events.c16 Dec 2007 01:41:15 - 1.100 +++ ecore_x_events.c3 May 2008 08:15:16 - 1.101 @@ -1662,7 +1662,7 @@ e-win = screensaver_event-window; if (screensaver_event-state == ScreenSaverOn) e-on = 1; - else + else e-on = 0; e-time = screensaver_event-time; ecore_event_add(ECORE_X_EVENT_SCREENSAVER_NOTIFY, e, NULL, NULL); - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_signal.c Log Message: gak! al the siginfo handlign was wrong. u'd get bogus siginfo data from whatever child exited last - not the one u wanted, not to mention all other signals. now there's a queue at least. 256 long. moight be a bit too long. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ecore_signal.c 24 Feb 2008 08:42:39 - 1.37 +++ ecore_signal.c 3 May 2008 08:15:15 - 1.38 @@ -33,6 +33,9 @@ static int _ecore_signal_exe_exit_delay(void *data); +//#define MAXSIGQ 256 // 32k +#define MAXSIGQ 64 // 8k + static volatile sig_atomic_t sig_count = 0; static volatile sig_atomic_t sigchld_count = 0; static volatile sig_atomic_t sigusr1_count = 0; @@ -41,23 +44,25 @@ static volatile sig_atomic_t sigquit_count = 0; static volatile sig_atomic_t sigint_count = 0; static volatile sig_atomic_t sigterm_count = 0; - -static volatile siginfo_t sigchld_info; -static volatile siginfo_t sigusr1_info; -static volatile siginfo_t sigusr2_info; -static volatile siginfo_t sighup_info; -static volatile siginfo_t sigquit_info; -static volatile siginfo_t sigint_info; -static volatile siginfo_t sigterm_info; - #ifdef SIGPWR static volatile sig_atomic_t sigpwr_count = 0; -static volatile siginfo_t sigpwr_info = {0}; #endif - #ifdef SIGRTMIN static volatile sig_atomic_t *sigrt_count = NULL; -static volatile siginfo_t *sigrt_info = NULL; +#endif + +static volatile siginfo_t sigchld_info[MAXSIGQ]; +static volatile siginfo_t sigusr1_info[MAXSIGQ]; +static volatile siginfo_t sigusr2_info[MAXSIGQ]; +static volatile siginfo_t sighup_info[MAXSIGQ]; +static volatile siginfo_t sigquit_info[MAXSIGQ]; +static volatile siginfo_t sigint_info[MAXSIGQ]; +static volatile siginfo_t sigterm_info[MAXSIGQ]; +#ifdef SIGPWR +static volatile siginfo_t sigpwr_info[MAXSIGQ]; +#endif +#ifdef SIGRTMIN +static volatile siginfo_t *sigrt_info[MAXSIGQ]; #endif void @@ -102,10 +107,13 @@ sigrt_count = NULL; } - if (sigrt_info) + for (i = 0; i MAXSIGQ; i++) { - free((siginfo_t *) sigrt_info); - sigrt_info = NULL; + if (sigrt_info[i]) + { +free((siginfo_t *) sigrt_info[i]); +sigrt_info[i] = NULL; + } } #endif } @@ -134,8 +142,11 @@ sigrt_count = calloc(1, sizeof(sig_atomic_t) * num); assert(sigrt_count); - sigrt_info = calloc(1, sizeof(siginfo_t) * num); - assert(sigrt_info); + for (i = 0; i MAXSIGQ; i++) + { + sigrt_info[i] = calloc(1, sizeof(siginfo_t) * num); + assert(sigrt_info[i]); + } for (i = 0; i num; i++) _ecore_signal_callback_set(SIGRTMIN + i, _ecore_signal_callback_sigrt); @@ -154,8 +165,32 @@ #ifdef SIGRTMIN int i, num = SIGRTMAX - SIGRTMIN; #endif - - while (sigchld_count 0) + volatile sig_atomic_t n; + sigset_t oldset, newset; + + if (sig_count == 0) return; + sigemptyset(newset); + sigaddset(newset, SIGPIPE); + sigaddset(newset, SIGALRM); + sigaddset(newset, SIGCHLD); + sigaddset(newset, SIGUSR1); + sigaddset(newset, SIGUSR2); + sigaddset(newset, SIGHUP); + sigaddset(newset, SIGQUIT); + sigaddset(newset, SIGINT); + sigaddset(newset, SIGTERM); +#ifdef SIGPWR + sigaddset(newset, SIGPWR); +#endif +#ifdef SIGRTMIN + for (i = 0; i num; i++) + sigaddset(newset, SIGRTMIN + i); +#endif + sigprocmask(SIG_BLOCK, newset, oldset); + if (sigchld_count MAXSIGQ) + printf(ECORE WARNING. %i SIGCHLD in queue. max queue size %i. losing + siginfo for extra signals.\n, sigchld_count, MAXSIGQ); + for (n = 0; n sigchld_count; n++) { pid_t pid; int status; @@ -183,8 +218,8 @@ e-pid = pid; e-exe = _ecore_exe_find(pid); - if (sigchld_info.si_signo) - e-data = sigchld_info; /* No need to clone this. */ + if ((n MAXSIGQ) (sigchld_info[n].si_signo)) + e-data = sigchld_info[n]; /* No need to clone this. */ if ((e-exe) (e-exe-flags (ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_ERROR))) { @@ -220,10 +255,14 @@ } } } - sigchld_count--; sig_count--; } - while (sigusr1_count 0) + sigchld_count = 0; + + if (sigusr1_count MAXSIGQ) + printf(ECORE WARNING. %i SIGUSR1 in queue. max queue size %i. losing + siginfo for extra signals.\n, sigusr1_count, MAXSIGQ); + for (n = 0; n sigusr1_count; n++) { Ecore_Event_Signal_User *e; @@ -232,15 +271,19 @@ { e-number = 1; -if (sigusr1_info.si_signo) -
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_image_main.c Log Message: notes - cedric... i think i may have found a problem here... === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- evas_image_main.c 3 May 2008 06:38:45 - 1.62 +++ evas_image_main.c 3 May 2008 08:31:26 - 1.63 @@ -153,16 +153,21 @@ else siz = w * h * sizeof(DATA32); - if (im-image.no_free) - im-image.data = malloc(siz); - else + /* FIXME: this is wrong. we seem to realloc data here that ismaked no_free +* whihc is wrong, but when we fix it, we break all sorts of stuff +* whihc used to work. i suspect the cache changes in evas */ +#if 1 + im-image.data = realloc(im-image.data, siz); + if (im-image.data == NULL) return -1; +#else + if (!im-image.no_free) { -// im-image.data = realloc(im-image.data, siz); if (im-image.data) free(im-image.data); im-image.data = malloc(siz); + if (im-image.data == NULL) return -1; } - if (im-image.data == NULL) return -1; - +#endif + #ifdef HAVE_VALGRIND VALGRIND_MAKE_READABLE(im-image.data, siz); #endif - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/evfs kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/evfs Dir : e17/apps/evfs/debian Modified Files: changelog.in control rules Added Files: libevfs-bin.install libevfs-debug.install libevfs-dev.install libevfs-plugin-file-bzip2.install libevfs-plugin-file-ftp.install libevfs-plugin-file-gzip.install libevfs-plugin-file-posix.install libevfs-plugin-file-samba.install libevfs-plugin-file-sftp.install libevfs-plugin-file-tar.install libevfs-plugin-file-trash.install libevfs-plugin-file-vfolder.install libevfs-plugin-meta-audio-tagger.install libevfs-plugin-meta-extractor-tagger.install libevfs-plugin-vfolder-efolder.install libevfs-plugin-vfolder-group.install libevfs-plugin-vfolder-trash.install Removed Files: evfs0-bin.install evfs0-debug.install libevfs0-dev.install libevfs0-plugin-file-bzip2.install libevfs0-plugin-file-ftp.install libevfs0-plugin-file-gzip.install libevfs0-plugin-file-posix.install libevfs0-plugin-file-samba.install libevfs0-plugin-file-sftp.install libevfs0-plugin-file-tar.install libevfs0-plugin-file-trash.install libevfs0-plugin-file-vfolder.install libevfs0-plugin-meta-audio-tagger.install libevfs0-plugin-meta-extractor-tagger.install libevfs0-plugin-vfolder-efolder.install libevfs0-plugin-vfolder-group.install libevfs0-plugin-vfolder-trash.install Log Message: update Debian packaging. === RCS file: /cvs/e/e17/apps/evfs/debian/changelog.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- changelog.in15 Jul 2006 22:41:14 - 1.2 +++ changelog.in3 May 2008 09:05:03 - 1.3 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Thu, 20 Oct 2005 23:28:02 +0200 + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 10:49:40 + === RCS file: /cvs/e/e17/apps/evfs/debian/control,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- control 10 Sep 2007 10:59:47 - 1.8 +++ control 3 May 2008 09:05:03 - 1.9 @@ -1,13 +1,14 @@ Source: evfs Section: libs Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] +Maintainer: Falko Schmidt [EMAIL PROTECTED] Build-Depends: cdbs, debhelper (= 5), libsmbclient-dev, libxml2-dev, libecore-dev, libcurl3-dev, libbz2-dev, libeet-dev, libx11-dev, libxrender-dev, libssl-dev, libxcursor-dev, libxss-dev, libxinerama-dev, libxrandr-dev, libxp-dev, zlib1g-dev, libsqlite3-dev, libextractor-dev -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: libevfs0 Architecture: any -Depends: ${shlibs:Depends}, libbz2-1.0, libxml2, libsmbclient, libecore, libevas, libcurl3, libxinerama1, libxrandr2, libxext6, libxss1, libxcursor1, libxp6, libx11-6, libsqlite3-0 +Depends: ${shlibs:Depends} Provides: libevfs Section: libs Description: enlightenment virtual filesystem library @@ -15,203 +16,202 @@ support. This package contains the library files. -Package: libevfs0-dev +Package: libevfs-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, libevfs0, libsmbclient-dev, libxml2-dev, libecore-dev, libcurl3-dev, libbz2-dev, libeet-dev, libx11-dev, libxrender-dev, libssl-dev, libxcursor-dev, libxss-dev, libxinerama-dev, libxrandr-dev, libxp-dev, zlib1g-dev -Provides: libevfs-dev +Depends: ${shlibs:Depends}, libevfs0 (= ${Source-Version}), libsmbclient-dev, libxml2-dev, libecore-dev, libcurl3-dev, libbz2-dev, libeet-dev +Provides: libevfs0-dev Description: enlightenment virtual filesystem header files EVFS - a virtual file system for E with plugins and URI nesting support. This package contains files needed for development. -Package: evfs0-bin +Package: libevfs-bin Architecture: any Section: libs -Depends: ${shlibs:Depends}, libecore, libevfs0 -Provides: evfs-bin +Depends: ${shlibs:Depends}, libevfs0 (= ${Source-Version}) +Provides: libevfs0-bin Description: enlightenment virtual filesystem tools EVFS - a virtual file system for E with plugins and URI nesting support. This package contains evfs tools. -Package: evfs0-debug +Package: libevfs-debug Architecture: any Section: libs -Depends: ${shlibs:Depends}, libecore, libevfs0 -Provides: evfs-debug +Depends: ${shlibs:Depends}, libecore, libevfs0 (= ${Source-Version}) +Provides: libevfs0-debug Description: enlightenment virtual filesystem debug tools EVFS - a virtual file system for E with plugins and URI nesting support. This package contains evfs debug tools. -Package: libevfs0-plugin-file-posix +Package:
E CVS: proto/entrance_edit_gui kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/entrance_edit_gui Dir : e17/proto/entrance_edit_gui/debian Modified Files: changelog.in control rules Log Message: update Debian packaging. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in12 Aug 2006 17:20:40 - 1.1 +++ changelog.in3 May 2008 09:45:25 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Sat, 12 Aug 2006 14:08:14 + + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 11:41:18 + === RCS file: /cvs/e/e17/proto/entrance_edit_gui/debian/control,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- control 8 May 2007 10:39:00 - 1.3 +++ control 3 May 2008 09:45:25 - 1.4 @@ -1,13 +1,14 @@ Source: entrance-edit-gui Section: x11 Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: cdbs, debhelper (= 4.1.0), libentrance0-edit-dev, libedje0-dev, libetk0-dev -Standards-Version: 3.7.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libentrance-edit-dev, libedje-dev, libetk-dev +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: entrance-edit-gui Architecture: any -Depends: ${shlibs:Depends}, libentrance0-edit, libentrance0-widgets, libedje0, libetk0 +Depends: ${shlibs:Depends} Description: Entrance configuration editing tool Entrance is a login manager similar to gdm or kdm, it is based on the Enlightenment Foundation Libraries. It is fully themeable via Edje. @@ -15,9 +16,9 @@ This package provides a tool for editing the configuration data of the Enlightened login manager. -Package: libentrance0-widgets +Package: libentrance-widgets0 Architecture: any -Depends: ${shlibs:Depends}, libentrance0-edit, libedje0, libetk0 +Depends: ${shlibs:Depends} Provides: libentrance-widgets Description: Entrance widget library Entrance is a login manager similar to gdm or kdm, it is based on the @@ -25,10 +26,10 @@ . This package contains the Entrance widget library. -Package: libentrance0-widgets-dev +Package: libentrance-widgets-dev Architecture: any -Depends: libentrance0-edit, libetk0-dev, libedje0-dev -Provides: libentrance-widgets-dev +Depends: libentrance-edit-dev, libentrance-widgets0 (= ${Source-Version}), libetk-dev, libedje-dev +Provides: libentrance-widgets0-dev Description: Entrance widget library Entrance is a login manager similar to gdm or kdm, it is based on the Enlightenment Foundation Libraries. It is fully themeable via Edje. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/debian/rules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- rules 8 May 2007 10:39:00 - 1.2 +++ rules 3 May 2008 09:45:25 - 1.3 @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -debian/stamp-autotools-files: - ./autogen.sh --prefix=/usr - touch debian/stamp-autotools-files +DEB_MAKE_CLEAN_TARGET := clean + +clean:: + ./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/efreet Dir : e17/libs/efreet/src/lib Modified Files: efreet_ini.c Log Message: efreet segv maker removed. bad unescaping causing segvs! fixxored. === RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_ini.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- efreet_ini.c4 Nov 2007 09:32:35 - 1.8 +++ efreet_ini.c3 May 2008 09:25:43 - 1.9 @@ -69,28 +69,22 @@ efreet_ini_parse(const char *file) { FILE *f; - /* a static buffer for quick reading of lines that fit */ char static_buf[4096]; -int static_buf_len = 4096; - /* a big buffer to allocate for lines that are larger than the static one */ char *big_buf = NULL; int big_buf_len = 0; -int big_buf_step = static_buf_len; - +int big_buf_step = sizeof(static_buf); /* the current location to read into (with fgets) and the amount to read */ char *read_buf; int read_len; - /* the current buffer to parse */ char *buf; - Ecore_Hash *data, *section = NULL; /* start with the static buffer */ buf = read_buf = static_buf; -read_len = static_buf_len; +read_len = sizeof(static_buf); f = fopen(file, rb); if (!f) return NULL; @@ -229,7 +223,7 @@ next_line: /* finished parsing a line. use static buffer for next line */ buf = read_buf = static_buf; -read_len = static_buf_len; +read_len = sizeof(static_buf); read_buf[read_len - 2] = '\n'; } @@ -587,7 +581,7 @@ dest = buf; while(*p) { -if (*p == '\\') +if ((*p == '\\') (p[1] != '\0')) { p++; switch (*p) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/entrance_edit_gui kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/entrance_edit_gui Dir : e17/proto/entrance_edit_gui/debian Added Files: libentrance-widgets-dev.install libentrance-widgets0.install Removed Files: libentrance0-widgets-dev.install libentrance0-widgets.install Log Message: update Debian packaging. - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/entropy kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/entropy Dir : e17/proto/entropy/debian Modified Files: changelog.in control rules Log Message: update Debian packaging. === RCS file: /cvs/e/e17/proto/entropy/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in8 Apr 2006 11:42:50 - 1.1 +++ changelog.in3 May 2008 09:37:05 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Tue, 7 Mar 2006 13:30:15 + + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 11:26:07 + === RCS file: /cvs/e/e17/proto/entropy/debian/control,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- control 23 Oct 2006 17:11:47 - 1.4 +++ control 3 May 2008 09:37:05 - 1.5 @@ -1,13 +1,14 @@ Source: entropy Section: x11 Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), autotools-dev, libecore0-dev, libewl0-dev, libimlib2-dev, libpng12-dev, libevfs0-dev, libetk0-dev, libetk0-dev -Standards-Version: 3.7.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libecore-dev, libewl-dev, libimlib2-dev, libpng12-dev, libevfs-dev, libetk-dev +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: entropy Architecture: any -Depends: ${shlibs:Depends}, libevfs0, libetk0 | libewl0, libecore0, libimlib2, libpng12-0, libevfs0-plugin-file-posix, evfs0-bin +Depends: ${shlibs:Depends}, libevfs0, libetk0 | libewl0, libecore0, libimlib2, libpng12-0, libevfs-plugin-file-posix, libevfs-bin Suggests: libevfs0-plugins-all Description: Entropy is a file manager based on the EFL Entropy is a file manager based on the EFL and using evfs. === RCS file: /cvs/e/e17/proto/entropy/debian/rules,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- rules 5 Nov 2006 13:59:49 - 1.3 +++ rules 3 May 2008 09:37:05 - 1.4 @@ -6,7 +6,7 @@ DEB_MAKE_CLEAN_TARGET := clean clean:: - if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi + ./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS) install/entropy:: find debian/entropy/ -name '*.la' -exec rm {} \; - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/empower kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/empower Dir : e17/proto/empower/debian Modified Files: changelog.in control rules Log Message: update Debian packaging. === RCS file: /cvs/e/e17/proto/empower/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in8 Jun 2006 05:02:06 - 1.1 +++ changelog.in3 May 2008 09:59:04 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Tue, 7 Mar 2006 13:30:15 + + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 11:47:16 + === RCS file: /cvs/e/e17/proto/empower/debian/control,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- control 8 Jun 2006 05:12:24 - 1.2 +++ control 3 May 2008 09:59:04 - 1.3 @@ -1,15 +1,14 @@ Source: empower Section: x11 Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), libewl-dev, libetk-dev -Standards-Version: 3.6.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libewl-dev +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: empower Architecture: any -Depends: libewl, libetk +Depends: ${shlibs:Depends} Description: graphical sudo tool based on the EFL - Empower - A graphical sudo tool based on the Enlightenment - Foundation Libraries. Version 0.1 - an alpha release. - . - Usage: empower program command. + Empower is a graphical sudo tool based on the Enlightenment + Foundation Libraries. === RCS file: /cvs/e/e17/proto/empower/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- rules 8 Jun 2006 05:02:06 - 1.1 +++ rules 3 May 2008 09:59:04 - 1.2 @@ -1,6 +1,4 @@ #!/usr/bin/make -f -# Simple debian/rules rewrote for cdbs - include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk @@ -8,4 +6,4 @@ DEB_MAKE_CLEAN_TARGET := clean clean:: - if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi + ./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/edje_viewer kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/edje_viewer Dir : e17/apps/edje_viewer/debian Modified Files: changelog.in control rules Removed Files: README.Debian Log Message: update Debian packaging. === RCS file: /cvs/e/e17/apps/edje_viewer/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in19 Jun 2006 16:14:53 - 1.1 +++ changelog.in3 May 2008 10:10:42 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Mon, 19 Jun 2006 12:48:31 +0200 + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 12:07:34 + === RCS file: /cvs/e/e17/apps/edje_viewer/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- control 19 Jun 2006 16:14:53 - 1.1 +++ control 3 May 2008 10:10:42 - 1.2 @@ -1,13 +1,14 @@ Source: edje-viewer Section: graphics Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), libecore0-dev, libevas0-dev, libedje0-dev, libetk0-dev, enlightenment (= 0.16.999) -Standards-Version: 3.6.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libecore-dev, libevas-dev, libedje-dev, libetk-dev, enlightenment (= 0.16.999) +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: edje-viewer Architecture: any -Depends: libecore0, libevas0, libedje0, libetk0 +Depends: ${shlibs:Depends} Recommends: enlightenment (= 0.16.999) Description: A simple viewer for edj files Edje-viewer should provide more ease of use than the === RCS file: /cvs/e/e17/apps/edje_viewer/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- rules 19 Jun 2006 16:14:53 - 1.1 +++ rules 3 May 2008 10:10:42 - 1.2 @@ -6,5 +6,4 @@ DEB_MAKE_CLEAN_TARGET := clean clean:: - if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi - + ./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/emphasis kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/emphasis Dir : e17/apps/emphasis/debian Modified Files: changelog.in control copyright rules Log Message: update Debian packaging. === RCS file: /cvs/e/e17/apps/emphasis/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in8 Jul 2006 17:04:59 - 1.1 +++ changelog.in3 May 2008 10:46:01 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Sat, 8 Jul 2006 13:47:56 +0100 + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 12:38:47 + === RCS file: /cvs/e/e17/apps/emphasis/debian/control,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- control 8 Jul 2006 17:04:59 - 1.1 +++ control 3 May 2008 10:46:01 - 1.2 @@ -1,13 +1,14 @@ Source: emphasis Section: x11 Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), libecore-dev, libetk-dev, libmpd-dev (= 0.12.0) -Standards-Version: 3.6.2.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libecore-dev, libetk-dev, libmpd-dev (= 0.12.0), libenhance-dev +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: emphasis Architecture: any -Depends: ${shlibs:Depends}, libetk, libecore, libmpd0 (= 0.12.0) +Depends: ${shlibs:Depends}, libmpd0 (= 0.12.0) Suggests: enlightenment Description: An Etk based MPD client Emphasis is an MPD client based on Etk. === RCS file: /cvs/e/e17/apps/emphasis/debian/copyright,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- copyright 17 Jan 2007 01:51:42 - 1.2 +++ copyright 3 May 2008 10:46:01 - 1.3 @@ -4,13 +4,15 @@ The source code is from the e17/apps/emphasis module of the enlightenment CVS tree. For more information, see: -http://www.enlightenment.org/cvs.html + http://www.enlightenment.org/cvs.html Upstream Author: Samuel 'lok' Mendes [EMAIL PROTECTED] Copyright: -Copyright (C) 2006 Samuel Mendes and various contributors (see AUTHORS) + Copyright (C) 2006 Samuel Mendes and various contributors (see AUTHORS) + +License: You are free to distribute this software under the terms of the GNU General Public License. === RCS file: /cvs/e/e17/apps/emphasis/debian/rules,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- rules 8 Jul 2006 17:04:59 - 1.1 +++ rules 3 May 2008 10:46:01 - 1.2 @@ -5,5 +5,4 @@ DEB_MAKE_CLEAN_TARGET := clean clean:: - if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi - + ./autogen.sh --prefix=/usr $(DEB_CONFIGURE_EXTRA_FLAGS) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/enhance kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : libs/enhance Dir : e17/libs/enhance/debian Modified Files: changelog.in control copyright rules Added Files: libenhance-dev.install Removed Files: README.Debian libenhance0-dev.install Log Message: update Debian packaging. === RCS file: /cvs/e/e17/libs/enhance/debian/changelog.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- changelog.in27 Jun 2006 15:35:29 - 1.3 +++ changelog.in3 May 2008 10:46:47 - 1.4 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Thu, 9 Feb 2006 01:47:09 +0100 + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 12:30:50 + === RCS file: /cvs/e/e17/libs/enhance/debian/control,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- control 27 Jun 2006 15:51:50 - 1.6 +++ control 3 May 2008 10:46:47 - 1.7 @@ -1,14 +1,14 @@ Source: enhance Section: libs Priority: optional -Maintainer: E17 Debian Team [EMAIL PROTECTED] -Build-Depends: debhelper (= 4.0.0), libexml, libetk-dev -Standards-Version: 3.6.2.2 +Maintainer: Falko Schmidt [EMAIL PROTECTED] +Build-Depends: cdbs, debhelper (= 6), libexml0, libetk-dev +Standards-Version: 3.7.3 +Homepage: http://www.enlightenment.org Package: libenhance0 Architecture: any -Section: libs -Depends: libetk, libexml +Depends: ${shlibs:Depends} Provides: libenhance Description: Library for easy application GUI development After using Glade to design a GUI, you can save generate @@ -20,11 +20,11 @@ callbacks for you. There are several examples in the examples directory for you to take a look at. -Package: libenhance0-dev +Package: libenhance-dev Architecture: any Section: libdevel -Depends: libetk, libexml, libenhance0 -Provides: libenhance-dev +Depends: libetk-dev, libexml-dev, libenhance0 (= ${Source-Version}) +Provides: libenhance0-dev Description: Headers for libenhance0 After using Glade to design a GUI, you can save generate the .glade XML file that describes the interface design === RCS file: /cvs/e/e17/libs/enhance/debian/copyright,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- copyright 17 Jan 2007 01:51:24 - 1.3 +++ copyright 3 May 2008 10:46:47 - 1.4 @@ -4,37 +4,42 @@ The source code is from the e17/libs/enhance module of the enlightenment CVS tree. For more information, see: -http://www.enlightenment.org/cvs.html + http://www.enlightenment.org Upstream Author: Hisham Mardam Bey [EMAIL PROTECTED] Copyright: -Copyright (C) 2005 Hisham Mardam Bey and various contributors (see AUTHORS) + Copyright (C) 2005 Hisham Mardam Bey and various contributors (see AUTHORS) -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the Software), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies of the Software and its Copyright notices. In addition publicly -documented acknowledgment must be given that this software has been used if no -source code of this software is made available publicly. This includes -acknowledgments in either Copyright notices, Manuals, Publicity and Marketing -documents or any documentation provided with any product containing this -software. This License does not apply to any software that links to the -libraries provided by this software (statically or dynamically), but only to -the software provided. - -Please see the COPYING.PLAIN for a plain-english explanation of this notice -and it's intent. - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +License: + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the Software), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to
E CVS: proto/edje_editor kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/edje_editor Dir : e17/proto/edje_editor/debian Added Files: .cvsignore changelog.in control copyright rules Log Message: add Debian files. - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/edje_editor kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : proto/edje_editor Dir : e17/proto/edje_editor/debian Log Message: Directory /cvs/e/e17/proto/edje_editor/debian added to the repository - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: debian kaethorn
Enlightenment CVS committal Author : kaethorn Project : e_modules Module : debian Dir : e_modules/debian Modified Files: changelog.in control copyright rules Added Files: emodule-alarm.install emodule-bling.install emodule-calendar.install emodule-cpu.install emodule-deskshow.install emodule-echo.install emodule-efm-nav.install emodule-efm-path.install emodule-emu.install emodule-execwatch.install emodule-flame.install emodule-forecasts.install emodule-iiirk.install emodule-language.install emodule-mail.install emodule-mem.install emodule-mixer.install emodule-moon.install emodule-mpdule.install emodule-net.install emodule-news.install emodule-notification.install emodule-penguins.install emodule-photo.install emodule-rain.install emodule-screenshot.install emodule-slideshow.install emodule-snow.install emodule-taskbar.install emodule-tclock.install emodule-uptime.install emodule-weather.install emodule-winselector.install emodule-wlan.install Removed Files: emodule0-alarm.install emodule0-bling.install emodule0-calendar.install emodule0-cpu.install emodule0-deskshow.install emodule0-echo.install emodule0-efm-nav.install emodule0-efm-path.install emodule0-emu.install emodule0-execwatch.install emodule0-flame.install emodule0-forecasts.install emodule0-iiirk.install emodule0-language.install emodule0-mail.install emodule0-mem.install emodule0-mixer.install emodule0-moon.install emodule0-mpdule.install emodule0-net.install emodule0-news.install emodule0-notification.install emodule0-penguins.install emodule0-photo.install emodule0-rain.install emodule0-screenshot.install emodule0-slideshow.install emodule0-snow.install emodule0-taskbar.install emodule0-tclock.install emodule0-uptime.install emodule0-weather.install emodule0-winselector.install emodule0-wlan.install Log Message: update Debian packaging. === RCS file: /cvs/e/e_modules/debian/changelog.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- changelog.in4 Jul 2006 05:49:18 - 1.1 +++ changelog.in3 May 2008 12:26:28 - 1.2 @@ -2,5 +2,5 @@ * a CVS snapshot release. - -- E17 Debian Team [EMAIL PROTECTED] Tue, 28 Mar 2006 16:38:09 + + -- Falko Schmidt [EMAIL PROTECTED] Sat, 3 May 2008 14:23:19 + === RCS file: /cvs/e/e_modules/debian/control,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- control 1 May 2008 17:01:16 - 1.31 +++ control 3 May 2008 12:26:28 - 1.32 @@ -8,28 +8,28 @@ Package: emodule-alarm Architecture: any -Depends: ${shlibs:Depends}, enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-alarm Description: The E17 Alarm Module A module to set Alarms in Enlightenment 17. Package: emodule-bling Architecture: any -Depends: ${shlibs:Depends}, enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-bling Description: An E17 module providing a Composite Manager An E17 module which acts as a Composite Manager. Package: emodule-calendar Architecture: any -Depends: ${shlibs:Depends}, enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-calendar Description: E17 calendar module An E17 module which displays a calendar on the desktop. Package: emodule-cpu Architecture: any -Depends: ${shlibs:Depends}, enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-cpu Description: E17 monitor module for the CPU load An E17 module which displays the current CPU load. Features are: @@ -38,7 +38,7 @@ Package: emodule-deskshow Architecture: any -Depends: ${shlibs:Depends}, enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-deskshow Description: E17 module which minimizes all windows An E17 module which minimizes all windows in order to show the @@ -46,7 +46,7 @@ Package: emodule-echo Architecture: any -Depends: ${shlibs:Depends}, libc6 (= 2.5), enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-echo Description: E17 sound volume module An E17 module which allows the user to adjust the volume of the sound @@ -54,7 +54,7 @@ Package: emodule-efm-nav Architecture: any -Depends: ${shlibs:Depends}, libc6 (= 2.5), enlightenment +Depends: ${shlibs:Depends}, enlightenment (= 0.16.999) Provides: emodule0-efm-nav Description: E17 file manager navigation module An E17 module which allows the user to navigate through the
E CVS: apps/e kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: control Log Message: add evas engines to dependencies. === RCS file: /cvs/e/e17/apps/e/debian/control,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- control 1 May 2008 15:43:53 - 1.28 +++ control 3 May 2008 18:17:15 - 1.29 @@ -9,7 +9,7 @@ Package: enlightenment Section: x11 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, libevas-engine-buffer, libevas-engine-software-x11 Suggests: entrance Description: Enlightenment themes, etc. Enlightenment is an advanced window manager for X11. Unique - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e mekius
Enlightenment CVS committal Author : mekius Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Add alert popup to battery module. Was broken after batget changes. Popup is now themeable and also a bit less intrusive. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_config.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_mod_config.c 11 Jan 2008 07:33:55 - 1.26 +++ e_mod_config.c 3 May 2008 19:51:49 - 1.27 @@ -3,10 +3,12 @@ struct _E_Config_Dialog_Data { - int show_alert; + int show_alert; int poll_interval; - int alarm_time; - int alarm_percent; + int alert_time; + int alert_percent; + int dismiss_alert; + int alert_timeout; }; /* Protos */ @@ -46,13 +48,20 @@ _fill_data(E_Config_Dialog_Data *cfdata) { if (!battery_config) return; - cfdata-alarm_time = battery_config-alarm; - cfdata-alarm_percent = battery_config-alarm_p; + cfdata-alert_time = battery_config-alert; + cfdata-alert_percent = battery_config-alert_p; cfdata-poll_interval = battery_config-poll_interval; - if (cfdata-alarm_time 0 || cfdata-alarm_percent 0) + cfdata-alert_timeout = battery_config-alert_timeout; + + if (cfdata-alert_time 0 || cfdata-alert_percent 0) cfdata-show_alert = 1; else cfdata-show_alert = 0; + + if (cfdata-alert_timeout 0) + cfdata-dismiss_alert = 1; + else + cfdata-dismiss_alert = 0; } static void * @@ -90,16 +99,23 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { if (!battery_config) return 0; + if (cfdata-show_alert) - { - battery_config-alarm = cfdata-alarm_time; - battery_config-alarm_p = cfdata-alarm_percent; - } + { +battery_config-alert = cfdata-alert_time; +battery_config-alert_p = cfdata-alert_percent; + } else - { - battery_config-alarm = 0; - battery_config-alarm_p = 0; - } + { +battery_config-alert = 0; +battery_config-alert_p = 0; + } + + if (cfdata-dismiss_alert) + battery_config-alert_timeout = cfdata-alert_timeout; + else + battery_config-alert_timeout = 0; + _battery_config_updated(); e_config_save_queue(); return 1; @@ -117,7 +133,7 @@ ob = e_widget_label_add(evas, _(Check battery every:)); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _(%1.0f ticks), 1, 1024, 4, 0, NULL, (cfdata-poll_interval), 200); + ob = e_widget_slider_add(evas, 1, 0, _(%1.0f ticks), 1, 1024, 4, 0, NULL, (cfdata-poll_interval), 256); e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_check_add(evas, _(Show alert when battery is low), (cfdata-show_alert)); @@ -126,11 +142,20 @@ ob = e_widget_label_add(evas, _(Alert when battery is down to:)); e_widget_frametable_object_append(of, ob, 0, 3, 1, 1, 1, 0, 1, 1); - ob = e_widget_slider_add(evas, 1, 0, _(%1.0f minutes), 1, 60, 1, 0, NULL, (cfdata-alarm_time), 200); + ob = e_widget_slider_add(evas, 1, 0, _(%1.0f minutes), 0, 60, 1, 0, NULL, (cfdata-alert_time), 60); e_widget_frametable_object_append(of, ob, 0, 4, 1, 1, 1, 0, 1, 0); - ob = e_widget_slider_add(evas, 1, 0, _(%1.0f percent), 1, 100, 1, 0, NULL, (cfdata-alarm_percent), 200); + ob = e_widget_slider_add(evas, 1, 0, _(%1.0f percent), 0, 100, 1, 0, NULL, (cfdata-alert_percent), 100); e_widget_frametable_object_append(of, ob, 0, 5, 1, 1, 1, 0, 1, 0); + + ob = e_widget_check_add(evas, _(Dismiss alert automatically), (cfdata-dismiss_alert)); + e_widget_frametable_object_append(of, ob, 0, 6, 1, 1, 1, 1, 1, 0); + + ob = e_widget_label_add(evas, _(Dismiss alert after:)); + e_widget_frametable_object_append(of, ob, 0, 7, 1, 1, 1, 0, 1, 0); + + ob = e_widget_slider_add(evas, 1, 0, _(%1.0f seconds), 1, 300, 1, 0, NULL, (cfdata-alert_timeout), 150); + e_widget_frametable_object_append(of, ob, 0, 8, 1, 1, 1, 0, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); return o; @@ -140,17 +165,25 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { if (!battery_config) return 0; + battery_config-poll_interval = cfdata-poll_interval; + if (cfdata-show_alert) - { - battery_config-alarm = cfdata-alarm_time; - battery_config-alarm_p = cfdata-alarm_percent; - } + { +battery_config-alert = cfdata-alert_time; +battery_config-alert_p = cfdata-alert_percent; + } else - { - battery_config-alarm = 0; - battery_config-alarm_p = 0; - } + { +battery_config-alert = 0; +battery_config-alert_p = 0; + } + + if (cfdata-dismiss_alert) + battery_config-alert_timeout =
E CVS: apps/e mekius
Enlightenment CVS committal Author : mekius Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default_battery.edc Log Message: Add alert popup to battery module. Was broken after batget changes. Popup is now themeable and also a bit less intrusive. === RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- default_battery.edc 23 Apr 2008 05:51:02 - 1.16 +++ default_battery.edc 3 May 2008 19:51:49 - 1.17 @@ -296,3 +296,90 @@ } } } +group { + name: e/modules/battery/popup; + max: 420 96; + min: 240 64; + parts { + part { + name: battery; + type: SWALLOW; + mouse_events: 1; + repeat_events: 1; + description { +state: default 0.0; +min: 1 1; +max: 120 120; +color: 255 255 255 255; +rel1 { + relative: 0.0 0.0; +} +rel2 { + relative: 0.25 1.0; +} + } + } + part { + name: text; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description { +state: default 0.0; +min: 120 1; +max: 300 48; +fixed: 1 1; +color: 255 255 255 255; +rel1 { + relative: 1.0 0.5; + to_x:battery; + offset: 0 -7; +} +rel2 { + relative: 1.0 0.5; + offset: 0 -7; +} + +text { + text: Your battery is low!; + font: Sans:style=Bold,Edje-Vera-Bold; + size: 10; + min: 1 1; + align: 0.5 1.0; + text_class: module_large; +} + } + } + part { + name: text2; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; + description { +state: default 0.0; +color: 255 255 255 255; +min: 120 1; +max: 300 48; +fixed: 1 1; +rel1 { + relative: 1.0 0.5; + to_x: battery; + offset: 5 7; +} +rel2 { + relative: 1.0 0.5; + offset: 0 7; +} + +text { + text: AC power is recommended.; + font: Sans:style=Bold,Edje-Vera-Bold; + size: 10; + min: 1 1; + align: 0.5 1.0; + text_class: module_large; +} + } + } + } +} - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: Fix formatting issues. Remove Whitespace. Use E_FREE to free the inst struct (Ensures to null the pointer). === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- e_mod_main.c3 May 2008 19:51:49 - 1.116 +++ e_mod_main.c3 May 2008 20:12:57 - 1.117 @@ -6,8 +6,6 @@ #define POPUP_DEBOUNCE_CYCLES 2 -/***/ -/**/ /* gadcon requirements */ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); @@ -15,6 +13,7 @@ static char *_gc_label(void); static Evas_Object *_gc_icon(Evas *evas); static const char *_gc_id_new(void); + /* and actually define the gadcon class that this module provides (just 1) */ static const E_Gadcon_Client_Class _gadcon_class = { @@ -25,13 +24,8 @@ }, E_GADCON_CLIENT_STYLE_PLAIN }; -/**/ -/***/ -/***/ -/**/ /* actual module specifics */ - typedef struct _Instance Instance; struct _Instance @@ -65,21 +59,21 @@ Evas_Object *o; E_Gadcon_Client *gcc; Instance *inst; - + battery_config-full = -2; battery_config-time_left = -2; battery_config-have_battery = -2; battery_config-have_power = -2; - + inst = E_NEW(Instance, 1); - + o = edje_object_add(gc-evas); e_theme_edje_object_set(o, base/theme/modules/battery, e/modules/battery/main); - + gcc = e_gadcon_client_new(gc, name, id, style, o); gcc-data = inst; - + inst-gcc = gcc; inst-o_battery = o; inst-warning = NULL; @@ -87,8 +81,10 @@ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _button_cb_mouse_down, inst); - battery_config-instances = evas_list_append(battery_config-instances, inst); + battery_config-instances = + evas_list_append(battery_config-instances, inst); _battery_config_updated(); + return gcc; } @@ -96,16 +92,17 @@ _gc_shutdown(E_Gadcon_Client *gcc) { Instance *inst; - + inst = gcc-data; - battery_config-instances = evas_list_remove(battery_config-instances, inst); + battery_config-instances = + evas_list_remove(battery_config-instances, inst); evas_object_del(inst-o_battery); if(inst-warning) { e_object_del(E_OBJECT(inst-warning)); inst-popup_battery = NULL; } - free(inst); + E_FREE(inst); } static void @@ -113,7 +110,7 @@ { Instance *inst; Evas_Coord mw, mh; - + inst = gcc-data; mw = 0, mh = 0; edje_object_size_min_get(inst-o_battery, mw, mh); @@ -136,7 +133,7 @@ { Evas_Object *o; char buf[4096]; - + o = edje_object_add(evas); snprintf(buf, sizeof(buf), %s/e-module-battery.edj, e_module_dir_get(battery_config-module)); @@ -150,17 +147,12 @@ return _gadcon_class.name; } -/**/ -/***/ - -/***/ -/**/ static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info) { Instance *inst; Evas_Event_Mouse_Down *ev; - + inst = data; ev = event_info; if ((ev-button == 3) (!battery_config-menu)) @@ -168,7 +160,7 @@ E_Menu *mn; E_Menu_Item *mi; int cx, cy, cw, ch; - + mn = e_menu_new(); e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst); battery_config-menu = mn; @@ -177,9 +169,9 @@ e_menu_item_label_set(mi, _(Configuration)); e_util_menu_item_edje_icon_set(mi, enlightenment/configuration); e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL); - + e_gadcon_client_util_menu_items_append(inst-gcc, mn, 0); - + e_gadcon_canvas_zone_geometry_get(inst-gcc-gadcon, cx, cy, cw, ch); e_menu_activate_mouse(mn, @@ -189,8 +181,8 @@ e_util_evas_fake_mouse_up_later(inst-gcc-gadcon-evas, ev-button); } -if (ev-button == 1) - _battery_cb_warning_popup_hide(data, e, obj, event_info); + if (ev-button == 1) + _battery_cb_warning_popup_hide(data, e, obj, event_info); } static void @@ -220,9 +212,9 @@ { char buf[256]; int hrs, mins; - - hrs = time_left / 3600; -
E CVS: apps/e mekius
Enlightenment CVS committal Author : mekius Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: Fix an issue with the auto popup hiding. Reenable popup after reconfiguring the battery module. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.117 retrieving revision 1.118 diff -u -3 -r1.117 -r1.118 --- e_mod_main.c3 May 2008 20:12:57 - 1.117 +++ e_mod_main.c3 May 2008 21:49:37 - 1.118 @@ -44,9 +44,10 @@ static void _battery_face_time_set(Evas_Object *battery, int time); static void _battery_face_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi); +static int _battery_cb_warning_popup_timeout(void *data); static void _battery_cb_warning_popup_hide(void *data, Evas *e, Evas_Object *obj, void *event); static void _battery_warning_popup_resize(Evas_Object *obj, int *w, int *h); -static int _battery_warning_popup_destroy(void *data); +static void _battery_warning_popup_destroy(Instance *inst); static void _battery_warning_popup(Instance *inst, int time, double percent); static E_Config_DD *conf_edd = NULL; @@ -167,7 +168,7 @@ mi = e_menu_item_new(mn); e_menu_item_label_set(mi, _(Configuration)); - e_util_menu_item_edje_icon_set(mi, enlightenment/configuration); + e_util_menu_item_edje_icon_set(mi, enlightenment/configuration); e_menu_item_callback_set(mi, _battery_face_cb_menu_configure, NULL); e_gadcon_client_util_menu_items_append(inst-gcc, mn, 0); @@ -232,9 +233,17 @@ void _battery_config_updated(void) { + Evas_List *l = NULL; char buf[4096]; if (!battery_config) return; + + if(battery_config-instances) + { +for (l = battery_config-instances; l; l = l-next) + _battery_warning_popup_destroy(l-data); + } + if (battery_config-batget_exe) { ecore_exe_terminate(battery_config-batget_exe); @@ -252,16 +261,13 @@ } static int -_battery_warning_popup_destroy(void *data) +_battery_cb_warning_popup_timeout(void *data) { Instance *inst; inst = data; - if ((!inst) || (!inst-warning)) return; - e_object_del(E_OBJECT(inst-warning)); - inst-warning = NULL; - inst-popup_battery = NULL; + e_gadcon_popup_hide(inst-warning); return 0; } @@ -274,7 +280,17 @@ inst = (Instance *)data; if ((!inst) || (!inst-warning)) return; - _battery_warning_popup_destroy(inst); + e_gadcon_popup_hide(inst-warning); +} + +static void +_battery_warning_popup_destroy(Instance *inst) +{ + if(!inst || !inst-warning) return; + + e_object_del(E_OBJECT(inst-warning)); + inst-warning = NULL; + inst-popup_battery = NULL; } static void @@ -341,7 +357,7 @@ if (battery_config-alert_timeout) { ecore_timer_add(battery_config-alert_timeout, -_battery_warning_popup_destroy, inst); +_battery_cb_warning_popup_timeout, inst); } } @@ -500,6 +516,9 @@ int mins, hrs; static int debounce_popup = 0; + if (debounce_popup POPUP_DEBOUNCE_CYCLES) +debounce_popup = 0; + if (sscanf(ev-lines[i].line, %i %i %i %i, full, time_left, have_battery, have_power) == 4) @@ -560,11 +579,8 @@ if (++debounce_popup == POPUP_DEBOUNCE_CYCLES) _battery_warning_popup(inst, time_left, (double)full/100.0); } -else if (have_power) - { - _battery_warning_popup_destroy(inst); - debounce_popup = 0; - } +else if(have_power) + _battery_warning_popup_destroy(inst); } if (!have_battery) e_powersave_mode_set(E_POWERSAVE_MODE_LOW); - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: Fix formatting. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -3 -r1.118 -r1.119 --- e_mod_main.c3 May 2008 21:49:37 - 1.118 +++ e_mod_main.c3 May 2008 22:18:35 - 1.119 @@ -98,7 +98,7 @@ battery_config-instances = evas_list_remove(battery_config-instances, inst); evas_object_del(inst-o_battery); - if(inst-warning) + if (inst-warning) { e_object_del(E_OBJECT(inst-warning)); inst-popup_battery = NULL; @@ -238,7 +238,7 @@ if (!battery_config) return; - if(battery_config-instances) + if (battery_config-instances) { for (l = battery_config-instances; l; l = l-next) _battery_warning_popup_destroy(l-data); @@ -286,7 +286,7 @@ static void _battery_warning_popup_destroy(Instance *inst) { - if(!inst || !inst-warning) return; + if (!inst || !inst-warning) return; e_object_del(E_OBJECT(inst-warning)); inst-warning = NULL; @@ -539,7 +539,7 @@ edje_object_signal_emit(inst-o_battery, e,state,discharging, e); - if(inst-popup_battery) + if (inst-popup_battery) edje_object_signal_emit(inst-popup_battery, e,state,discharging, e); } @@ -550,7 +550,7 @@ { _battery_face_level_set(inst-o_battery, (double)full / 100.0); - if(inst-popup_battery) + if (inst-popup_battery) _battery_face_level_set(inst-popup_battery, (double)full / 100.0); } @@ -566,7 +566,7 @@ if (time_left != battery_config-time_left) { _battery_face_time_set(inst-o_battery, time_left); - if(inst-popup_battery) + if (inst-popup_battery) _battery_face_time_set(inst-popup_battery, time_left); } @@ -579,7 +579,7 @@ if (++debounce_popup == POPUP_DEBOUNCE_CYCLES) _battery_warning_popup(inst, time_left, (double)full/100.0); } -else if(have_power) +else if (have_power) _battery_warning_popup_destroy(inst); } if (!have_battery) - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl jethomas
Enlightenment CVS committal Author : jethomas Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/groups/inc Modified Files: menu-programs.edc Log Message: Small theme change === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/groups/inc/menu-programs.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- menu-programs.edc 8 Mar 2007 10:23:13 - 1.2 +++ menu-programs.edc 4 May 2008 03:07:05 - 1.3 @@ -1,7 +1,7 @@ program { name: go_active_pre; - signal: mouse,in; + signal: focus,in; source: *; action: STATE_SET default 0.0; target: title_outline; @@ -41,7 +41,7 @@ program { name: go_passive_pre; - signal: mouse,out; + signal: focus,out; source: *; action: STATE_SET active 0.0; target: title_outline; - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus mekius
Enlightenment CVS committal Author : mekius Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/nm Modified Files: E_Nm.h Log Message: Fix typo === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/E_Nm.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- E_Nm.h 25 Mar 2008 18:22:01 - 1.7 +++ E_Nm.h 4 May 2008 03:44:07 - 1.8 @@ -1,5 +1,5 @@ #ifndef E_NM_H -#define E_HM_H +#define E_NM_H #include E_DBus.h #include Ecore_Data.h - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: enna barbieri
Enlightenment CVS committal Author : barbieri Project : misc Module : enna Dir : misc/enna/src/bin Modified Files: enna_scanner.c Log Message: Use newer lms scanners. LMS now have scanners for id3, asf (wma) and real audio that don't rely on external libraries. === RCS file: /cvs/e/misc/enna/src/bin/enna_scanner.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- enna_scanner.c 29 Jan 2008 23:05:03 - 1.2 +++ enna_scanner.c 4 May 2008 04:13:41 - 1.3 @@ -458,7 +458,9 @@ lms_set_commit_interval(scanner-lms, scanner-commit_interval); lms_set_slave_timeout(scanner-lms, scanner-slave_timeout); - lms_parser_find_and_add(scanner-lms, id3lib); + lms_parser_find_and_add(scanner-lms, id3); + lms_parser_find_and_add(scanner-lms, asf); + lms_parser_find_and_add(scanner-lms, rm); lms_parser_find_and_add(scanner-lms, audio-dummy); lms_parser_find_and_add(scanner-lms, ogg); - This SF.net email is sponsored by the 2008 JavaOne(SM) Conference Don't miss this year's exciting event. There's still time to save $100. Use priority code J8TL2D2. http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs