E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/etc Log Message: Directory /cvs/e/e17/apps/e/data/etc added to the repository - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c
Log Message:
Allow relative icon paths in .desktops.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ecore_desktop.c 2 Sep 2006 04:19:25 - 1.21
+++ ecore_desktop.c 3 Sep 2006 07:31:35 - 1.22
@@ -255,13 +255,46 @@
free(tmp);
}
}
+
+
result-icon =
(char *)ecore_hash_get(result-group, Icon);
-
result-icon_class =
(char *)ecore_hash_get(result-group,
X-Enlightenment-IconClass);
- result-icon_path =
+ value =
(char *)ecore_hash_get(result-group,
X-Enlightenment-IconPath);
+ if (value)
+ result-icon_path = strdup(value);
+
+ if ((result-icon != NULL) (result-icon_path ==
NULL) (strchr(result-icon, '/') != NULL))
+ {
+if(result-icon[0] == '/')
+ {
+ result-icon_path = strdup(result-icon);
+ result-icon = NULL;
+ }
+else /* It's a relative path. */
+ {
+ char *temp;
+
+ size = strlen(result-original_path) +
strlen(result-icon) + 2;
+ temp = malloc(size);
+ if (temp)
+ {
+char *dir;
+
+ dir =
ecore_file_get_dir(result-original_path);
+if (dir)
+ {
+ sprintf(temp, %s/%s, dir,
result-icon);
+ result-icon_path =
ecore_file_realpath(temp);
+ result-icon = NULL;
+ free(dir);
+ }
+free(temp);
+ }
+ }
+ }
result-categories =
(char *)ecore_hash_get(result-group, Categories);
@@ -301,13 +334,9 @@
/* If the icon in the file is not a full path, just put
it first in the class, greatly simplifies things.
* Otherwise, put that full path into the icon_path
member.
*/
+ size = 0;
if ((result-icon) (result-icon[0] != '/'))
size += strlen(result-icon) + 1;
- else
-{
- result-icon_path = result-icon;
- result-icon = NULL;
-}
if (eap_name) size += strlen(eap_name) + 1;
if (exe) size += strlen(exe) + 1;
if (categories) size += strlen(categories) + 1;
@@ -573,6 +602,8 @@
{
if (desktop-original_path)
free(desktop-original_path);
+ if (desktop-icon_path)
+ free(desktop-icon_path);
if (desktop-original_lang)
free(desktop-original_lang);
if (desktop-eap_name)
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: emu onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : emu Dir : e_modules/emu/src/modules/emu Modified Files: module.desktop.in Log Message: Use a relative path for the icon. === RCS file: /cvs/e/e_modules/emu/src/modules/emu/module.desktop.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- module.desktop.in 2 Sep 2006 12:14:51 - 1.1 +++ module.desktop.in 3 Sep 2006 07:37:14 - 1.2 @@ -3,5 +3,5 @@ GenericName=gadget Comment=Experimental generic scriptable module for E17 Exec=enlightenment [EMAIL PROTECTED]@/enlightenment/modules/emu/module.edj +Icon=./module.edj X-Enlightenment-IconClass=emu,gadget - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: .cvsignore Makefile.am e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 19 Dec 2005 00:32:30 - 1.2 +++ .cvsignore 3 Sep 2006 07:40:45 - 1.3 @@ -6,4 +6,4 @@ module.la *.la *.lo - +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 1 Jun 2006 06:44:37 - 1.9 +++ Makefile.am 3 Sep 2006 07:40:45 - 1.10 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -24,3 +24,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_config.c 14 Aug 2006 15:22:46 - 1.22 +++ e_mod_config.c 3 Sep 2006 07:40:45 - 1.23 @@ -55,7 +55,7 @@ v-advanced.apply_cfdata = _advanced_apply_data; v-advanced.create_widgets = _advanced_create_widgets; - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(temperature_config-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(temperature_config-module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _(Temperature Configuration), E, _e_mod_temperature_config_dialog, === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- e_mod_main.c2 Sep 2006 23:46:59 - 1.68 +++ e_mod_main.c3 Sep 2006 07:40:45 - 1.69 @@ -113,7 +113,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(temperature_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/dropshadow Modified Files: .cvsignore Makefile.am e_mod_config.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 2 Dec 2004 18:41:29 - 1.1 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.2 @@ -4,3 +4,4 @@ Makefile.in *.lo module.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 1 Jun 2006 06:44:36 - 1.9 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.10 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -25,3 +25,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/e_mod_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_config.c 14 Aug 2006 15:22:45 - 1.12 +++ e_mod_config.c 3 Sep 2006 07:40:44 - 1.13 @@ -32,7 +32,7 @@ v-basic.apply_cfdata = _basic_apply_data; v-basic.create_widgets = _basic_create_widgets; - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(ds-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(ds-module)); cfd = e_config_dialog_new(con, _(Dropshadow Configuration), E, _e_mod_dropshadow_config_dialog, - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: .cvsignore Makefile.am e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/battery/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 19 Dec 2005 00:31:57 - 1.2 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.3 @@ -6,3 +6,4 @@ module.la *.lo *.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/battery/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 1 Jun 2006 06:44:36 - 1.10 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.11 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -25,3 +25,6 @@ module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_config.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_mod_config.c 14 Aug 2006 15:22:45 - 1.20 +++ e_mod_config.c 3 Sep 2006 07:40:44 - 1.21 @@ -32,7 +32,7 @@ v-advanced.apply_cfdata = _advanced_apply_data; v-advanced.create_widgets = _advanced_create_widgets; - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(battery_config-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(battery_config-module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _(Battery Monitor Configuration), E, _e_mod_battery_config_dialog, === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -3 -r1.88 -r1.89 --- e_mod_main.c23 Aug 2006 04:02:02 - 1.88 +++ e_mod_main.c3 Sep 2006 07:40:44 - 1.89 @@ -142,7 +142,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(battery_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: .cvsignore Makefile.am e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 8 May 2005 22:36:01 - 1.3 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.4 @@ -4,3 +4,4 @@ Makefile.in *.lo module.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 1 Jun 2006 06:44:37 - 1.10 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.11 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -24,3 +24,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_mod_config.c 14 Aug 2006 15:22:45 - 1.27 +++ e_mod_config.c 3 Sep 2006 07:40:44 - 1.28 @@ -46,7 +46,7 @@ v-advanced.create_widgets = NULL; /* Create The Dialog */ - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(ibox_config-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(ibox_config-module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _(IBox Configuration), E, _e_mod_ibox_config_dialog, === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- e_mod_main.c23 Aug 2006 04:02:03 - 1.64 +++ e_mod_main.c3 Sep 2006 07:40:44 - 1.65 @@ -237,7 +237,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(ibox_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/itray Modified Files: Makefile.am Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/itray/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 1 Jun 2006 06:44:37 - 1.4 +++ Makefile.am 3 Sep 2006 07:40:45 - 1.5 @@ -24,3 +24,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: .cvsignore Makefile.am e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/pager/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 9 Jan 2005 19:17:51 - 1.1 +++ .cvsignore 3 Sep 2006 07:40:45 - 1.2 @@ -4,3 +4,4 @@ Makefile.in *.lo module.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/pager/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 1 Jun 2006 06:44:37 - 1.9 +++ Makefile.am 3 Sep 2006 07:40:45 - 1.10 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -24,3 +24,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_mod_config.c 14 Aug 2006 15:22:46 - 1.21 +++ e_mod_config.c 3 Sep 2006 07:40:45 - 1.22 @@ -32,7 +32,7 @@ v-advanced.apply_cfdata = _advanced_apply_data; v-advanced.create_widgets = _advanced_create_widgets; - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(pager_config-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(pager_config-module)); cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _(Pager Configuration), E, _e_mod_pager_config_dialog, === RCS file: /cvs/e/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.185 retrieving revision 1.186 diff -u -3 -r1.185 -r1.186 --- e_mod_main.c26 Aug 2006 10:10:42 - 1.185 +++ e_mod_main.c3 Sep 2006 07:40:45 - 1.186 @@ -232,7 +232,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(pager_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: .cvsignore Makefile.am e_mod_config.c e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 2 Dec 2004 18:41:29 - 1.1 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.2 @@ -4,3 +4,4 @@ Makefile.in *.lo module.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/Makefile.am,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- Makefile.am 1 Jun 2006 06:44:36 - 1.11 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.12 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -23,3 +23,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_mod_config.c 14 Aug 2006 15:22:45 - 1.29 +++ e_mod_config.c 3 Sep 2006 07:40:44 - 1.30 @@ -46,7 +46,7 @@ v-advanced.apply_cfdata = NULL; v-advanced.create_widgets = NULL; - snprintf(buf, sizeof(buf), %s/module.eap, e_module_dir_get(ibar_config-module)); + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(ibar_config-module)); /* Create The Dialog */ cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), _(IBar Configuration), === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.138 retrieving revision 1.139 diff -u -3 -r1.138 -r1.139 --- e_mod_main.c30 Aug 2006 10:06:32 - 1.138 +++ e_mod_main.c3 Sep 2006 07:40:44 - 1.139 @@ -228,7 +228,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(ibar_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: .cvsignore Makefile.am e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/clock/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 2 Dec 2004 18:41:29 - 1.1 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.2 @@ -4,3 +4,4 @@ Makefile.in *.lo module.la +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/clock/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 1 Jun 2006 06:44:36 - 1.9 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.10 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -23,3 +23,6 @@ module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/clock/e_mod_main.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- e_mod_main.c23 Aug 2006 04:02:02 - 1.64 +++ e_mod_main.c3 Sep 2006 07:40:44 - 1.65 @@ -97,7 +97,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(clock_module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: .cvsignore Makefile.am e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/start/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 18:14:51 - 1.2 +++ .cvsignore 3 Sep 2006 07:40:45 - 1.3 @@ -4,4 +4,4 @@ Makefile .libs .deps - +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/start/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 1 Jun 2006 06:44:37 - 1.6 +++ Makefile.am 3 Sep 2006 07:40:45 - 1.7 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -24,3 +24,5 @@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- e_mod_main.c23 Aug 2006 04:02:03 - 1.34 +++ e_mod_main.c3 Sep 2006 07:40:45 - 1.35 @@ -109,7 +109,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(start_module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/cpufreq Modified Files: .cvsignore Makefile.am e_mod_main.c Added Files: module.desktop.in module.edj Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 28 Apr 2005 07:55:00 - 1.1 +++ .cvsignore 3 Sep 2006 07:40:44 - 1.2 @@ -5,3 +5,4 @@ *.lo module.la freqset +module.desktop === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- Makefile.am 3 Jul 2006 08:32:16 - 1.13 +++ Makefile.am 3 Sep 2006 07:40:44 - 1.14 @@ -4,7 +4,7 @@ # data files for the module filesdir = $(libdir)/enlightenment/modules/$(MODULE) files_DATA = \ -module.eap +module.edj module.desktop EXTRA_DIST = $(files_DATA) @@ -34,3 +34,6 @@ noinst_PROGRAMS= freqset freqset_SOURCES= freqset.c + +uninstall: + rm -rf $(libdir)/enlightenment/modules/$(MODULE) === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/e_mod_main.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- e_mod_main.c23 Aug 2006 04:02:02 - 1.49 +++ e_mod_main.c3 Sep 2006 07:40:44 - 1.50 @@ -136,7 +136,7 @@ char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), %s/module.eap, + snprintf(buf, sizeof(buf), %s/module.edj, e_module_dir_get(cpufreq_config-module)); edje_object_file_set(o, buf, icon); return o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Converted to use .desktop file. === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.129 retrieving revision 1.130 diff -u -3 -r1.129 -r1.130 --- configure.in2 Sep 2006 23:46:19 - 1.129 +++ configure.in3 Sep 2006 07:42:06 - 1.130 @@ -252,6 +252,7 @@ ]) AC_SUBST(edje_cc) + AC_OUTPUT([ Makefile enlightenment.spec @@ -259,14 +260,23 @@ src/bin/Makefile src/modules/Makefile src/modules/ibar/Makefile +src/modules/ibar/module.desktop src/modules/dropshadow/Makefile +src/modules/dropshadow/module.desktop src/modules/clock/Makefile +src/modules/clock/module.desktop src/modules/pager/Makefile +src/modules/pager/module.desktop src/modules/battery/Makefile +src/modules/battery/module.desktop src/modules/temperature/Makefile +src/modules/temperature/module.desktop src/modules/cpufreq/Makefile +src/modules/cpufreq/module.desktop src/modules/ibox/Makefile +src/modules/ibox/module.desktop src/modules/start/Makefile +src/modules/start/module.desktop data/Makefile data/fonts/Makefile data/images/Makefile - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : proto Dir : e17/proto/epdf/src/bin Modified Files: epdf_etk_test.c Log Message: Patch to make it compile again from Jerome Pinot. === RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_etk_test.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- epdf_etk_test.c 2 Aug 2006 05:53:59 - 1.3 +++ epdf_etk_test.c 3 Sep 2006 07:49:45 - 1.4 @@ -101,7 +101,7 @@ epdf_index_delete (index); etk_signal_connect (row_selected, ETK_OBJECT (tree), ETK_CALLBACK(_change_page_cb), pdf); -etk_table_attach_defaults (ETK_TABLE (table), tree, 0, 0, 0, 0); +etk_table_attach_default (ETK_TABLE (table), tree, 0, 0, 0, 0); etk_widget_show (tree); } @@ -109,9 +109,9 @@ etk_tree_headers_visible_set (ETK_TREE (list), FALSE); etk_widget_size_request_set (list, 60, -1); if (index) -etk_table_attach_defaults (ETK_TABLE (table), list, 0, 0, 1, 1); +etk_table_attach_default (ETK_TABLE (table), list, 0, 0, 1, 1); else -etk_table_attach_defaults (ETK_TABLE (table), list, 0, 0, 0, 1); +etk_table_attach_default (ETK_TABLE (table), list, 0, 0, 0, 1); etk_widget_show (list); etk_signal_connect (row_selected, ETK_OBJECT (list), @@ -134,7 +134,7 @@ } etk_tree_thaw (ETK_TREE (list)); - etk_table_attach_defaults (ETK_TABLE (table), pdf, 1, 1, 0, 1); + etk_table_attach_default (ETK_TABLE (table), pdf, 1, 1, 0, 1); etk_widget_show (pdf); etk_widget_show (window); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/embryo kaethorn
Enlightenment CVS committal
Author : kaethorn
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/debian
Modified Files:
control rules
Removed Files:
compat docs embryo0-bin.files embryo0-debug.files
libembryo0-dev.files libembryo0.files
Log Message:
debian package updates:
- move to cdbs
- update standards-version
- clean up control file
===
RCS file: /cvs/e/e17/libs/embryo/debian/control,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- control 14 Apr 2006 00:24:36 - 1.8
+++ control 3 Sep 2006 07:59:05 - 1.9
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: E17 Debian Team [EMAIL PROTECTED]
Build-Depends: debhelper (= 4.0.0), automake1.7 | automaken, libtool
-Standards-Version: 3.6.0
+Standards-Version: 3.7.2
Package: embryo0-bin
-Section: compilers
+Section: devel
Architecture: any
Provides: embryo-bin
Depends: ${shlibs:Depends}
@@ -14,11 +14,12 @@
This package contains the compiler embryo_cc.
Package: embryo0-debug
-Section: compilers
+Section: devel
Architecture: any
Provides: embryo-debug
Depends: ${shlibs:Depends}
Description: Debugging execution utility for embryo compiled bytecode.
+ This package contains the debugging utility.
Package: libembryo0-dev
Section: libdevel
@@ -32,7 +33,7 @@
Section: libs
Architecture: any
Provides: libembryo
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
Suggests: embryo0-bin (= ${Source-Version})
Description: SMALL-based abstract machine (AMX) bytecode interpreter
Embryo is primarily a shared library that gives you an API to load
===
RCS file: /cvs/e/e17/libs/embryo/debian/rules,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rules 2 Apr 2006 07:38:05 - 1.2
+++ rules 3 Sep 2006 07:59:05 - 1.3
@@ -1,108 +1,10 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+DEB_MAKE_CLEAN_TARGET := clean
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-CONFIGUREOPTS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
- test -x autogen.sh ./autogen.sh $(CONFIGUREOPTS) || ./configure
$(CONFIGUREOPTS)
-
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- -mv debian/changelog debian/changelog.saved
- -$(MAKE) distclean
- -mv debian/changelog.saved debian/changelog
-ifneq $(wildcard /usr/share/misc/config.sub)
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq $(wildcard /usr/share/misc/config.guess)
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
- dh_movefiles
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
-
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : e_modules Module : engage Dir : e_modules/engage Log Message: Directory /cvs/e/e_modules/engage added to the repository - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : e_modules Module : engage Dir : e_modules/engage Added Files: AUTHORS COPYING COPYING-PLAIN ChangeLog Makefile.am NEWS README autogen.sh configure.in e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h module.la module_icon.edc module_icon.png tray.c Log Message: Moved engage-module into e_modules, there guys - have fun :) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : e_modules Module : engage Dir : e_modules/engage Added Files: INSTALL Log Message: Missed install file - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : e_modules Module : engage Dir : e_modules/engage Removed Files: module.la Log Message: oops, should not have added that - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src/module Modified Files: README Removed Files: Makefile.am e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h module_icon.edc module_icon.png tray.c Log Message: engage module moved to e_modules === RCS file: /cvs/e/misc/engage/src/module/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- README 12 Dec 2005 14:05:15 - 1.3 +++ README 3 Sep 2006 08:24:06 - 1.4 @@ -1,11 +1,7 @@ This is the e17 engage module which features real transparency and fits nicely in the sexiest window manager out there :) -To use it compile as before (you must have e17 installed when you run -./configure (or ./autogen.sh) ) then with e17 running type: +Engage module has now been moved into the e_modules repository. -enlightenment_remote -module-load engage -enlightenment_remote -module-enable engage - -enjoy +see you there HandyAndE - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage Modified Files: configure.in Log Message: engage module moved to e_modules === RCS file: /cvs/e/misc/engage/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- configure.in24 Jul 2006 20:55:35 - 1.26 +++ configure.in3 Sep 2006 08:24:06 - 1.27 @@ -193,7 +193,6 @@ AC_OUTPUT([ Makefile src/Makefile -src/module/Makefile data/Makefile data/icons/Makefile data/themes/Makefile - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/src Modified Files: Makefile.am Log Message: engage module moved to e_modules === RCS file: /cvs/e/misc/engage/src/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- Makefile.am 1 Sep 2006 16:03:58 - 1.16 +++ Makefile.am 3 Sep 2006 08:24:06 - 1.17 @@ -1,5 +1,4 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS=module INCLUDES = \ -I../lib \ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: enlightenment.install Log Message: reflect changes regarding .desktop files for modules. === RCS file: /cvs/e/e17/apps/e/debian/enlightenment.install,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- enlightenment.install 31 Jul 2006 11:09:45 - 1.12 +++ enlightenment.install 3 Sep 2006 08:30:56 - 1.13 @@ -1,24 +1,33 @@ debian/tmp/usr/bin/enlightenment debian/tmp/usr/bin/enlightenment_* debian/tmp/usr/lib/enlightenment/modules/battery/*/*.so -debian/tmp/usr/lib/enlightenment/modules/battery/*.eap +debian/tmp/usr/lib/enlightenment/modules/battery/*.desktop +debian/tmp/usr/lib/enlightenment/modules/battery/*.edj debian/tmp/usr/lib/enlightenment/modules/clock/*/*.so -debian/tmp/usr/lib/enlightenment/modules/clock/*.eap +debian/tmp/usr/lib/enlightenment/modules/clock/*.desktop +debian/tmp/usr/lib/enlightenment/modules/clock/*.edj debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/*.so -debian/tmp/usr/lib/enlightenment/modules/cpufreq/*.eap +debian/tmp/usr/lib/enlightenment/modules/cpufreq/*.desktop +debian/tmp/usr/lib/enlightenment/modules/cpufreq/*.edj debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/freqset debian/tmp/usr/lib/enlightenment/modules/dropshadow/*/*.so -debian/tmp/usr/lib/enlightenment/modules/dropshadow/*.eap +debian/tmp/usr/lib/enlightenment/modules/dropshadow/*.desktop +debian/tmp/usr/lib/enlightenment/modules/dropshadow/*.edj debian/tmp/usr/lib/enlightenment/modules/ibar/*/*.so -debian/tmp/usr/lib/enlightenment/modules/ibar/*.eap +debian/tmp/usr/lib/enlightenment/modules/ibar/*.desktop +debian/tmp/usr/lib/enlightenment/modules/ibar/*.edj debian/tmp/usr/lib/enlightenment/modules/ibox/*/*.so -debian/tmp/usr/lib/enlightenment/modules/ibox/*.eap +debian/tmp/usr/lib/enlightenment/modules/ibox/*.desktop +debian/tmp/usr/lib/enlightenment/modules/ibox/*.edj debian/tmp/usr/lib/enlightenment/modules/pager/*/*.so -debian/tmp/usr/lib/enlightenment/modules/pager/*.eap +debian/tmp/usr/lib/enlightenment/modules/pager/*.desktop +debian/tmp/usr/lib/enlightenment/modules/pager/*.edj debian/tmp/usr/lib/enlightenment/modules/start/*/*.so -debian/tmp/usr/lib/enlightenment/modules/start/*.eap +debian/tmp/usr/lib/enlightenment/modules/start/*.desktop +debian/tmp/usr/lib/enlightenment/modules/start/*.edj debian/tmp/usr/lib/enlightenment/modules/temperature/*/*.so -debian/tmp/usr/lib/enlightenment/modules/temperature/*.eap +debian/tmp/usr/lib/enlightenment/modules/temperature/*.desktop +debian/tmp/usr/lib/enlightenment/modules/temperature/*.edj debian/tmp/usr/share/enlightenment debian/tmp/usr/share/locale debian/tmp/usr/share/xsessions - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/etc Added Files: .cvsignore Makefile.am sysactions.conf Log Message: lots of freaky stuff. 1. cleaned up actions for restart and exit 2. made main menu cleaner in just using the actions 3. added ilits unselect calls for ilist smart and widget 4. patch for cpufreq to set all cpu clocks 5. fix battery module to handle broken acpi impl's that don't report drain rate 6. add e_sys subsystem - for executing system sensitive stuff like halt, reboot suspend, hibernate etc. this also covers exit, restart and logout. logout is currently dormant and just an action - not bound or in a menu. not complete anyway (no code for it). halt and reboot should probably use logout logic to shut down apps - i will recycle it. i added a suid root binary to do the actions - uses a system config (default one supplied that is secure - root will need to modify it to allow things). 7. fixed suid install hook for cpufreq 8. added sysconf dir to build for sys config file. 9. pants on - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/cpufreq
Modified Files:
Makefile.am freqset.c
Log Message:
lots of freaky stuff.
1. cleaned up actions for restart and exit
2. made main menu cleaner in just using the actions
3. added ilits unselect calls for ilist smart and widget
4. patch for cpufreq to set all cpu clocks
5. fix battery module to handle broken acpi impl's that don't report drain rate
6. add e_sys subsystem - for executing system sensitive stuff like halt, reboot
suspend, hibernate etc. this also covers exit, restart and logout. logout
is currently dormant and just an action - not bound or in a menu. not
complete anyway (no code for it). halt and reboot should probably use
logout logic to shut down apps - i will recycle it. i added a suid root
binary to do the actions - uses a system config (default one supplied that
is secure - root will need to modify it to allow things).
7. fixed suid install hook for cpufreq
8. added sysconf dir to build for sys config file.
9. pants on
===
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 3 Sep 2006 07:40:44 - 1.14
+++ Makefile.am 3 Sep 2006 08:51:32 - 1.15
@@ -29,7 +29,7 @@
freqset$(EXEEXT)
setuid_root_mode = a=rx,u+s
-install-data-hook:
+install-exec-hook:
@chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) ||
true
noinst_PROGRAMS= freqset
===
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/freqset.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- freqset.c 22 Aug 2005 07:46:41 - 1.3
+++ freqset.c 3 Sep 2006 08:51:32 - 1.4
@@ -53,29 +53,21 @@
#else
if (!strcmp(argv[1], frequency))
{
-new_frequency = atoi(argv[2]);
-
-f = fopen(/sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed,
w);
-if (!f)
+ if(sys_cpu_setall(scaling_setspeed, argv[2]) == 0)
{
fprintf(stderr, Unable to open frequency interface for
writing.\n);
return 1;
}
-fprintf(f, %d\n, new_frequency);
-fclose(f);
return 0;
}
else if (!strcmp(argv[1], governor))
{
-f = fopen(/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor,
w);
-if (!f)
+ if(sys_cpu_setall(scaling_governor, argv[2]) == 0)
{
fprintf(stderr, Unable to open governor interface for
writing.\n);
return 1;
}
-fprintf(f, %s\n, argv[2]);
-fclose(f);
return 0;
}
@@ -87,4 +79,24 @@
#endif
seteuid(-1);
+}
+
+int sys_cpu_setall(const char *control, const char *value)
+{
+ int num = 0;
+ charfilename[4096];
+ FILE*f;
+
+ while(1){
+ snprintf(filename, sizeof(filename),
/sys/devices/system/cpu/cpu%i/cpufreq/%s, num, control);
+ f = fopen(filename, w);
+
+ if(!f){
+ return(num);
+ }
+ fprintf(f, %s\n, value);
+ fclose(f);
+ num++;
+ }
+ return -1;
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data Modified Files: Makefile.am Log Message: lots of freaky stuff. 1. cleaned up actions for restart and exit 2. made main menu cleaner in just using the actions 3. added ilits unselect calls for ilist smart and widget 4. patch for cpufreq to set all cpu clocks 5. fix battery module to handle broken acpi impl's that don't report drain rate 6. add e_sys subsystem - for executing system sensitive stuff like halt, reboot suspend, hibernate etc. this also covers exit, restart and logout. logout is currently dormant and just an action - not bound or in a menu. not complete anyway (no code for it). halt and reboot should probably use logout logic to shut down apps - i will recycle it. i added a suid root binary to do the actions - uses a system config (default one supplied that is secure - root will need to modify it to allow things). 7. fixed suid install hook for cpufreq 8. added sysconf dir to build for sys config file. 9. pants on === RCS file: /cvs/e/e17/apps/e/data/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 7 Aug 2006 20:25:34 - 1.6 +++ Makefile.am 3 Sep 2006 08:51:31 - 1.7 @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = fonts images init themes other xsession input_methods backgrounds +SUBDIRS = fonts images init themes other xsession input_methods backgrounds etc - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_actions.c e_ilist.c e_ilist.h e_includes.h
e_int_menus.c e_main.c e_widget_ilist.c e_widget_ilist.h
Added Files:
e_sys.c e_sys.h e_sys_main.c
Log Message:
lots of freaky stuff.
1. cleaned up actions for restart and exit
2. made main menu cleaner in just using the actions
3. added ilits unselect calls for ilist smart and widget
4. patch for cpufreq to set all cpu clocks
5. fix battery module to handle broken acpi impl's that don't report drain rate
6. add e_sys subsystem - for executing system sensitive stuff like halt, reboot
suspend, hibernate etc. this also covers exit, restart and logout. logout
is currently dormant and just an action - not bound or in a menu. not
complete anyway (no code for it). halt and reboot should probably use
logout logic to shut down apps - i will recycle it. i added a suid root
binary to do the actions - uses a system config (default one supplied that
is secure - root will need to modify it to allow things).
7. fixed suid install hook for cpufreq
8. added sysconf dir to build for sys config file.
9. pants on
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- Makefile.am 1 Sep 2006 17:21:23 - 1.146
+++ Makefile.am 3 Sep 2006 08:51:31 - 1.147
@@ -10,7 +10,8 @@
-DPACKAGE_BIN_DIR=\@[EMAIL PROTECTED] \
-DPACKAGE_LIB_DIR=\@[EMAIL PROTECTED] \
-DPACKAGE_DATA_DIR=\@[EMAIL PROTECTED] \
- -DLOCALE_DIR=\@[EMAIL PROTECTED]
+ -DLOCALE_DIR=\@[EMAIL PROTECTED] \
+ -DPACKAGE_SYSCONF_DIR=\@[EMAIL PROTECTED]
bin_PROGRAMS = \
enlightenment \
@@ -19,7 +20,8 @@
enlightenment_eapp_cache_gen \
enlightenment_imc \
enlightenment_start \
-enlightenment_thumb
+enlightenment_thumb \
+enlightenment_sys
ENLIGHTENMENTHEADERS = \
e.h \
@@ -178,8 +180,9 @@
e_int_config_wallpaper_import.h \
e_int_config_wallpaper_gradient.h \
e_color_dialog.h \
-e_fdo_menu_to_order.h
-
+e_fdo_menu_to_order.h \
+e_sys.h
+
enlightenment_src = \
e_user.c \
e_manager.c \
@@ -333,6 +336,7 @@
e_int_config_wallpaper_gradient.c \
e_color_dialog.c \
e_fdo_menu_to_order.c \
+e_sys.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
@@ -378,6 +382,15 @@
e_sha1.h
enlightenment_thumb_LDFLAGS = @e_libs@ @dlopen_libs@
+
+enlightenment_sys_SOURCES = \
+e_sys_main.c
+
+enlightenment_sys_LDFLAGS = @e_libs@ @dlopen_libs@
+
+setuid_root_mode = a=rx,u+s
+install-exec-hook:
+ @chmod $(setuid_root_mode)
$(DESTDIR)$(bindir)/enlightenment_sys$(EXEEXT) || true
installed_headersdir = $(prefix)/include/enlightenment
installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- e_actions.c 21 Aug 2006 04:35:52 - 1.79
+++ e_actions.c 3 Sep 2006 08:51:31 - 1.80
@@ -66,8 +66,6 @@
static Evas_Bool _e_actions_cb_free(Evas_Hash *hash, const char *key, void
*data, void *fdata);
static E_Maximize _e_actions_maximize_parse(const char *maximize);
-static E_Dialog *exit_dialog = NULL;
-
/* to save writing this in N places - the sctions are defined here */
/***/
ACT_FN_GO(window_move)
@@ -1364,14 +1362,16 @@
e_desk_deskshow(zone);
}
}
+
/***/
+static E_Dialog *exit_dialog = NULL;
static void
_e_actions_cb_exit_dialog_ok(void *data, E_Dialog *dia)
{
- ecore_main_loop_quit();
e_object_del(E_OBJECT(exit_dialog));
exit_dialog = NULL;
+ e_sys_action_do(E_SYS_EXIT, NULL);
}
static void
@@ -1415,10 +1415,261 @@
/***/
ACT_FN_GO(restart)
{
- restart = 1;
- ecore_main_loop_quit();
+ e_sys_action_do(E_SYS_RESTART, NULL);
+}
+
+/***/
+ACT_FN_GO(exit_now)
+{
+ e_sys_action_do(E_SYS_EXIT_NOW, NULL);
+}
+
+/***/
+static E_Dialog *logout_dialog = NULL;
+
+static void
+_e_actions_cb_logout_dialog_ok(void *data, E_Dialog *dia)
+{
+ e_object_del(E_OBJECT(logout_dialog));
+ logout_dialog = NULL;
+ e_sys_action_do(E_SYS_LOGOUT, NULL);
+}
+
+static void
+_e_actions_cb_logout_dialog_cancel(void *data, E_Dialog *dia)
+{
+ e_object_del(E_OBJECT(logout_dialog));
+ logout_dialog = NULL;
+}
+
+static void
+_e_actions_cb_logout_dialog_delete(E_Win *win)
+{
+ E_Dialog *dia;
+
+ dia = win-data;
+
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_sys_main.c
Log Message:
fix suid of e_sys - fix freqset suid install
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- Makefile.am 3 Sep 2006 08:51:31 - 1.147
+++ Makefile.am 3 Sep 2006 09:35:28 - 1.148
@@ -388,7 +388,7 @@
enlightenment_sys_LDFLAGS = @e_libs@ @dlopen_libs@
-setuid_root_mode = a=rx,u+s
+setuid_root_mode = a=rx,u+xs
install-exec-hook:
@chmod $(setuid_root_mode)
$(DESTDIR)$(bindir)/enlightenment_sys$(EXEEXT) || true
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_sys_main.c3 Sep 2006 08:51:32 - 1.1
+++ e_sys_main.c3 Sep 2006 09:35:28 - 1.2
@@ -53,6 +53,12 @@
{
exit(-1);
}
+
+ if (seteuid(0))
+ {
+ printf(ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n);
+ exit(5);
+ }
evas_init();
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/cpufreq Modified Files: Makefile.am Log Message: fix suid of e_sys - fix freqset suid install === RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/Makefile.am,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- Makefile.am 3 Sep 2006 08:51:32 - 1.15 +++ Makefile.am 3 Sep 2006 09:35:28 - 1.16 @@ -27,9 +27,9 @@ freqsetdir = $(pkgdir) freqset_DATA = \ freqset$(EXEEXT) -setuid_root_mode = a=rx,u+s -install-exec-hook: +setuid_root_mode = a=rx,u+xs +install-data-hook: @chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true noinst_PROGRAMS= freqset - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_icon.c Log Message: e_icon loads at 64x64 internally... to try speed things up. === RCS file: /cvs/e/e17/apps/e/src/bin/e_icon.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_icon.c17 Jul 2006 19:51:37 - 1.15 +++ e_icon.c3 Sep 2006 09:44:00 - 1.16 @@ -44,6 +44,7 @@ sd = evas_object_smart_data_get(obj); if (!sd) return; /* smart code here */ + evas_object_image_load_size_set(sd-obj, 64, 64); evas_object_image_file_set(sd-obj, file, NULL); _e_icon_smart_reconfigure(sd); } @@ -56,6 +57,7 @@ sd = evas_object_smart_data_get(obj); if (!sd) return; /* smart code here */ + evas_object_image_load_size_set(sd-obj, 64, 64); evas_object_image_file_set(sd-obj, file, key); _e_icon_smart_reconfigure(sd); } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_configure.c e_int_config_apps.c e_int_menus.c Log Message: applications instead of all applications - nicer - simpler. === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- e_configure.c 31 Aug 2006 04:16:43 - 1.56 +++ e_configure.c 3 Sep 2006 10:18:33 - 1.57 @@ -84,7 +84,7 @@ e_configure_standard_item_add(eco, enlightenment/menus, _(Menus), e_int_config_menus); e_configure_header_item_add(eco, enlightenment/misc, _(Miscellaneous)); - e_configure_standard_item_add(eco, enlightenment/applications, _(All Applications), e_int_config_apps); + e_configure_standard_item_add(eco, enlightenment/applications, _(Applications), e_int_config_apps); e_configure_standard_item_add(eco, enlightenment/performance, _(Performance), e_int_config_performance); e_configure_standard_item_add(eco, enlightenment/configuration, _(Configuration Dialogs), e_int_config_cfgdialogs); === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_int_config_apps.c 2 Sep 2006 12:29:33 - 1.15 +++ e_int_config_apps.c 3 Sep 2006 10:18:33 - 1.16 @@ -80,7 +80,7 @@ } cfd = e_config_dialog_new(con, -_(All Applications), +_(Applications), E, _config_applications_dialog, enlightenment/applications, 0, v, once); return cfd; === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.158 retrieving revision 1.159 diff -u -3 -r1.158 -r1.159 --- e_int_menus.c 3 Sep 2006 08:51:31 - 1.158 +++ e_int_menus.c 3 Sep 2006 10:18:33 - 1.159 @@ -86,7 +86,7 @@ subm = e_int_menus_all_apps_new(); dat-all_apps = subm; mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _(All Applications)); + e_menu_item_label_set(mi, _(Applications)); e_util_menu_item_edje_icon_set(mi, enlightenment/all_applications); e_menu_item_submenu_set(mi, subm); @@ -733,7 +733,7 @@ e_menu_item_callback_set(mi, _e_int_menus_module_item_cb, NULL); mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _(All Applications)); + e_menu_item_label_set(mi, _(Applications)); e_util_menu_item_edje_icon_set(mi, enlightenment/applications); e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
Now showing .desktop icons. Although the virtual .order displays have
something dodgy. To be investigated later when raster isn't piling more
urgent work and deadlines on me.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_fm.c 1 Sep 2006 13:12:39 - 1.49
+++ e_fm.c 3 Sep 2006 10:31:21 - 1.50
@@ -1647,6 +1647,30 @@
edje_object_part_swallow(ic-obj, e.swallow.icon,
ic-obj_icon);
evas_object_show(ic-obj_icon);
}
+else if (
+ (e_util_glob_case_match(ic-info.file, *.desktop))
+ )
+ {
+ E_App *app;
+
+ if (ic-info.pseudo_link)
+{
+ /* FIXME: first one should be correct I think, but it
isn't. */
+// snprintf(buf, sizeof(buf), %s/%s, ic-info.link,
ic-info.file);
+ snprintf(buf, sizeof(buf), %s, ic-info.link);
+}
+ else
+ snprintf(buf, sizeof(buf), %s/%s, ic-sd-realpath,
ic-info.file);
+//printf(ICON FOR APP (%s) %s - %s - %s - %s\n,
((ic-info.pseudo_link) ? pseudo : real ), buf, ic-info.link,
ic-info.file, ic-sd-realpath);
+ app = e_app_new(buf, 0);
+ if (app)
+{
+ ic-obj_icon =
e_app_icon_add(evas_object_evas_get(ic-sd-obj), app);
+ e_object_unref(E_OBJECT(app));
+}
+ edje_object_part_swallow(ic-obj, e.swallow.icon,
ic-obj_icon);
+ evas_object_show(ic-obj_icon);
+ }
else
{
ic-obj_icon =
edje_object_add(evas_object_evas_get(ic-sd-obj));
@@ -1730,10 +1754,6 @@
if (desktop-name) ic-info.label =
evas_stringshare_add(desktop-name);
if (desktop-generic) ic-info.generic =
evas_stringshare_add(desktop-generic);
if (desktop-comment) ic-info.comment =
evas_stringshare_add(desktop-comment);
-
-if (desktop-file) ic-info.link =
_e_fm2_icon_desktop_url_eval(desktop-file);
-if (desktop-URL) ic-info.link =
_e_fm2_icon_desktop_url_eval(desktop-URL);
-if (desktop-path) ic-info.link =
_e_fm2_icon_desktop_url_eval(desktop-path);
if (desktop-icon)
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
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_desktop
Modified Files:
ecore_desktop.c
Log Message:
trampling over p variable in a tmp sub-block - use diff var
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_desktop.c 3 Sep 2006 07:31:35 - 1.22
+++ ecore_desktop.c 3 Sep 2006 10:47:26 - 1.23
@@ -370,15 +370,17 @@
tmp = strdup(ecore_file_get_file(exe));
if (tmp)
{
- p = tmp;
- while (*p != '\0')
+ char *p2;
+
+ p2 = tmp;
+ while (*p2 != '\0')
{
- if (*p == ' ')
+ if (*p2 == ' ')
{
-*p = '\0';
+*p2 = '\0';
break;
}
- p++;
+ p2++;
}
if (done)
strcat(result-icon_class, ,);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_menu.c e_menu.h
Log Message:
Icons back in menus again.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- e_apps.c2 Sep 2006 13:29:59 - 1.165
+++ e_apps.c3 Sep 2006 11:32:13 - 1.166
@@ -1609,8 +1609,7 @@
EAPI void
e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a)
{
- if (a-icon_path)
- e_menu_item_icon_file_set(mi, a-icon_path);
+ mi-app = a;
if ((!a-icon_path) (a-icon_class))
{
char *v;
@@ -1625,7 +1624,8 @@
/* e_menu_item_icon_edje_set() just tucks away the params, the actual call
to edje_object_file_set() happens later. */
/* e_menu_item_icon_file_set() just tucks away the params, the actual call
to e_icon_add() happens later. */
e_menu_item_icon_edje_set(mi, a-path, icon);
- return;
+ if (a-icon_path)
+ e_menu_item_icon_file_set(mi, a-icon_path);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_menu.c2 Sep 2006 04:20:10 - 1.65
+++ e_menu.c3 Sep 2006 11:32:13 - 1.66
@@ -1205,10 +1205,19 @@
else
evas_object_del(o);
-if (mi-icon)
+ /* FIXME: Not sure why there are two different tries to get the
icon size, surely only the last one si needed. */
+ /* FIXME: Do it this way later, when e_app_icon_add() just
registers a request for an icon to be filled in when it's ready.
+ if (mi-app)
+ {
+ o = e_app_icon_add(mi-menu-evas, mi-app);
+ mi-icon_object = o;
+ e_icon_size_get(mi-icon_object, icon_w, icon_h);
+ }
+else
+ */
+ if (mi-icon)
{
/* This is done this way to match up with how e_app_icon_add
does it. */
-// mi-icon_object = NULL; /* Just coz I'm paranoid, may
not be needed. */
if (mi-icon_key)
{
Evas_Coord iww, ihh;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_menu.h1 Sep 2006 09:01:52 - 1.23
+++ e_menu.h3 Sep 2006 11:32:13 - 1.24
@@ -100,6 +100,8 @@
Evas_Object *submenu_object;
Evas_Object *event_object;
+
+ E_App *app; /* For when this item is used for an app.
Experimental, if this makes it into cvs, kill onefang. */
intlabel_w, label_h;
inticon_w, icon_h;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_desktop Modified Files: ecore_desktop_menu.c Log Message: FIXME++ === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ecore_desktop_menu.c1 Sep 2006 06:24:11 - 1.11 +++ ecore_desktop_menu.c3 Sep 2006 11:38:56 - 1.12 @@ -1145,7 +1145,9 @@ * The first one found wins, if none are found, don't merge anything. */ - /* FIXME: Actually implement this when I have some menus that will exercise it. */ + /* FIXME: Actually implement this when I have some menus that will exercise it. + * Slackware uses them. + */ merge_path[0] = '\0'; printf(\n### Didn't expect a MergeFile parent type in the FDO menu. onefang must write more code now.\n); } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_widget_fsel.c
Log Message:
fix some segv's and valgrind errors.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_eap_editor.c 1 Sep 2006 13:57:28 - 1.47
+++ e_eap_editor.c 3 Sep 2006 11:55:16 - 1.48
@@ -170,15 +170,15 @@
if (data-editor-eap-image)
evas_stringshare_del(data-editor-eap-image);
data-editor-eap-width = 0;
data-editor-eap-height = 0;
- e_object_unref(E_OBJECT(data-editor-eap));
if (data-editor)
{
- if (data-editor-img) evas_object_del(data-editor-img);
- if (data-editor-img_widget) evas_object_del(data-editor-img_widget);
- if (data-editor-fsel) evas_object_del(data-editor-fsel);
+// if (data-editor-img) evas_object_del(data-editor-img);
+// if (data-editor-img_widget) evas_object_del(data-editor-img_widget);
+// if (data-editor-fsel) evas_object_del(data-editor-fsel);
// if (data-editor-fsel_dia)
e_object_del(E_OBJECT(data-editor-fsel_dia));
free(data-editor);
}
+ e_object_unref(E_OBJECT(data-editor-eap));
free(data);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_widget_fsel.c 30 Aug 2006 15:56:12 - 1.34
+++ e_widget_fsel.c 3 Sep 2006 11:55:16 - 1.35
@@ -178,7 +178,7 @@
}
if (wd-o_files_frame)
e_widget_scrollframe_child_pos_set(wd-o_files_frame, 0, 0);
- if (stat(wd-path, st) == 0)
+ if ((wd-path) (stat(wd-path, st) == 0))
e_widget_entry_text_set(wd-o_entry, wd-path);
E_FREE(wd-path);
if (wd-chg_func) wd-chg_func(wd-chg_data, wd-obj);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: fix some segv's and valgrind errors. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.416 retrieving revision 1.417 diff -u -3 -r1.416 -r1.417 --- TODO1 Sep 2006 13:14:25 - 1.416 +++ TODO3 Sep 2006 11:55:16 - 1.417 @@ -8,6 +8,18 @@ BUGS / FIXES --- +* BUG: eap editor - creates eap files not .desktop files +* BUG: add application to ibar via ibar's right click menu is broken - it + doesnt resize ibar on add. and on a restart of e the icon is gone. +* BUG: right click remove icon from ibar deletes the original file - not the + ibar link to it in .order +* BUG: add app to ibar via ibar right menu and restart - app is gone. (dnd + for add/remove still works though) +* BUG: add aplication in applicatiosn dialog shoudl be disabled if no + app is selected in the fm view above it +* BUG: create new application from applications main config dialog when + done (ok) does not refresh the available applications view automatically. +* BUG: all applications eap edit - same as ibar - new applications are .eap * BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: the ibar specific menu only shows when you right click on icons (and not on the bar itself). so, if there are no icons you can't get to the config. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_file.c exhibit_file.h exhibit_main.c
exhibit_options.c
Log Message:
Start of some direct image download code.
(and a new option for where to put the files)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- exhibit.h 1 Sep 2006 23:39:22 - 1.34
+++ exhibit.h 3 Sep 2006 12:41:30 - 1.35
@@ -90,6 +90,7 @@
char *app4_cmd;
char *fav_path;
+ char *dl_path;
double blur_thresh;
double sharpen_thresh;
@@ -121,6 +122,7 @@
Etk_Widget *rotate_autosave;
Etk_Widget *default_sort;
Etk_Widget *monitor_focus;
+ Etk_Widget *dl_path;
Etk_Combobox_Item *sort_date;
Etk_Combobox_Item *sort_size;
Etk_Combobox_Item *sort_name;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_file.c 2 Sep 2006 01:43:23 - 1.10
+++ exhibit_file.c 3 Sep 2006 12:41:30 - 1.11
@@ -15,6 +15,21 @@
NULL
};
+int
+_ex_file_download_progress_cb(void *data, const char *file, long int dltotal,
long int dlnow, long int ultotal, long int ulnow)
+{
+ D((Download progress on %s\n, file));
+
+ return TRUE;
+}
+
+void
+_ex_file_download_complete_cb(void *data, const char *file, int status)
+{
+ D((Download of file %s is done\n, file));
+
+}
+
int
_ex_file_is_viewable(char *file)
{
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_file.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_file.h 2 Sep 2006 01:43:23 - 1.8
+++ exhibit_file.h 3 Sep 2006 12:41:30 - 1.9
@@ -4,6 +4,8 @@
#ifndef _EX_FILE_H
#define _EX_FILE_H
+int _ex_file_download_progress_cb(void *data, const char *file, long
int dltotal, long int dlnow, long int ultotal, long int ulnow);
+void_ex_file_download_complete_cb(void *data, const char *file, int
status);
int _ex_file_is_viewable(char *file);
int _ex_file_is_ebg(char *file);
int _ex_file_is_jpg(char *file);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- exhibit_main.c 2 Sep 2006 16:14:54 - 1.78
+++ exhibit_main.c 3 Sep 2006 12:41:30 - 1.79
@@ -268,6 +268,12 @@
{
Epsilon *ep;
Etk_Tree_Row *row;
+
+ if (!file)
+ {
+ D((ERROR: file is NULL\n));
+ return;
+ }
ep = epsilon_new(file);
epsilon_thumb_size(ep, EPSILON_THUMB_NORMAL);
@@ -840,17 +846,12 @@
0, 0, ETK_TABLE_NONE);
etk_signal_connect(clicked, ETK_OBJECT(e-entry[1]),
ETK_CALLBACK(_ex_main_goto_dir_clicked_cb), e);
- if (ecore_file_download_protocol_available(http://;))
- {
- D((Protocol HTTP is available\n));
- }
-
/* create first tab but dont place it in notebook */
- if(dir)
+ if (dir)
{
- if(ecore_file_is_dir(dir))
+ if (ecore_file_is_dir(dir))
tab = _ex_tab_new(e, dir);
- else if(ecore_file_exists(dir))
+ else if (ecore_file_exists(dir))
{
char *dir2;
@@ -858,6 +859,20 @@
tab = _ex_tab_new(e, dir2);
E_FREE(dir2);
realpath(dir, file);
+ }
+ else if (ecore_file_download_protocol_available(http://;))
+ {
+D((Protocol HTTP is available\n));
+D((Trying to download %s to %s\n, dir, e-options-dl_path));
+if (ecore_file_download(dir, e-options-dl_path,
+ _ex_file_download_complete_cb,
+ _ex_file_download_progress_cb, NULL))
+ {
+ D((Starting download\n));
+ tab = _ex_tab_new(e, e-options-dl_path);
+ }
+else
+ tab = _ex_tab_new(e, .);
}
else
tab = _ex_tab_new(e, .);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- exhibit_options.c 2 Sep 2006 01:43:23 - 1.17
+++ exhibit_options.c 3 Sep 2006 12:41:30 - 1.18
@@ -36,12 +36,18 @@
static Eet_Data_Descriptor *_ex_config_options_edd = NULL;
static Eet_Data_Descriptor *_ex_config_version_edd = NULL;
-static void _ex_options_set();
+static
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_eap_editor.c e_int_border_menu.c
Log Message:
Save new apps as .desktops, and also save new images.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- e_apps.c3 Sep 2006 11:32:13 - 1.166
+++ e_apps.c3 Sep 2006 12:43:08 - 1.167
@@ -322,7 +322,7 @@
{
char buf[4096];
- snprintf(buf, sizeof(buf), %s/_new_app_%1.1f.eap,
+ snprintf(buf, sizeof(buf), %s/_new_app_%1.1f.desktop,
_e_apps_all-path, ecore_time_get());
a-path = evas_stringshare_add(buf);
}
@@ -1261,9 +1261,16 @@
e_app_fields_save(E_App *a)
{
char buf[PATH_MAX];
- const char *lang, *ext;
+ const char *lang, *ext = NULL;
- /* FIXME: if there is no path, put it in applications/all/a-name.desktop.
*/
+ /* Check if it's a new one that has not been saved yet. */
+ if (a-path)
+ ext = ecore_file_get_file(a-path);
+ if ( (!a-path) || ((strncmp(ext, _new_app_, 9) == 0)
(!ecore_file_exists(a-path))) )
+ {
+ snprintf(buf, sizeof(buf), %s/%s.desktop, _e_apps_all-path,
a-name);
+a-path = evas_stringshare_add(buf);
+ }
ext = strrchr(a-path, '.');
if ((ext) (strcmp(ext, .desktop) == 0))
@@ -1275,6 +1282,7 @@
if (!desktop)
{
desktop = E_NEW(Ecore_Desktop, 1);
+ desktop-original_path = strdup(a-path);
created = 1;
}
if (desktop)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_eap_editor.c 3 Sep 2006 11:55:16 - 1.48
+++ e_eap_editor.c 3 Sep 2006 12:43:08 - 1.49
@@ -254,6 +254,7 @@
if (data-wtitle) eap-win_title = evas_stringshare_add(data-wtitle);
if (data-wrole) eap-win_role = evas_stringshare_add(data-wrole);
if (data-iclass) eap-icon_class = evas_stringshare_add(data-iclass);
+ if (data-eap.icon_path) eap-icon_path =
evas_stringshare_add(data-eap.icon_path);
if (data-image)
{
@@ -528,16 +529,16 @@
cfdata-editor-img_set = 1;
if (cfdata-editor-img) evas_object_del(cfdata-editor-img);
-if (cfdata-eap.path)
- free((char *) cfdata-eap.path);
+//if (cfdata-eap.path)
+// free((char *) cfdata-eap.path);
if (cfdata-eap.icon_class)
free((char *) cfdata-eap.icon_class);
if (cfdata-eap.icon_path)
free((char *) cfdata-eap.icon_path);
cfdata-eap.icon_path = strdup(cfdata-image);
- cfdata-eap.path = strdup();
- cfdata-eap.icon_class = strdup();
+// cfdata-eap.path = strdup();
+ cfdata-eap.icon_class = NULL;
cfdata-editor-img = e_app_icon_add(cfdata-editor-evas,
(cfdata-eap));
#if 0
cfdata-editor-img = e_icon_add(cfdata-editor-evas);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_int_border_menu.c 1 Sep 2006 10:43:20 - 1.41
+++ e_int_border_menu.c 3 Sep 2006 12:43:08 - 1.42
@@ -556,7 +556,7 @@
{
if (bname)
{
-snprintf(path, sizeof(path), %s/.e/e/applications/all/%s.eap,
getenv(HOME), bname);
+snprintf(path, sizeof(path),
%s/.e/e/applications/all/%s.desktop, getenv(HOME), bname);
a = e_app_empty_new(path);
}
else
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO -= 2 === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.417 retrieving revision 1.418 diff -u -3 -r1.417 -r1.418 --- TODO3 Sep 2006 11:55:16 - 1.417 +++ TODO3 Sep 2006 12:45:16 - 1.418 @@ -8,7 +8,6 @@ BUGS / FIXES --- -* BUG: eap editor - creates eap files not .desktop files * BUG: add application to ibar via ibar's right click menu is broken - it doesnt resize ibar on add. and on a restart of e the icon is gone. * BUG: right click remove icon from ibar deletes the original file - not the @@ -19,7 +18,6 @@ app is selected in the fm view above it * BUG: create new application from applications main config dialog when done (ok) does not refresh the available applications view automatically. -* BUG: all applications eap edit - same as ibar - new applications are .eap * BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: the ibar specific menu only shows when you right click on icons (and not on the bar itself). so, if there are no icons you can't get to the config. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
segv--
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_eap_editor.c 3 Sep 2006 12:43:08 - 1.49
+++ e_eap_editor.c 3 Sep 2006 12:52:40 - 1.50
@@ -172,13 +172,13 @@
data-editor-eap-height = 0;
if (data-editor)
{
+ e_object_unref(E_OBJECT(data-editor-eap));
// if (data-editor-img) evas_object_del(data-editor-img);
// if (data-editor-img_widget) evas_object_del(data-editor-img_widget);
// if (data-editor-fsel) evas_object_del(data-editor-fsel);
// if (data-editor-fsel_dia)
e_object_del(E_OBJECT(data-editor-fsel_dia));
free(data-editor);
}
- e_object_unref(E_OBJECT(data-editor-eap));
free(data);
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_main.c Log Message: Actually add the application properly via the dialog. === RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -3 -r1.139 -r1.140 --- e_mod_main.c3 Sep 2006 07:40:44 - 1.139 +++ e_mod_main.c3 Sep 2006 13:16:14 - 1.140 @@ -843,14 +843,14 @@ b = data; a = e_app_new(path, 0); - ic = _ibar_icon_new(b, a); - b-icons = evas_list_append(b-icons, ic); - e_box_pack_end(b-o_box, ic-o_holder); + if (a) + e_app_list_append(a, b-apps); _ibar_empty_handle(b); _ibar_resize_handle(b); - + _gc_orient(b-inst-gcc); return 1; } + static void _ibar_cb_menu_add(void *data, E_Menu *m, E_Menu_Item *mi) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO -= 3 === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.418 retrieving revision 1.419 diff -u -3 -r1.418 -r1.419 --- TODO3 Sep 2006 12:45:16 - 1.418 +++ TODO3 Sep 2006 13:17:33 - 1.419 @@ -8,8 +8,6 @@ BUGS / FIXES --- -* BUG: add application to ibar via ibar's right click menu is broken - it - doesnt resize ibar on add. and on a restart of e the icon is gone. * BUG: right click remove icon from ibar deletes the original file - not the ibar link to it in .order * BUG: add app to ibar via ibar right menu and restart - app is gone. (dnd @@ -49,11 +47,6 @@ * fm2 needs a mime filter * fm2 needs to have a mime filetype - icon mapping * eap editor is broken - segv in advanced mode -* use .desktop files and move eap editor to edit them etc. etc. instead to fix -* if we want to do icons on the desktop - and as part of efm, i am thinking - that we have little choice but to implement a .desktop file loader. this - is not to hard - it's the xml jungle of the system menus that is sucky. the - real problems are where to find the icons for the .desktop files. * middle mouse on gadgets as a quick move/resize thing? * language packs: need to have a tool to load/setup a language pack (which means .mo compiled files from a .po, an optional font and a config file that - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Heh, killed that one when I killed the last one. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.419 retrieving revision 1.420 diff -u -3 -r1.419 -r1.420 --- TODO3 Sep 2006 13:17:33 - 1.419 +++ TODO3 Sep 2006 13:23:01 - 1.420 @@ -10,8 +10,6 @@ * BUG: right click remove icon from ibar deletes the original file - not the ibar link to it in .order -* BUG: add app to ibar via ibar right menu and restart - app is gone. (dnd - for add/remove still works though) * BUG: add aplication in applicatiosn dialog shoudl be disabled if no app is selected in the fm view above it * BUG: create new application from applications main config dialog when - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_apps.c
Log Message:
Enable and disable the add app button.
raster: don't make me waste 45 minutes when there is a deadline next time.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_int_config_apps.c 3 Sep 2006 10:18:33 - 1.16
+++ e_int_config_apps.c 3 Sep 2006 14:27:51 - 1.17
@@ -190,6 +190,27 @@
}
static void
+_cb_files_selection_changed_all(void *data, Evas_Object *obj, void *event_info)
+{
+ E_Config_Dialog_Data *cfdata;
+ Evas_List *selected;
+
+ cfdata = data;
+ if (!cfdata-gui.o_fm_all) return;
+ selected = e_fm2_selected_list_get(cfdata-gui.o_fm_all);
+ if (selected)
+ {
+ if (cfdata-gui.o_add_button)
+e_widget_disabled_set(cfdata-gui.o_add_button, 0);
+ }
+ else
+ {
+ if (cfdata-gui.o_add_button)
+e_widget_disabled_set(cfdata-gui.o_add_button, 1);
+ }
+}
+
+static void
_cb_files_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
@@ -405,8 +426,12 @@
fmc_all.selection.single = 1;
fmc_all.selection.windows_modifiers = 0;
e_fm2_config_set(mt, fmc_all);
+ evas_object_smart_callback_add(mt, changed,
+ _cb_files_selection_changed_all, cfdata);
evas_object_smart_callback_add(mt, selected,
_cb_files_selected, cfdata);
+ evas_object_smart_callback_add(mt, selection_change,
+ _cb_files_selection_changed_all, cfdata);
e_fm2_icon_menu_start_extend_callback_set(mt, _cb_files_add_edited, cfdata);
snprintf(path_all, sizeof(path_all), %s/.e/e/applications/all, homedir);
e_fm2_path_set(cfdata-gui.o_fm_all, path_all, /);
@@ -428,6 +453,7 @@
_cb_button_add, cfdata, NULL);
cfdata-gui.o_add_button = mt;
e_widget_framelist_object_append(of, mt);
+ e_widget_disabled_set(cfdata-gui.o_add_button, 1);
if (!once)
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_eap_editor.h e_int_config_apps.c
Log Message:
fix some buglets
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_eap_editor.c 3 Sep 2006 12:52:40 - 1.50
+++ e_eap_editor.c 3 Sep 2006 15:11:04 - 1.51
@@ -3,22 +3,6 @@
*/
#include e.h
-typedef struct _E_App_Edit E_App_Edit;
-
-struct _E_App_Edit
-{
- E_App *eap;
- Evas*evas;
-
- Evas_Object *img;
- Evas_Object *img_widget;
- Evas_Object *fsel;
- E_Dialog*fsel_dia;
- int img_set;
-
- E_Config_Dialog *cfd;
-};
-
struct _E_Config_Dialog_Data
{
E_App eap;
@@ -46,6 +30,7 @@
/* local subsystem functions */
+static void _e_eap_edit_free(E_App_Edit *editor);
static void _e_eap_edit_fill_data(E_Config_Dialog_Data *cdfata);
static void *_e_eap_edit_create_data(E_Config_Dialog *cfd);
static void _e_eap_edit_free_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
@@ -64,7 +49,7 @@
/* externally accessible functions */
-EAPI void
+EAPI E_App_Edit *
e_eap_edit_show(E_Container *con, E_App *a)
{
E_Config_Dialog_View *v;
@@ -72,13 +57,13 @@
if (!con) return;
- editor = E_NEW(E_App_Edit, 1);
- if (!editor) return;
+ editor = E_OBJECT_ALLOC(E_App_Edit, E_EAP_EDIT_TYPE, _e_eap_edit_free);
+ if (!editor) return NULL;;
v = E_NEW(E_Config_Dialog_View, 1);
if (!v)
{
free(editor);
- return;
+ return NULL;
}
editor-img = NULL;
@@ -97,9 +82,34 @@
_(Application Editor),
E, _eap_editor_dialog,
NULL, 0, v, editor);
+ return editor;
}
/* local subsystem functions */
+static void
+_e_eap_edit_free(E_App_Edit *editor)
+{
+ if (!editor) return;
+ if (editor-cfd)
+ {
+ E_Object *obj;
+
+ obj = E_OBJECT(editor-cfd);
+ editor-cfd = NULL;
+ e_object_del(obj);
+ }
+ if (editor-eap-tmpfile) ecore_file_unlink(editor-eap-image);
+ editor-eap-tmpfile = 0;
+ if (editor-eap-image) evas_stringshare_del(editor-eap-image);
+ editor-eap-width = 0;
+ editor-eap-height = 0;
+ e_object_unref(E_OBJECT(editor-eap));
+// if (editor-img) evas_object_del(editor-img);
+// if (editor-img_widget) evas_object_del(editor-img_widget);
+// if (editor-fsel) evas_object_del(editor-fsel);
+// if (editor-fsel_dia) e_object_del(E_OBJECT(editor-fsel_dia));
+ free(editor);
+}
static void
_e_eap_edit_fill_data(E_Config_Dialog_Data *cfdata)
@@ -127,7 +137,6 @@
IFDUP(cfdata-editor-eap-path, cfdata-eap.path);
IFDUP(cfdata-editor-eap-icon_class, cfdata-eap.icon_class);
IFDUP(cfdata-editor-eap-icon_path, cfdata-eap.icon_path);
-
}
static void *
@@ -158,27 +167,19 @@
E_FREE(data-ipath);
E_FREE(data-image);
- if (data-eap.path)
- free((char *) data-eap.path);
- if (data-eap.icon_class)
- free((char *) data-eap.icon_class);
- if (data-eap.icon_path)
- free((char *) data-eap.icon_path);
-
- if (data-editor-eap-tmpfile) ecore_file_unlink(data-editor-eap-image);
- data-editor-eap-tmpfile = 0;
- if (data-editor-eap-image)
evas_stringshare_del(data-editor-eap-image);
- data-editor-eap-width = 0;
- data-editor-eap-height = 0;
+ if (data-eap.path) free((char *) data-eap.path);
+ if (data-eap.icon_class) free((char *) data-eap.icon_class);
+ if (data-eap.icon_path) free((char *) data-eap.icon_path);
+
if (data-editor)
{
- e_object_unref(E_OBJECT(data-editor-eap));
-// if (data-editor-img) evas_object_del(data-editor-img);
-// if (data-editor-img_widget) evas_object_del(data-editor-img_widget);
-// if (data-editor-fsel) evas_object_del(data-editor-fsel);
-// if (data-editor-fsel_dia)
e_object_del(E_OBJECT(data-editor-fsel_dia));
- free(data-editor);
+ E_Object *obj;
+
+ obj = E_OBJECT(data-editor);
+ data-editor = NULL;
+ e_object_del(obj);
}
+
free(data);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_eap_editor.h 27 Oct 2005 10:19:43 - 1.5
+++ e_eap_editor.h 3 Sep 2006 15:11:04 - 1.6
@@ -1,9 +1,33 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifdef E_TYPEDEFS
+
+typedef struct _E_App_Edit E_App_Edit;
+
#else
#ifndef E_EAP_EDIT_H
#define E_EAP_EDIT_H
-EAPI void e_eap_edit_show(E_Container *con, E_App *a);
+#define E_EAP_EDIT_TYPE 0xE0b01019
+
+struct _E_App_Edit
+{
+ E_Object
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: fix some buglets === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.420 retrieving revision 1.421 diff -u -3 -r1.420 -r1.421 --- TODO3 Sep 2006 13:23:01 - 1.420 +++ TODO3 Sep 2006 15:11:03 - 1.421 @@ -8,8 +8,6 @@ BUGS / FIXES --- -* BUG: right click remove icon from ibar deletes the original file - not the - ibar link to it in .order * BUG: add aplication in applicatiosn dialog shoudl be disabled if no app is selected in the fm view above it * BUG: create new application from applications main config dialog when - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: todo--/++ === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.421 retrieving revision 1.422 diff -u -3 -r1.421 -r1.422 --- TODO3 Sep 2006 15:11:03 - 1.421 +++ TODO3 Sep 2006 15:12:33 - 1.422 @@ -8,10 +8,8 @@ BUGS / FIXES --- -* BUG: add aplication in applicatiosn dialog shoudl be disabled if no - app is selected in the fm view above it -* BUG: create new application from applications main config dialog when - done (ok) does not refresh the available applications view automatically. +* BUG: favorite places in fsel (left pane) doesnt display icons nor does it + jump to links where URL points to in the .desktop file. * BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: the ibar specific menu only shows when you right click on icons (and not on the bar itself). so, if there are no icons you can't get to the config. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
Makefile.am config.c e_apps.c e_apps.h e_intl.c e_utils.c
e_utils.h main.c window.c
Added Files:
e_includes.h
Log Message:
Move menu to ETK, as it works much better in an embedded environment
Also fix a few isues with includes from the cached e code
===
RCS file: /cvs/e/misc/engage/src/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 3 Sep 2006 08:24:06 - 1.17
+++ Makefile.am 3 Sep 2006 15:14:51 - 1.18
@@ -8,14 +8,14 @@
@edje_cflags@ \
@ecore_cflags@ \
@esmart_cflags@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
bin_PROGRAMS = engage
engage_SOURCES = \
e.h \
+e_includes.h \
e_apps.h \
e_apps_cache.h \
e_icon.h \
@@ -45,10 +45,10 @@
e_intl.c
if XINERAMA
-engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ @ewl_libs@ \
+engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ @etk_libs@ \
@esmart_libs@ -lesmart_trans_x11
-lXinerama
engage_CFLAGS = -DXINERAMA
else
-engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ @ewl_libs@ \
+engage_LDADD = @evas_libs@ @edje_libs@ @ecore_libs@ @imlib2_libs@ @etk_libs@ \
@esmart_libs@ -lesmart_trans_x11
endif
===
RCS file: /cvs/e/misc/engage/src/config.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- config.c9 Aug 2006 21:38:13 - 1.59
+++ config.c3 Sep 2006 15:14:51 - 1.60
@@ -4,13 +4,11 @@
#include dmalloc.h
#endif
-#ifdef HAVE_EWL
-#include Ewl.h
-Ewl_Widget *menu, *menu_win, *menu_app_name;
-Evas_Object*embed;
-int init;
+#ifdef HAVE_ETK
+#include Etk.h
-voidod_config_menu_hide(void);
+Etk_Widget *_od_config_menu = NULL;
+Etk_Widget *_od_config_menu_app;
#endif
typedef enum od_config_colors {
@@ -189,149 +187,58 @@
return ret;
}
-#ifdef HAVE_EWL
-int menu_height, menu_width;
-Evas_Coord menu_x, menu_y;
-
-void
-od_config_menu_move_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
- ewl_object_position_request(EWL_OBJECT(user_data), CURRENT_X(menu_win),
- CURRENT_Y(menu_win));
-}
-
-void
-od_config_menu_out_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
- int x, y;
- evas_pointer_output_xy_get(evas, x, y);
- if (x = menu_x + 1 || x = (menu_x + menu_width) ||
- y = menu_y + 1 || y = (menu_y + menu_height))
-od_config_menu_hide();
-}
-
-void
-od_config_menu_zoom_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
+#ifdef HAVE_ETK
+void _od_config_menu_zooming_cb(Etk_Object *object, void *data) {
ecore_config_int_set(engage.options.zoom, options.zoom ? 0 : 1);
- od_config_menu_hide();
}
-void
-od_config_menu_config_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
+void _od_config_menu_config_cb(Etk_Object *object, void *data) {
if (!ecore_exe_run(examine engage, NULL))
-fprintf(stderr, 'examine' could not be launched - is it in your path?\n);
- od_config_menu_hide();
+fprintf(stderr, 'examine' could not be launched - is it in your
path?\n);
}
-void
-od_config_menu_quit_cb(Ewl_Widget * w, void *ev_data, void *user_data)
-{
- od_config_menu_hide();
+void _od_config_menu_quit_cb(Etk_Object *object, void *data) {
ecore_main_loop_quit();
}
-void
-od_config_menu_init(void)
-{
- Ewl_Widget *menu_box, *item;
-
- if (init)
-return;
- init = 1;
- /* FIXME: nasty nasty, we need to request the size, not code it in */
- menu_height = 87; //121;
- menu_width = 100;
-
- menu_win = ewl_embed_new();
- ewl_object_fill_policy_set((Ewl_Object *) menu_win, EWL_FLAG_FILL_FILL);
-
- embed =
-ewl_embed_evas_set(EWL_EMBED(menu_win), evas,
-
EWL_EMBED_EVAS_WINDOW(ecore_evas_software_x11_window_get(ee)));
- evas_object_layer_set(embed, 999);
-
- /* FIXME: this should not be needed */
- evas_object_resize(embed, menu_width, menu_height);
- evas_object_show(embed);
- ewl_widget_show(menu_win);
-
- menu_box = ewl_vbox_new();
- ewl_object_fill_policy_set(EWL_OBJECT(menu_box), EWL_FLAG_FILL_FILL);
- ewl_container_child_append(EWL_CONTAINER(menu_win), menu_box);
- ewl_widget_show(menu_box);
-
- menu = ewl_imenu_new();
- ewl_button_label_set(EWL_BUTTON(menu), config menu);
- ewl_callback_append(EWL_WIDGET(menu_win), EWL_CALLBACK_CONFIGURE,
- od_config_menu_move_cb, EWL_MENU_BASE(menu)-popup);
- ewl_callback_append(EWL_MENU_BASE(menu)-popup, EWL_CALLBACK_FOCUS_OUT,
- od_config_menu_out_cb, NULL);
- ewl_container_child_append(EWL_CONTAINER(menu_box), menu);
- /*
E CVS: engage handyande
Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage
Modified Files:
configure.in
Log Message:
Move menu to ETK, as it works much better in an embedded environment
Also fix a few isues with includes from the cached e code
===
RCS file: /cvs/e/misc/engage/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- configure.in3 Sep 2006 08:24:06 - 1.27
+++ configure.in3 Sep 2006 15:14:51 - 1.28
@@ -59,11 +59,9 @@
dnl Set PACKAGE_DATA_DIR in config.h.
if test x${prefix} = xNONE; then
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${HOME}/.e/e/modules/${PACKAGE},
Package installed data destination)
-datadir=${HOME}/.e/e/modules/${PACKAGE}
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${ac_default_prefix}/share/${PACKAGE}, [Shared Data Directory])
else
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
${libdir}/enlightenment/modules/${PACKAGE}, Package installed data
destination)
-datadir=${libdir}/enlightenment/modules/${PACKAGE}
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ${prefix}/share/${PACKAGE}, [Shared
Data Directory])
fi
dnl Set PACKAGE_BIN_DIR in config.h.
@@ -138,32 +136,17 @@
AC_SUBST(evas_libs)
AC_SUBST(evas_cflags)
-have_ewl=no
-AC_PATH_GENERIC(ewl, 0.0.1, [
- AC_DEFINE(HAVE_EWL, [], [Enlightenment Widget Library Support])
- have_ewl=yes
- AC_SUBST(ewl_libs)
- AC_SUBST(ewl_cflags) ],
- AC_MSG_ERROR(Cannot find ewl: Is ewl-config in path?))
-ewl_libs=`ewl-config --libs`
-ewl_cflags=`ewl-config --cflags`
-AC_SUBST(ewl_libs)
-AC_SUBST(ewl_cflags)
-
-have_e17=no
-AC_PATH_GENERIC(enlightenment, 16.999, [
- AC_DEFINE(HAVE_E17, [], [Development Enlightenment WindowManager Support])
- have_e17=true
- AC_SUBST(e_libs)
- AC_SUBST(e_cflags) ],
- )
-AM_CONDITIONAL(HAVE_E17, test x$have_e17 = xtrue)
-e_libs=`enlightenment-config --libs`
-e_cflags=`enlightenment-config --cflags`
-e_modules=`enlightenment-config --module-dir`
-AC_SUBST(e_libs)
-AC_SUBST(e_cflags)
-AC_SUBST(e_modules)
+have_etk=no
+AC_PATH_GENERIC(etk, 0.0.1, [
+ AC_DEFINE(HAVE_ETK, [], [ETK Support])
+ have_etk=yes
+ AC_SUBST(etk_libs)
+ AC_SUBST(etk_cflags) ],
+ AC_MSG_ERROR(Cannot find etk: Is etk-config in path?))
+etk_libs=`etk-config --libs`
+etk_cflags=`etk-config --cflags`
+AC_SUBST(etk_libs)
+AC_SUBST(etk_cflags)
dnl Set PACKAGE_SOURCE_DIR in config.h.
#packagesrcdir=`cd $srcdir pwd`
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/debian Modified Files: control Log Message: Move menu to ETK, as it works much better in an embedded environment Also fix a few isues with includes from the cached e code === RCS file: /cvs/e/misc/engage/debian/control,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- control 25 Apr 2006 08:44:11 - 1.4 +++ control 3 Sep 2006 15:14:51 - 1.5 @@ -2,7 +2,7 @@ Section: x11 Priority: optional Maintainer: Blake Barnett [EMAIL PROTECTED] -Build-Depends: libeet-dev, libevas-dev, libimlib2-dev, libedje-dev, libesmart-dev , debhelper ( 4.0.0), libewl-dev, libecore-dev, enlightenment-dev +Build-Depends: libeet-dev, libevas-dev, libimlib2-dev, libedje-dev, libesmart-dev , debhelper ( 4.0.0), libetk-dev, libecore-dev, enlightenment-dev Standards-Version: 3.6.1.0 Package: engage - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_thumb_main.c
Log Message:
fix thum gen - no alpha for some keys.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_thumb_main.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_thumb_main.c 30 Aug 2006 14:45:33 - 1.13
+++ e_thumb_main.c 3 Sep 2006 15:23:02 - 1.14
@@ -322,6 +322,7 @@
evas_font_cache_set(evas, 0);
ww = 0;
hh = 0;
+ alpha = 1;
ext = strrchr(eth-file, '.');
if ((ext) (eth-key)
((!strcasecmp(ext, .edj)) ||
@@ -338,6 +339,10 @@
evas_object_image_size_set(im, ww * 8, hh * 8);
evas_object_image_fill_set(im, 0, 0, ww, hh);
edje = edje_object_add(evas_im);
+if ((eth-key)
+((!strcmp(eth-key, e/desktop/background)) ||
+ (!strcmp(eth-key, e/init/splash
+ alpha = 0;
if (edje_object_file_set(edje, eth-file, eth-key))
{
evas_object_move(edje, 0, 0);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: Makefile.am Log Message: a patch from Takayuki Yamaguchi. === RCS file: /cvs/e/e_modules/language/src/module/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 17 May 2006 22:26:00 - 1.2 +++ Makefile.am 3 Sep 2006 15:29:38 - 1.3 @@ -1,7 +1,7 @@ INCLUDES = -I. \ -I$(top_srcdir) \ -I$(includedir) \ - @e_cflags@ + @e_cflags@ @exml_cflags@ pkgdir = $(datadir)/$(MODULE_ARCH) pkg_LTLIBRARIES= module.la @@ -13,7 +13,7 @@ e_mod_keybindings.h \ e_mod_lang.c \ e_mod_lang.h -module_la_LIBADD = @e_libs@ -lexml -lxkbfile -lX11 +module_la_LIBADD = @e_libs@ @exml_libs@ -lxkbfile -lX11 module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: configure.in Log Message: a patch from Takayuki Yamaguchi. === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- configure.in1 Sep 2006 14:35:23 - 1.12 +++ configure.in3 Sep 2006 15:29:37 - 1.13 @@ -147,7 +147,21 @@ AC_SUBST(e_libs) AC_SUBST(e_modules) -AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) +AC_ARG_WITH(exml-config, +[ --with-exml-config=EXML_CONFIG use exml-config specified ], +[ + EXML_CONFIG=$withval; + echo using $EXML_CONFIG for exml-config; +],[ + PROG=exml-config; + AC_PATH_PROG(EXML_CONFIG, $PROG, , $PATH) +]) +exml_cflags=`$EXML_CONFIG --cflags` +exml_libs=`$EXML_CONFIG --libs` +AC_SUBST(exml_cflags) +AC_SUBST(exml_libs) + +#AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure your CFLAGS environment variable contains include lines for the location of this file and EXML lib is installed])) AC_CHECK_HEADERS(X11/XKBlib.h,, AC_MSG_ERROR([Cannot find XKBlib.h. Make sure your CFLAGS environment variable contains include lines for the location of this file.])) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_fm.c e_fm.h
Log Message:
working on fav icons
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- e_apps.c3 Sep 2006 12:43:08 - 1.167
+++ e_apps.c3 Sep 2006 15:57:13 - 1.168
@@ -283,8 +283,8 @@
e_app_fields_fill(a, path);
/* no exe field.. not valid. drop it */
- if (!_e_app_exe_valid_get(a-exe))
- goto error;
+// if (!_e_app_exe_valid_get(a-exe))
+// goto error;
}
else
goto error;
@@ -1572,36 +1572,38 @@
{
Evas_Object *o = NULL;
- if (a-icon_path)
- o = _e_app_icon_path_add(evas, a);
+ printf(a-icon_path = %s\n, a-icon_path);
+ if ((a-icon_path) (a-icon_path[0] != 0))
+ o = _e_app_icon_path_add(evas, a);
else
- {
- o = edje_object_add(evas);
- if (!e_util_edje_icon_list_set(o, a-icon_class))
-{
- if (edje_object_file_set(o, a-path, icon))
- {
-; /* It's a bit more obvious this way. */
- }
- else if (a-icon_class) /* If that fails, then this might be
an FDO icon. */
- {
-char *v;
-
-/* FIXME: Use a real icon size. */
-v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
e_config-icon_theme);
-if (v)
- a-icon_path = evas_stringshare_add(v);
- }
-
- if (a-icon_path)
- {
- /* Free the aborted object first. */
- if (o) evas_object_del(o);
- o = _e_app_icon_path_add(evas, a);
- }
-}
- }
-
+ {
+ o = edje_object_add(evas);
+ printf(a-icon_class = %s\n, a-icon_class);
+ if (!e_util_edje_icon_list_set(o, a-icon_class))
+ {
+printf(a-path = %s\n, a-path);
+if (edje_object_file_set(o, a-path, icon))
+ {
+ ; /* It's a bit more obvious this way. */
+ }
+else if (a-icon_class) /* If that fails, then this might be an
FDO icon. */
+ {
+ char *v;
+
+ /* FIXME: Use a real icon size. */
+ v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
e_config-icon_theme);
+ if (v)
+ a-icon_path = evas_stringshare_add(v);
+ }
+
+if (a-icon_path)
+ {
+ /* Free the aborted object first. */
+ if (o) evas_object_del(o);
+ o = _e_app_icon_path_add(evas, a);
+ }
+ }
+ }
return o;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_fm.c 3 Sep 2006 10:31:21 - 1.50
+++ e_fm.c 3 Sep 2006 15:57:13 - 1.51
@@ -1258,7 +1258,7 @@
free(ic);
return NULL;
}
-ic-info.link =
evas_stringshare_add(sd-config-view.extra_file_source);
+ic-info.pseudo_dir =
evas_stringshare_add(sd-config-view.extra_file_source);
ic-info.pseudo_link = 1;
}
}
@@ -1392,6 +1392,7 @@
if (ic-info.generic) evas_stringshare_del(ic-info.generic);
if (ic-info.icon) evas_stringshare_del(ic-info.icon);
if (ic-info.link) evas_stringshare_del(ic-info.link);
+ if (ic-info.pseudo_dir) evas_stringshare_del(ic-info.pseudo_dir);
free(ic);
}
@@ -1555,7 +1556,7 @@
ic-obj_icon = edje_object_add(evas_object_evas_get(ic-sd-obj));
e_util_edje_icon_set(ic-obj_icon, ic-info.icon);
}
- edje_object_part_swallow(ic-obj, e.swallow.icon,
ic-obj_icon);
+ edje_object_part_swallow(ic-obj, e.swallow.icon, ic-obj_icon);
evas_object_show(ic-obj_icon);
return;
}
@@ -1582,7 +1583,7 @@
)
{
if (ic-info.pseudo_link)
- snprintf(buf, sizeof(buf), %s/%s, ic-info.link,
ic-info.file);
+ snprintf(buf, sizeof(buf), %s/%s, ic-info.pseudo_dir,
ic-info.file);
else
snprintf(buf, sizeof(buf), %s/%s, ic-sd-realpath,
ic-info.file);
ic-obj_icon =
e_thumb_icon_add(evas_object_evas_get(ic-sd-obj));
@@ -1620,7 +1621,7 @@
)
{
if
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/data/icons Modified Files: Makefile.am Log Message: fix icon location for standalone === RCS file: /cvs/e/misc/engage/data/icons/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Makefile.am 10 May 2006 13:03:21 - 1.7 +++ Makefile.am 3 Sep 2006 16:12:11 - 1.8 @@ -1,2 +1,2 @@ -icondir = $(datadir)/icons +icondir = $(pkgdatadir)/icons icon_DATA = *.eap - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/data/themes Modified Files: Makefile.am Log Message: more fixes for install === RCS file: /cvs/e/misc/engage/data/themes/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 10 May 2006 13:03:21 - 1.6 +++ Makefile.am 3 Sep 2006 16:27:38 - 1.7 @@ -6,7 +6,7 @@ CLEANFILES = $(EDJS) EXTRA_DIST = $(EDCS) -themedir = $(datadir)/themes +themedir = $(pkgdatadir)/themes theme_DATA = $(EDJS) all: $(EDCS) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c
Log Message:
Don't calculate icon class if there already is one.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ecore_desktop.c 3 Sep 2006 10:47:26 - 1.23
+++ ecore_desktop.c 3 Sep 2006 17:22:46 - 1.24
@@ -334,76 +334,79 @@
/* If the icon in the file is not a full path, just put
it first in the class, greatly simplifies things.
* Otherwise, put that full path into the icon_path
member.
*/
- size = 0;
- if ((result-icon) (result-icon[0] != '/'))
- size += strlen(result-icon) + 1;
- if (eap_name) size += strlen(eap_name) + 1;
- if (exe) size += strlen(exe) + 1;
- if (categories) size += strlen(categories) + 1;
- result-icon_class = malloc(size + 1);
- if (result-icon_class)
+ if (!result-icon_class)
{
- char *p;
- int done = 0;
-
- result-icon_class[0] = '\0';
- if ((result-icon) (result-icon[0] != '/')
(result-icon[0] != '\0'))
- {
- strcat(result-icon_class, result-icon);
- done = 1;
- result-icon = NULL;
- }
- /* We do this here coz we don't want to lower case
the result-icon part later. */
- p = result-icon_class;
- p += strlen(result-icon_class);
- if ((eap_name) (eap_name[0] != '\0'))
- {
- if (done)
-strcat(result-icon_class, ,);
- strcat(result-icon_class, eap_name);
- done = 1;
- }
- if ((exe) (exe[0] != '\0'))
+ size = 0;
+ if ((result-icon) (result-icon[0] != '/'))
+ size += strlen(result-icon) + 1;
+if (eap_name) size += strlen(eap_name) + 1;
+if (exe) size += strlen(exe) + 1;
+if (categories) size += strlen(categories) + 1;
+ result-icon_class = malloc(size + 1);
+ if (result-icon_class)
{
- char *tmp;
+ char *p;
+ int done = 0;
- tmp = strdup(ecore_file_get_file(exe));
- if (tmp)
-{
- char *p2;
-
- p2 = tmp;
- while (*p2 != '\0')
- {
- if (*p2 == ' ')
- {
-*p2 = '\0';
-break;
- }
- p2++;
- }
+ result-icon_class[0] = '\0';
+ if ((result-icon) (result-icon[0] !=
'/') (result-icon[0] != '\0'))
+{
+ strcat(result-icon_class,
result-icon);
+ done = 1;
+ result-icon = NULL;
+}
+ /* We do this here coz we don't want to lower
case the result-icon part later. */
+ p = result-icon_class;
+ p += strlen(result-icon_class);
+ if ((eap_name) (eap_name[0] != '\0'))
+{
if (done)
strcat(result-icon_class, ,);
- strcat(result-icon_class, tmp);
+ strcat(result-icon_class,
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_fm.c
Log Message:
Remove printfs and clean up after debugging with raster.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- e_apps.c3 Sep 2006 15:57:13 - 1.168
+++ e_apps.c3 Sep 2006 17:23:43 - 1.169
@@ -1572,16 +1572,13 @@
{
Evas_Object *o = NULL;
- printf(a-icon_path = %s\n, a-icon_path);
if ((a-icon_path) (a-icon_path[0] != 0))
o = _e_app_icon_path_add(evas, a);
else
{
o = edje_object_add(evas);
- printf(a-icon_class = %s\n, a-icon_class);
if (!e_util_edje_icon_list_set(o, a-icon_class))
{
-printf(a-path = %s\n, a-path);
if (edje_object_file_set(o, a-path, icon))
{
; /* It's a bit more obvious this way. */
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_fm.c 3 Sep 2006 15:57:13 - 1.51
+++ e_fm.c 3 Sep 2006 17:23:43 - 1.52
@@ -1655,15 +1655,10 @@
E_App *app;
if (ic-info.pseudo_link)
- {
- /* FIXME: first one should be correct I think, but it
isn't. */
snprintf(buf, sizeof(buf), %s/%s, ic-info.pseudo_dir,
ic-info.file);
- }
else
snprintf(buf, sizeof(buf), %s/%s, ic-sd-realpath,
ic-info.file);
- //printf(ICON FOR APP (%s) %s - %s - %s - %s\n,
((ic-info.pseudo_link) ? pseudo : real ), buf, ic-info.pseudo_dir,
ic-info.file, ic-sd-realpath);
app = e_app_new(buf, 0);
- printf(ic: %s = %p\n, buf, app);
if (app)
{
ic-obj_icon =
e_app_icon_add(evas_object_evas_get(ic-sd-obj), app);
@@ -1756,7 +1751,6 @@
if (desktop-generic) ic-info.generic =
evas_stringshare_add(desktop-generic);
if (desktop-comment) ic-info.comment =
evas_stringshare_add(desktop-comment);
-printf(di: %s %s %s\n, desktop-icon, desktop-icon_path,
desktop-icon_class);
if (desktop-icon)
{
char *v;
@@ -1765,7 +1759,6 @@
v = (char *)ecore_desktop_icon_find(desktop-icon, NULL,
e_config-icon_theme);
if (v)
ic-info.icon = evas_stringshare_add(v);
- printf(%s -v\n, desktop-icon, v);
}
if (desktop-type)
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e cobra
Enlightenment CVS committal
Author : cobra
Project : e17
Module : apps/e
Dir : e17/apps/e
Modified Files:
enlightenment.spec.in
Log Message:
Update RPM with rasters new /etc/enlightenment/sysactions.conf file.
Kevin Brosius [EMAIL PROTECTED]
===
RCS file: /cvs/e/e17/apps/e/enlightenment.spec.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- enlightenment.spec.in 21 Jul 2006 07:55:21 - 1.13
+++ enlightenment.spec.in 3 Sep 2006 17:41:07 - 1.14
@@ -62,6 +62,7 @@
%{_datadir}/%{name}
%{_datadir}/locale/*
%{_datadir}/xsessions/%{name}.desktop
+%{_sysconfdir}/enlightenment/*
%files devel
%defattr(-, root, root)
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Modified Files: Makefile.am ecore_evas_software_x11.c Log Message: * [Misc] Add etk_current_time_get() * [Misc] Add etk_mouse_position_get() * [Event] We can now add global event callbacks to catch events that occurs everywhere on the screen. See etk_event_global_callback_add/del() * [Event] Documentation++ * [Engine/Popup Window] A lot of code for the popup window has been moved from the engine to etk_popup_window.c itself. It makes engine a lot creation easier * [Popup Window] Fix the slide effect if the mouse has not left the popup window * [Menu Bar] We can now select another menu bar's item when a menu is already popped up === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 4 Aug 2006 18:46:26 - 1.2 +++ Makefile.am 3 Sep 2006 18:36:11 - 1.3 @@ -6,7 +6,7 @@ -I$(top_srcdir)/src/engines/ecore_evas \ -I$(top_srcdir)/src/engines/ecore_evas_x11 \ -I$(top_srcdir)/src/engines/ecore_evas_software_x11 \ - @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g + @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g -Wall pkgdir = $(libdir)/etk/engines === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ecore_evas_software_x11.c 1 Sep 2006 13:32:30 - 1.9 +++ ecore_evas_software_x11.c 3 Sep 2006 18:36:11 - 1.10 @@ -68,8 +68,8 @@ NULL, /* popup_window_constructor */ NULL, /* popup_window_popup_at_xy */ NULL, /* popup_window_popdown */ - NULL, /* popup_window_popped_get */ + NULL, /* event_callback_set */ NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_embed_test.c
Log Message:
* [Misc] Add etk_current_time_get()
* [Misc] Add etk_mouse_position_get()
* [Event] We can now add global event callbacks to catch events that
occurs everywhere on the screen. See etk_event_global_callback_add/del()
* [Event] Documentation++
* [Engine/Popup Window] A lot of code for the popup window has been
moved from the engine to etk_popup_window.c itself. It makes engine
a lot creation easier
* [Popup Window] Fix the slide effect if the mouse has not left the
popup window
* [Menu Bar] We can now select another menu bar's item when a menu is
already popped up
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_embed_test.c15 Aug 2006 16:33:26 - 1.6
+++ etk_embed_test.c3 Sep 2006 18:36:11 - 1.7
@@ -1,5 +1,4 @@
#include etk_test.h
-#include sys/time.h
#include math.h
#include Ecore.h
#include Ecore_Evas.h
@@ -14,7 +13,6 @@
static void _etk_test_embed_update();
static void _etk_test_embed_resize_cb(Ecore_Evas *ecore_evas);
static int _etk_test_embed_animator_cb(void *data);
-static double _etk_test_embed_time_get();
static Ecore_Evas *ecore_evas = NULL;
static Evas_Object *e_logo, *backdrop;
@@ -23,7 +21,7 @@
static Evas_Object *embed_object;
static Etk_Widget *embed;
static int win_w = 240, win_h = 320;
-static double starting_time = 0.0;
+static unsigned int starting_time;
/* Creates the window for the embed widget test */
void etk_test_embed_window_create(void *data)
@@ -34,7 +32,7 @@
if (ecore_evas)
{
- starting_time = _etk_test_embed_time_get();
+ starting_time = etk_current_time_get();
_etk_test_embed_update();
ecore_evas_show(ecore_evas);
return;
@@ -82,7 +80,7 @@
ecore_evas_size_min_set(ecore_evas, min_size.w + 50, min_size.h + 120);
/* Updates the position of the objects */
- starting_time = _etk_test_embed_time_get();
+ starting_time = etk_current_time_get();
_etk_test_embed_update();
ecore_animator_add(_etk_test_embed_animator_cb, NULL);
@@ -151,7 +149,7 @@
Etk_Size embed_size;
int y;
- t = ETK_MAX(0.0, _etk_test_embed_time_get() - starting_time);
+ t = ETK_MAX(0.0, etk_current_time_get() - starting_time) / 1000.0;
if (t = 2.0)
y = win_h - (0.75 * sin((t / 2.0) * (ETK_TEST_PI / 2)) * win_h);
else
@@ -202,14 +200,4 @@
{
_etk_test_embed_update();
return 1;
-}
-
-/* Gets the current time in seconds */
-static double _etk_test_embed_time_get()
-{
- struct timeval timev;
-
- gettimeofday(timev, NULL);
- return (double)timev.tv_sec + (((double)timev.tv_usec) / 100);
-
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: Makefile.am ecore_evas.c Log Message: * [Misc] Add etk_current_time_get() * [Misc] Add etk_mouse_position_get() * [Event] We can now add global event callbacks to catch events that occurs everywhere on the screen. See etk_event_global_callback_add/del() * [Event] Documentation++ * [Engine/Popup Window] A lot of code for the popup window has been moved from the engine to etk_popup_window.c itself. It makes engine a lot creation easier * [Popup Window] Fix the slide effect if the mouse has not left the popup window * [Menu Bar] We can now select another menu bar's item when a menu is already popped up === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 4 Aug 2006 18:46:26 - 1.2 +++ Makefile.am 3 Sep 2006 18:36:11 - 1.3 @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/engines/ecore_evas \ - @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g + @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g -Wall pkgdir = $(libdir)/etk/engines === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ecore_evas.c1 Sep 2006 13:32:30 - 1.10 +++ ecore_evas.c3 Sep 2006 18:36:11 - 1.11 @@ -105,8 +105,8 @@ NULL, /* popup_window_constructor */ NULL, /* popup_window_popup_at_xy */ NULL, /* popup_window_popdown */ - NULL, /* popup_window_popped_get */ + NULL, /* event_callback_set */ NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: Makefile.am ecore_evas_x11.c Log Message: * [Misc] Add etk_current_time_get() * [Misc] Add etk_mouse_position_get() * [Event] We can now add global event callbacks to catch events that occurs everywhere on the screen. See etk_event_global_callback_add/del() * [Event] Documentation++ * [Engine/Popup Window] A lot of code for the popup window has been moved from the engine to etk_popup_window.c itself. It makes engine a lot creation easier * [Popup Window] Fix the slide effect if the mouse has not left the popup window * [Menu Bar] We can now select another menu bar's item when a menu is already popped up === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 4 Aug 2006 18:46:26 - 1.2 +++ Makefile.am 3 Sep 2006 18:36:11 - 1.3 @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/engines/ecore_evas \ - @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g + @EVAS_CFLAGS@ @ECORE_CFLAGS@ -g -Wall pkgdir = $(libdir)/etk/engines === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ecore_evas_x11.c1 Sep 2006 13:32:30 - 1.13 +++ ecore_evas_x11.c3 Sep 2006 18:36:11 - 1.14 @@ -10,6 +10,8 @@ #include Etk_Engine_Ecore_Evas.h #include Etk_Engine_Ecore_Evas_X11.h +#define NUM_INPUT_HANDLERS 6 + /* Engine specific data for Etk_Window * We do this to shorten the name for internal use */ typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data; @@ -36,34 +38,24 @@ /* Etk_Popup_Window */ static void _popup_window_constructor(Etk_Popup_Window *popup_window); -static void _popup_window_popup_at_xy(Etk_Popup_Window *popup_window, int x, int y); +static void _popup_window_popup(Etk_Popup_Window *popup_window); static void _popup_window_popdown(Etk_Popup_Window *popup_window); -static Etk_Popup_Window_Screen_Edge _popup_window_over_screen_edge_get(Etk_Popup_Window *popup_window); -static Etk_Popup_Window_Screen_Edge _popup_window_mouse_on_screen_edge_get(); -static void _popup_window_slide_timer_update(Etk_Popup_Window *popup_window); -static int _popup_window_slide_timer_cb(void *data); - -static int _popup_window_key_down_cb(void *data, int type, void *event); -static int _popup_window_key_up_cb(void *data, int type, void *event); -static int _popup_window_mouse_move_cb(void *data, int type, void *event); -static int _popup_window_mouse_up_cb(void *data, int type, void *event); - -/* Mouse functions */ +/* Event and mouse functions */ +static void _event_callback_set(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); +static int _event_input_handler_cb(void *data, int type, void *event); static void _mouse_position_get(int *x, int *y); static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h); /* Etk_Drag functions*/ static void _drag_constructor(Etk_Drag *drag); static void _drag_begin(Etk_Drag *drag); - static int _drag_mouse_up_cb(void *data, int type, void *event); static int _drag_mouse_move_cb(void *data, int type, void *event); /* Etk_Dnd functions */ static Etk_Bool _dnd_init(); static void _dnd_shutdown(); - static void _dnd_container_get_widgets_at(Etk_Toplevel_Widget *top, int x, int y, int offx, int offy, Evas_List **list); static int _dnd_enter_handler(void *data, int type, void *event); static int _dnd_position_handler(void *data, int type, void *event); @@ -83,21 +75,17 @@ static void _selection_clear(void); /* Private functions */ -static int _window_property_cb(void *data, int ev_type, void *ev); +static void _window_netwm_state_active_set(Etk_Window *window, Ecore_X_Window_State state, Etk_Bool active); +static Etk_Bool _window_netwm_state_active_get(Etk_Window *window, Ecore_X_Window_State state); +static void _event_global_modifiers_locks_wrap(int xmodifiers, Etk_Modifiers *modifiers, Etk_Locks *locks); + /* Private vars */ -static Ecore_Event_Handler *_window_property_handler = NULL; +static void (*_event_callback)(Etk_Event_Type event, Etk_Event_Global event_info) = NULL; +static Ecore_Event_Handler *_event_input_handlers[NUM_INPUT_HANDLERS]; -static Ecore_X_Window _etk_popup_window_input_window = 0; -static Ecore_Event_Handler *_popup_window_key_down_handler = NULL; -static Ecore_Event_Handler *_popup_window_key_up_handler = NULL; -static Ecore_Event_Handler *_popup_window_mouse_up_handler = NULL; -static Ecore_Event_Handler *_popup_window_mouse_move_handler = NULL; -static int _popup_window_popup_timestamp = 0; -static int
E CVS: apps/e kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: rules Log Message: add /etc/enlightenment/sysactions.conf to debian package. === RCS file: /cvs/e/e17/apps/e/debian/rules,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- rules 12 Apr 2006 20:42:41 - 1.12 +++ rules 3 Sep 2006 18:58:31 - 1.13 @@ -6,6 +6,10 @@ DEB_MAKE_CLEAN_TARGET := clean +install/enlightenment:: + mkdir debian/enlightenment/etc + mv debian/tmp/usr/etc/enlightenment debian/enlightenment/etc/ + clean:: if [ -f $(CURDIR)/../../snapshot ]; then ./autogen.sh --prefix=/usr; fi - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage onefang
Enlightenment CVS committal
Author : onefang
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
e_apps.c main.c
Log Message:
Patch it up to bring it in to sync with E17's .desktop icon code.
Really should be synced in full though.
===
RCS file: /cvs/e/misc/engage/src/e_apps.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_apps.c3 Sep 2006 15:14:51 - 1.7
+++ e_apps.c3 Sep 2006 19:08:04 - 1.8
@@ -53,7 +53,7 @@
static int _e_app_is_eapp(const char *path);
static int _e_app_copy (E_App *dst, E_App *src);
static void _e_app_save_order (E_App *app);
-static int _e_app_cb_event_border_add(void *data, int type, void *event);
+//static int _e_app_cb_event_border_add(void *data, int type, void
*event);
static int _e_app_cb_expire_timer(void *data);
static void _e_app_cache_copy (E_App_Cache *ac, E_App *a);
static int _e_app_cb_scan_cache_timer(void *data);
@@ -1154,13 +1154,12 @@
}
if (!path) path = a-path;
- ext = strchr(path, '.');
+ ext = strrchr(path, '.');
if ((ext) (strcmp(ext, .desktop) == 0))
{ /* It's a .desktop file. */
Ecore_Desktop *desktop;
desktop = ecore_desktop_get(path, lang);
- if (!desktop) return;
if (desktop)
{
if (desktop-name) a-name = evas_stringshare_add(desktop-name);
@@ -1169,19 +1168,11 @@
if (desktop-exec) a-exe = evas_stringshare_add(desktop-exec);
if (desktop-icon_class) a-icon_class =
evas_stringshare_add(desktop-icon_class);
+ if (desktop-icon_path) a-icon_path =
evas_stringshare_add(desktop-icon_path);
if (desktop-window_class) a-win_class =
evas_stringshare_add(desktop-window_class);
if (desktop-startup)
a-startup_notify = *(desktop-startup);
- if (desktop-icon)
- {
-/* FIXME: Should do this only when needed, is it can be
expensive. */
-/* FIXME: Use a real icon size. */
-v = (char *) ecore_desktop_icon_find(desktop-icon, NULL,
NULL);//e_config-icon_theme);
-if (v)
- a-icon_path = evas_stringshare_add(v);
- }
-
//if (desktop-type) a-type = evas_stringshare_add(desktop-type);
//if (desktop-categories) a-categories =
evas_stringshare_add(desktop-categories);
}
@@ -1506,27 +1497,63 @@
return ok;
}
+static Evas_Object *
+_e_app_icon_path_add(Evas *evas, E_App *a)
+{
+ Evas_Object *o;
+ char *ext;
+
+ o = e_icon_add(evas);
+ ext = strrchr(a-icon_path, '.');
+ if (ext)
+ {
+ if (strcmp(ext, .edj) == 0)
+e_icon_file_edje_set(o, a-icon_path, icon);
+ else
+e_icon_file_set(o, a-icon_path);
+ }
+ else
+ e_icon_file_set(o, a-icon_path);
+ e_icon_fill_inside_set(o, 1);
+
+ return o;
+}
+
EAPI Evas_Object *
e_app_icon_add(Evas *evas, E_App *a)
{
- Evas_Object *o;
+ Evas_Object *o = NULL;
- o = edje_object_add(evas);
-// if (!e_util_edje_icon_list_set(o, a-icon_class))
-// {
- if (edje_object_file_set(o, a-path, icon))
- {
- ; /* It's a bit more obvious this way. */
- }
- else if (a-icon_path) /* If that fails, then this might be an FDO
icon. */
- {
- /* Free the aborted object first. */
- if (o) evas_object_del(o);
- o = e_icon_add(evas);
- e_icon_file_set(o, a-icon_path);
- e_icon_fill_inside_set(o, 1);
-}
-// }
+ if ((a-icon_path) (a-icon_path[0] != 0))
+ o = _e_app_icon_path_add(evas, a);
+ else
+ {
+ o = edje_object_add(evas);
+// if (!e_util_edje_icon_list_set(o, a-icon_class))
+// {
+if (edje_object_file_set(o, a-path, icon))
+ {
+ ; /* It's a bit more obvious this way. */
+ }
+else if (a-icon_class) /* If that fails, then this might be an
FDO icon. */
+ {
+ char *v;
+
+ /* FIXME: Use a real icon size. */
+// v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
e_config-icon_theme);
+ v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
NULL);
+ if (v)
+ a-icon_path = evas_stringshare_add(v);
+ }
+
+if (a-icon_path)
+ {
+ /* Free the aborted object first. */
+ if (o) evas_object_del(o);
+ o = _e_app_icon_path_add(evas, a);
+ }
+// }
+ }
return o;
}
===
RCS file:
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_x11
Modified Files:
ecore_evas_x11.c
Log Message:
* Write comments for engines
* Fix a leak in the engines
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_evas_x11.c3 Sep 2006 18:36:11 - 1.14
+++ ecore_evas_x11.c3 Sep 2006 21:15:31 - 1.15
@@ -12,18 +12,16 @@
#define NUM_INPUT_HANDLERS 6
-/* Engine specific data for Etk_Window
- * We do this to shorten the name for internal use */
typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data;
-
/* General engine functions */
Etk_Engine *engine_open();
+void engine_close();
static Etk_Bool _engine_init();
static void _engine_shutdown();
-/* Etk_Window */
+/* Etk_Window functions */
static void _window_constructor(Etk_Window *window);
static void _window_destructor(Etk_Window *window);
static void _window_screen_geometry_get(Etk_Window *window, int *x, int *y,
int *w, int *h);
@@ -36,7 +34,7 @@
static Etk_Bool _window_skip_pager_hint_get(Etk_Window *window);
static void _window_pointer_set(Etk_Window *window, Etk_Pointer_Type
pointer_type);
-/* Etk_Popup_Window */
+/* Etk_Popup_Window functions */
static void _popup_window_constructor(Etk_Popup_Window *popup_window);
static void _popup_window_popup(Etk_Popup_Window *popup_window);
static void _popup_window_popdown(Etk_Popup_Window *popup_window);
@@ -47,7 +45,7 @@
static void _mouse_position_get(int *x, int *y);
static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h);
-/* Etk_Drag functions*/
+/* Etk_Drag functions */
static void _drag_constructor(Etk_Drag *drag);
static void _drag_begin(Etk_Drag *drag);
static int _drag_mouse_up_cb(void *data, int type, void *event);
@@ -171,7 +169,13 @@
_selection_clear
};
+/**
+ *
+ * Engine general functions
+ *
+ **/
+/* Called when the engine is loaded */
Etk_Engine *engine_open()
{
engine_info.engine_data = NULL;
@@ -180,6 +184,13 @@
return engine_info;
}
+/* Called when the engine is unloaded */
+void engine_close()
+{
+ free(engine_info.engine_name);
+}
+
+/* Initializes the engine */
static Etk_Bool _engine_init()
{
if (!ecore_x_init(NULL))
@@ -198,6 +209,7 @@
return ETK_TRUE;
}
+/* Shutdowns the engine */
static void _engine_shutdown()
{
int i;
@@ -214,6 +226,13 @@
ecore_x_shutdown();
}
+/**
+ *
+ * Etk_Window's functions
+ *
+ **/
+
+/* Initializes the created window */
static void _window_constructor(Etk_Window *window)
{
/* We expect the engine that extends this one to initialize and create
@@ -225,6 +244,7 @@
engine_info.super-window_constructor(window);
}
+/* Destroys the window */
static void _window_destructor(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -235,6 +255,7 @@
window-engine_data = NULL;
}
+/* Gets the geometry of the screen containing the window */
static void _window_screen_geometry_get(Etk_Window *window, int *x, int *y,
int *w, int *h)
{
Etk_Engine_Window_Data *engine_data;
@@ -268,6 +289,7 @@
ecore_x_window_geometry_get(root, x, y, w, h);
}
+/* Makes the window modal for another window */
static void _window_modal_for_window(Etk_Window *window_to_modal, Etk_Window
*window)
{
Etk_Engine_Window_Data *engine_data;
@@ -289,6 +311,7 @@
//TODO: else...
}
+/* Sets the stacking layer of the window (normal, always on top or always
below) */
static void _window_stacking_set(Etk_Window *window, Etk_Window_Stacking
stacking)
{
Etk_Engine_Ecore_Evas_Window_Data *engine_data;
@@ -302,6 +325,7 @@
ecore_evas_layer_set(engine_data-ecore_evas,
ECORE_X_WINDOW_LAYER_NORMAL);
}
+/* Gets the stacking layer of the window */
static Etk_Window_Stacking _window_stacking_get(Etk_Window *window)
{
Etk_Engine_Ecore_Evas_Window_Data *engine_data;
@@ -317,6 +341,7 @@
return ETK_WINDOW_NORMAL;
}
+/* Sets whether or not the window should appear in the taskbar */
/* TODO: maybe there is a better way to do this? */
static void _window_skip_taskbar_hint_set(Etk_Window *window, Etk_Bool
skip_taskbar_hint)
{
@@ -356,12 +381,13 @@
etk_object_notify(ETK_OBJECT(window), skip_taskbar);
}
-/* TODO: maybe there is a better way to do this? */
+/* Gets whether the window appears in the taskbar */
static Etk_Bool _window_skip_taskbar_hint_get(Etk_Window *window)
{
return _window_netwm_state_active_get(window,
ECORE_X_WINDOW_STATE_SKIP_TASKBAR);
}
+/* Sets whether or not the window should appear in the pager */
/* TODO: maybe there is a better way to do this? */
static void _window_skip_pager_hint_set(Etk_Window
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_software_x11
Modified Files:
ecore_evas_software_x11.c
Log Message:
* Write comments for engines
* Fix a leak in the engines
===
RCS file:
/cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_evas_software_x11.c 3 Sep 2006 18:36:11 - 1.10
+++ ecore_evas_software_x11.c 3 Sep 2006 21:15:31 - 1.11
@@ -5,12 +5,11 @@
#include Etk_Engine_Ecore_Evas.h
#include Etk_Engine_Ecore_Evas_X11.h
-/* Etk_Window engine data
- * we do another typedef to shorten the name for internal use */
typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data;
/* General engine functions */
Etk_Engine *engine_open();
+void engine_close();
/* Etk_Window functions */
static void _window_constructor(Etk_Window *window);
@@ -66,7 +65,7 @@
NULL, /* window_pointer_set */
NULL, /* popup_window_constructor */
- NULL, /* popup_window_popup_at_xy */
+ NULL, /* popup_window_popup */
NULL, /* popup_window_popdown */
NULL, /* event_callback_set */
@@ -93,6 +92,7 @@
*
**/
+/* Called when the engine is loaded */
Etk_Engine *engine_open()
{
engine_info.engine_data = NULL;
@@ -101,16 +101,23 @@
return engine_info;
}
+/* Called when the engine is unloaded */
+void engine_close()
+{
+ free(engine_info.engine_name);
+}
+
/**
*
* Etk_Window's functions
*
**/
+/* Initializes the created window */
static void _window_constructor(Etk_Window *window)
{
/* We _MUST_ initialize and create the ecore_evas and the x_window
-* variables in the engine_data. */
+* variables in the engine_data since they are used by the ecore_evas_x11
engine */
Etk_Engine_Window_Data *engine_data;
engine_data = malloc(sizeof(Etk_Engine_Window_Data));
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas
Modified Files:
ecore_evas.c
Log Message:
* Write comments for engines
* Fix a leak in the engines
===
RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_evas.c3 Sep 2006 18:36:11 - 1.11
+++ ecore_evas.c3 Sep 2006 21:15:31 - 1.12
@@ -8,6 +8,7 @@
/* General engine functions */
Etk_Engine *engine_open();
+void engine_close();
static Etk_Bool _engine_init();
static void _engine_shutdown();
@@ -43,8 +44,7 @@
static Etk_Bool _window_decorated_get(Etk_Window *window);
static void _window_shaped_set(Etk_Window *window, Etk_Bool shaped);
static Etk_Bool _window_shaped_get(Etk_Window *window);
-
-/* Etk_Window callbacks */
+
static void _window_move_cb(Ecore_Evas *ecore_evas);
static void _window_resize_cb(Ecore_Evas *ecore_evas);
static void _window_focus_in_cb(Ecore_Evas *ecore_evas);
@@ -52,6 +52,7 @@
static void _window_sticky_changed_cb(Ecore_Evas *ecore_evas);
static void _window_delete_request_cb(Ecore_Evas *ecore_evas);
+
static Etk_Engine engine_info = {
NULL, /* engine specific data */
@@ -103,7 +104,7 @@
NULL, /* window_pointer_set */
NULL, /* popup_window_constructor */
- NULL, /* popup_window_popup_at_xy */
+ NULL, /* popup_window_popup */
NULL, /* popup_window_popdown */
NULL, /* event_callback_set */
@@ -130,6 +131,7 @@
*
**/
+/* Called when the engine is loaded */
Etk_Engine *engine_open()
{
engine_info.engine_data = NULL;
@@ -137,6 +139,13 @@
return engine_info;
}
+/* Called when the engine is unloaded */
+void engine_close()
+{
+ free(engine_info.engine_name);
+}
+
+/* Initializes the engine */
static Etk_Bool _engine_init()
{
if (!ecore_evas_init())
@@ -147,6 +156,7 @@
return ETK_TRUE;
}
+/* Shutdowns the engine */
static void _engine_shutdown()
{
ecore_evas_shutdown();
@@ -158,6 +168,7 @@
*
**/
+/* Initializes the created window */
static void _window_constructor(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -165,7 +176,7 @@
engine_data = window-engine_data;
ETK_TOPLEVEL_WIDGET(window)-evas = ecore_evas_get(engine_data-ecore_evas);
- ecore_evas_data_set(engine_data-ecore_evas, etk_window, window);
+ ecore_evas_data_set(engine_data-ecore_evas, _Etk_Engine::Window, window);
ecore_evas_callback_move_set(engine_data-ecore_evas, _window_move_cb);
ecore_evas_callback_resize_set(engine_data-ecore_evas, _window_resize_cb);
ecore_evas_callback_focus_in_set(engine_data-ecore_evas,
_window_focus_in_cb);
@@ -175,6 +186,7 @@
ecore_evas_callback_delete_request_set(engine_data-ecore_evas,
_window_delete_request_cb);
}
+/* Destroys the window */
static void _window_destructor(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -183,6 +195,7 @@
ecore_evas_free(engine_data-ecore_evas);
}
+/* Shows the window */
static void _window_show(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -191,6 +204,7 @@
ecore_evas_show(engine_data-ecore_evas);
}
+/* Hides the window */
static void _window_hide(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -199,6 +213,7 @@
ecore_evas_hide(engine_data-ecore_evas);
}
+/* Returns the evas of the window */
static Evas *_window_evas_get(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -207,6 +222,7 @@
return ecore_evas_get(engine_data-ecore_evas);
}
+/* Sets the title of the window */
static void _window_title_set(Etk_Window *window, const char *title)
{
Etk_Engine_Window_Data *engine_data;
@@ -216,6 +232,7 @@
etk_object_notify(ETK_OBJECT(window), title);
}
+/* Returns the title of the window */
static const char *_window_title_get(Etk_Window *window)
{
Etk_Engine_Window_Data *engine_data;
@@ -224,6 +241,7 @@
return ecore_evas_title_get(engine_data-ecore_evas);
}
+/* Sets the WM class of the window */
static void _window_wmclass_set(Etk_Window *window, const char *window_name,
const char *window_class)
{
Etk_Engine_Window_Data *engine_data;
@@ -232,6 +250,7 @@
ecore_evas_name_class_set(engine_data-ecore_evas, window_name,
window_class);
}
+/* Moves the window to the given position */
static void _window_move(Etk_Window *window, int x, int y)
{
Etk_Engine_Window_Data *engine_data;
@@ -240,6 +259,7 @@
ecore_evas_move(engine_data-ecore_evas, x, y);
}
+/* Resizes the window */
static void _window_resize(Etk_Window *window, int w, int h)
{
Etk_Engine_Window_Data *engine_data;
@@ -252,6 +272,7 @@
ecore_evas_resize(engine_data-ecore_evas, window-width, window-height);
}
+/* Sets the
E CVS: engage handyande
Enlightenment CVS committal
Author : handyande
Project : misc
Module : engage
Dir : misc/engage/src
Modified Files:
e_apps.c main.c
Log Message:
Update the cached eap code, .desktop working again
fix the init stuff a bit more
===
RCS file: /cvs/e/misc/engage/src/e_apps.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_apps.c3 Sep 2006 19:08:04 - 1.8
+++ e_apps.c3 Sep 2006 21:53:01 - 1.9
@@ -65,6 +65,7 @@
#endif
static void _e_app_check_order(const char *file);
static int _e_app_order_contains(E_App *a, const char *file);
+static void _e_app_resolve_file_name(char *buf, size_t size, const char
*path, const char *file);
/* local subsystem globals */
static Evas_Hash *_e_apps = NULL;
@@ -282,17 +283,19 @@
e_app_fields_fill(a, path);
/* no exe field.. not valid. drop it */
- if (!_e_app_exe_valid_get(a-exe))
- goto error;
+// if (!_e_app_exe_valid_get(a-exe))
+// goto error;
}
else
goto error;
}
else
- return NULL;
+ {
+ return NULL;
+ }
_e_apps = evas_hash_add(_e_apps, a-path, a);
_e_apps_list = evas_list_prepend(_e_apps_list, a);
-
+
ac = e_app_cache_generate(a);
e_app_cache_save(ac, a-path);
e_app_cache_free(ac);
@@ -319,7 +322,7 @@
{
char buf[4096];
- snprintf(buf, sizeof(buf), %s/_new_app_%1.1f.eap,
+ snprintf(buf, sizeof(buf), %s/_new_app_%1.1f.desktop,
_e_apps_all-path, ecore_time_get());
a-path = evas_stringshare_add(buf);
}
@@ -388,10 +391,7 @@
a2 = NULL;
-if (s[0] == '/')
- snprintf(buf, sizeof(buf), %s, s);
-else
- snprintf(buf, sizeof(buf), %s/%s, a-path, s);
+ _e_app_resolve_file_name(buf, sizeof(buf), a-path, s);
if (ecore_file_exists(buf))
{
a2 = e_app_new(buf, scan_subdirs);
@@ -409,10 +409,7 @@
pl = _e_apps_repositories;
while ((!a2) (pl))
{
- if (s[0] == '/')
- snprintf(buf, sizeof(buf), %s, s);
- else
- snprintf(buf, sizeof(buf), %s/%s, (char *)pl-data,
s);
+ _e_app_resolve_file_name(buf, sizeof(buf), (char
*)pl-data, s);
a2 = e_app_new(buf, scan_subdirs);
pl = pl-next;
}
@@ -1263,112 +1260,162 @@
EAPI void
e_app_fields_save(E_App *a)
{
- Eet_File *ef;
char buf[PATH_MAX];
- const char *lang;
- unsigned char tmp[1];
-// int img;
-
-// if ((!a-path) || (!ecore_file_exists(a-path)))
-// {
- _e_app_new_save(a);
-// img = 0;
-// }
-// else
-// img = 1;
-
- /* get our current language */
- lang = e_intl_language_alias_get();
+ const char *lang, *ext = NULL;
- /* if its C its the default - so drop it */
- if (!strcmp(lang, C)) lang = NULL;
-
- ef = eet_open(a-path, EET_FILE_MODE_READ_WRITE);
- if (!ef) return;
-
- if (a-name)
- {
- /*if (lang) snprintf(buf, sizeof(buf), app/info/name[%s], lang);
- else */
- snprintf(buf, sizeof(buf), app/info/name);
- eet_write(ef, buf, a-name, strlen(a-name), 0);
- }
-
- if (a-generic)
- {
- /*if (lang) snprintf(buf, sizeof(buf), app/info/generic[%s], lang);
- else */
- snprintf(buf, sizeof(buf), app/info/generic);
- eet_write(ef, buf, a-generic, strlen(a-generic), 0);
- }
+ /* Check if it's a new one that has not been saved yet. */
+ if (a-path)
+ ext = ecore_file_get_file(a-path);
+ if ( (!a-path) || ((strncmp(ext, _new_app_, 9) == 0)
(!ecore_file_exists(a-path))) )
+ {
+ snprintf(buf, sizeof(buf), %s/%s.desktop, _e_apps_all-path,
a-name);
+a-path = evas_stringshare_add(buf);
+ }
- if (a-comment)
- {
- /*if (lang) snprintf(buf, sizeof(buf), app/info/comment[%s], lang);
- else*/
- snprintf(buf, sizeof(buf), app/info/comment);
- eet_write(ef, buf, a-comment, strlen(a-comment), 0);
- }
+ ext = strrchr(a-path, '.');
+ if ((ext) (strcmp(ext, .desktop) == 0))
+ { /* It's a .desktop file. */
+ Ecore_Desktop *desktop;
+int created = 0;
- if (a-exe)
- eet_write(ef, app/info/exe, a-exe, strlen(a-exe), 0);
- if (a-win_name)
- eet_write(ef, app/window/name, a-win_name, strlen(a-win_name), 0);
- if (a-win_class)
- eet_write(ef, app/window/class, a-win_class, strlen(a-win_class), 0);
- if (a-win_title)
- eet_write(ef, app/window/title, a-win_title, strlen(a-win_title),
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_menu.c etk_menu.h etk_popup_window.c etk_popup_window.h
etk_widget.c
Log Message:
* [Menu] Add etk_menu_popup_in_direction() and
etk_menu_popup_at_xy_in_direction()
to make a menu pop up in a given direction
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_menu.c 3 Sep 2006 18:36:11 - 1.19
+++ etk_menu.c 3 Sep 2006 22:29:03 - 1.20
@@ -1,7 +1,6 @@
/** @file etk_menu.c */
#include etk_menu.h
#include stdlib.h
-#include etk_popup_window.h
#include etk_menu_item.h
#include etk_utils.h
#include etk_signal.h
@@ -76,6 +75,29 @@
}
/**
+ * @brief Pops up the menu at the mouse position
+ * @param menu a menu
+ */
+void etk_menu_popup(Etk_Menu *menu)
+{
+ if (!menu)
+ return;
+ etk_popup_window_popup(menu-window);
+}
+
+/**
+ * @brief Pops up the menu at the mouse position, in the given direction
+ * @param menu a menu
+ * @param direction the direction to which the menu should be popped up
+ */
+void etk_menu_popup_in_direction(Etk_Menu *menu, Etk_Popup_Direction direction)
+{
+ if (!menu)
+ return;
+ etk_popup_window_popup_in_direction(menu-window, direction);
+}
+
+/**
* @brief Pops up the menu at the position (x, y)
* @param menu a menu
* @param x the x component of the position where to popup the menu
@@ -89,14 +111,17 @@
}
/**
- * @brief Pops up the menu at the mouse position
+ * @brief Pops up the menu at the position (x, y), in the given direction
* @param menu a menu
+ * @param x the x component of the position where to popup the menu
+ * @param y the y component of the position where to popup the menu
+ * @param direction the direction to which the menu should be popped up
*/
-void etk_menu_popup(Etk_Menu *menu)
+void etk_menu_popup_at_xy_in_direction(Etk_Menu *menu, int x, int y,
Etk_Popup_Direction direction)
{
if (!menu)
return;
- etk_popup_window_popup(menu-window);
+ etk_popup_window_popup_at_xy_in_direction(menu-window, x, y, direction);
}
/**
@@ -131,7 +156,11 @@
ETK_WIDGET(menu)-size_request = _etk_menu_size_request;
ETK_WIDGET(menu)-size_allocate = _etk_menu_size_allocate;
- etk_signal_connect(item_added, ETK_OBJECT(menu),
ETK_CALLBACK(_etk_menu_item_added_cb), menu);
+ /* We make sure the menu widget is always visible */
+ etk_widget_show(ETK_WIDGET(menu));
+ etk_signal_connect_swapped(hide, ETK_OBJECT(menu),
ETK_CALLBACK(etk_widget_show), menu);
+
+ etk_signal_connect(item_added, ETK_OBJECT(menu),
ETK_CALLBACK(_etk_menu_item_added_cb), NULL);
etk_signal_connect(item_removed, ETK_OBJECT(menu),
ETK_CALLBACK(_etk_menu_item_removed_cb), NULL);
}
@@ -233,7 +262,6 @@
if (!(menu_widget = ETK_WIDGET(data)))
return;
- etk_widget_show(menu_widget);
etk_signal_emit(_etk_menu_signals[ETK_MENU_POPPED_UP_SIGNAL],
ETK_OBJECT(menu_widget), NULL);
if (ETK_MENU_SHELL(menu_widget)-parent)
etk_signal_emit_by_name(submenu_popped_up,
ETK_OBJECT(ETK_MENU_SHELL(menu_widget)-parent), NULL);
@@ -282,7 +310,7 @@
etk_signal_connect(selected, item_object,
ETK_CALLBACK(_etk_menu_item_selected_cb), NULL);
etk_signal_connect(deselected, item_object,
ETK_CALLBACK(_etk_menu_item_deselected_cb), NULL);
etk_signal_connect(activated, item_object,
ETK_CALLBACK(_etk_menu_item_activated_cb), NULL);
- etk_object_notification_callback_add(item_object, submenu,
_etk_menu_item_submenu_changed_cb, data);
+ etk_object_notification_callback_add(item_object, submenu,
_etk_menu_item_submenu_changed_cb, object);
}
/* Called when an item is removed from the menu */
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_menu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_menu.h 3 Sep 2006 18:36:11 - 1.7
+++ etk_menu.h 3 Sep 2006 22:29:03 - 1.8
@@ -3,6 +3,7 @@
#define _ETK_MENU_H_
#include etk_menu_shell.h
+#include etk_popup_window.h
#include etk_types.h
/* TODO/FIXME list:
@@ -43,8 +44,10 @@
Etk_Type *etk_menu_type_get();
Etk_Widget *etk_menu_new();
-void etk_menu_popup_at_xy(Etk_Menu *menu, int x, int y);
void etk_menu_popup(Etk_Menu *menu);
+void etk_menu_popup_in_direction(Etk_Menu *menu, Etk_Popup_Direction
direction);
+void etk_menu_popup_at_xy(Etk_Menu *menu, int x, int y);
+void etk_menu_popup_at_xy_in_direction(Etk_Menu *menu, int x, int y,
Etk_Popup_Direction direction);
void etk_menu_popdown(Etk_Menu *menu);
/** @} */
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
---
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/data/other Modified Files: efm_favorites.tar.gz Log Message: update fav's === RCS file: /cvs/e/e17/apps/e/data/other/efm_favorites.tar.gz,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsfvtgKQ and /tmp/cvsM7h8HR differ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: fix setuid stuff - oops. always allowed :) todo changes - still minor bug in fav icons. :( === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.422 retrieving revision 1.423 diff -u -3 -r1.422 -r1.423 --- TODO3 Sep 2006 15:12:33 - 1.422 +++ TODO3 Sep 2006 23:09:14 - 1.423 @@ -8,8 +8,9 @@ BUGS / FIXES --- -* BUG: favorite places in fsel (left pane) doesnt display icons nor does it - jump to links where URL points to in the .desktop file. +* BUG: favorite places in fsel (left pane) has 1 bug left - e app caching. + if you modify a .desktop file while e is running - it will not find the + changes until a restart (kind of bad for a fm/file selector :() * BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: the ibar specific menu only shows when you right click on icons (and not on the bar itself). so, if there are no icons you can't get to the config. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_sys_main.c
Log Message:
fix setuid stuff - oops. always allowed :)
todo changes - still minor bug in fav icons. :(
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_sys_main.c3 Sep 2006 09:35:28 - 1.2
+++ e_sys_main.c3 Sep 2006 23:09:14 - 1.3
@@ -12,7 +12,7 @@
#include Evas.h
/* local subsystem functions */
-static int auth_action_ok(char *a);
+static int auth_action_ok(char *a, uid_t uid, gid_t gid);
static int auth_etc_enlightenment_sysactions(char *a, char *u, char *g);
static char *get_word(char *s, char *d);
@@ -26,6 +26,8 @@
int i;
int test = 0;
char *action, *cmd;
+ uid_t uid;
+ gid_t gid;
for (i = 1; i argc; i++)
{
@@ -54,15 +56,23 @@
exit(-1);
}
- if (seteuid(0))
+ uid = getuid();
+ gid = getgid();
+
+ if (setuid(0) != 0)
{
printf(ERROR: UNABLE TO ASSUME ROOT PRIVILEDGES\n);
exit(5);
}
+ if (setgid(0) != 0)
+ {
+ printf(ERROR: UNABLE TO ASSUME ROOT GROUP PRIVILEDGES\n);
+ exit(7);
+ }
evas_init();
- if (!auth_action_ok(action))
+ if (!auth_action_ok(action, uid, gid))
{
printf(ERROR: ACTION NOT ALLOWED: %s\n, action);
exit(10);
@@ -84,18 +94,18 @@
/* local subsystem functions */
static int
-auth_action_ok(char *a)
+auth_action_ok(char *a, uid_t uid, gid_t gid)
{
struct passwd *pw;
struct group *gp;
char *usr = NULL, *grp;
int ret;
- pw = getpwuid(getuid());
+ pw = getpwuid(uid);
if (!pw) return 0;
usr = pw-pw_name;
if (!usr) return 0;
- gp = getgrgid(getgid());
+ gp = getgrgid(gid);
if (gp) grp = gp-gr_name;
/* first stage - check:
* PREFIX/etc/enlightenment/sysactions.conf
@@ -117,9 +127,9 @@
int allow = 0;
int deny = 0;
- snprintf(file, sizeof(file), /etc/enlightenment/sysactions.conf);
- f = fopen(file, r);
- if (!f)
+// snprintf(file, sizeof(file), /etc/enlightenment/sysactions.conf);
+// f = fopen(file, r);
+// if (!f)
{
snprintf(file, sizeof(file),
PACKAGE_SYSCONF_DIR/enlightenment/sysactions.conf);
f = fopen(file, r);
@@ -147,7 +157,7 @@
deny = 0;
if (!strcmp(id, user:))
{
-if (!fnmatch(u, ugname, 0))
+if (!fnmatch(ugname, u, 0))
{
if (!strcmp(perm, allow:)) allow = 1;
else if (!strcmp(perm, deny:)) deny = 1;
@@ -159,7 +169,7 @@
}
else if (!strcmp(id, group:))
{
-if (!fnmatch(u, ugname, 0))
+if (!fnmatch(ugname, g, 0))
{
if (!strcmp(perm, allow:)) allow = 1;
else if (!strcmp(perm, deny:)) deny = 1;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_sys_main.c
Log Message:
remove hacking commenting stuff
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_sys_main.c3 Sep 2006 23:09:14 - 1.3
+++ e_sys_main.c3 Sep 2006 23:14:01 - 1.4
@@ -127,9 +127,9 @@
int allow = 0;
int deny = 0;
-// snprintf(file, sizeof(file), /etc/enlightenment/sysactions.conf);
-// f = fopen(file, r);
-// if (!f)
+ snprintf(file, sizeof(file), /etc/enlightenment/sysactions.conf);
+ f = fopen(file, r);
+ if (!f)
{
snprintf(file, sizeof(file),
PACKAGE_SYSCONF_DIR/enlightenment/sysactions.conf);
f = fopen(file, r);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar cobra
Enlightenment CVS committal
Author : cobra
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar/data/themes
Modified Files:
taskbar.edc
Log Message:
Some taskbar changes:
A todo
Fix populate taskbar on startup bug
Change inactive apps to silver/gray
Make 'hilight window on mouse over' follow mouse over (I think this was the
intent of the config option...)
Remove some extra calls to internal functions.
This works pretty well in Normal or Inset mode without 'scroll contents' set.
Scroll contents is kind of flaky but sort of works.
Bug: Switching scroll on and off will hang up the scroll function until another
update (desk switch or app change.)
Kevin Brosius [EMAIL PROTECTED]
===
RCS file: /cvs/e/e_modules/taskbar/data/themes/taskbar.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- taskbar.edc 9 Aug 2006 06:42:42 - 1.4
+++ taskbar.edc 4 Sep 2006 02:05:40 - 1.5
@@ -24,6 +24,7 @@
//item: item_list item item2 item3;
}
parts {
+ // app icon clip
part {
name: item_clip;
type: RECT;
@@ -45,7 +46,7 @@
state:default 0.0;
min: 56 16;
image {
- normal: e17_button_sm.png;
+ normal: e17_button_sm_disabled.png;
border: 8 8 8 8;
}
}
@@ -66,6 +67,15 @@
relative: 1.0 1.0;
}
}
+
+description {
+ state:focused 0.0;
+inherit: default 0.0;
+image {
+ normal: e17_button_sm2.png;
+}
+}
+
}
part {
name: item;
@@ -118,6 +128,7 @@
state:focused 0.0;
inherit: default 0.0;
visible: 1;
+
color: 255 255 255 255;
}
}
@@ -139,6 +150,7 @@
offset: -8-8;
to: button_image;
}
+// text color on button face
color: 255 255 255 255;
color3: 0 0 0 42;
text {
@@ -198,7 +210,7 @@
name:instant_uniconify;
signal: instant_uniconify;
source: ;
-action: STATE_SET default 0.0;
+action: STATE_SET focused 0.0;
transition: LINEAR 0.0;
target: button_image;
}
@@ -214,21 +226,47 @@
name:uniconify;
signal: uniconify;
source: ;
+action: STATE_SET focused 0.0;
+ transition: LINEAR 0.5;
+target: button_image;
+ }
+
+ program {
+name:but_focused;
+signal: focused;
+source: ;
+action: STATE_SET focused 0.0;
+ transition: LINEAR 0.5;
+target: button_image;
+ }
+ program {
+name:but_unfocused;
+signal: unfocused;
+source: ;
action: STATE_SET default 0.0;
transition: LINEAR 0.5;
target: button_image;
}
program {
-name:instant_focused;
+name:but_instant_focused;
signal: instant_focused;
source: ;
action: STATE_SET focused 0.0;
transition: LINEAR 0.0;
+target: button_image;
+ }
+
+ program {
+name:instant_focused;
+signal: instant_focused_xxx;
+source: ;
+action: STATE_SET focused 0.0;
+ transition: LINEAR 0.0;
target: focus;
}
program {
name:instant_unfocused;
-signal: instant_unfocused;
+signal: instant_unfocused_;
source: ;
action: STATE_SET default 0.0;
transition: LINEAR 0.0;
@@ -236,7 +274,7 @@
}
program {
name:focused;
-signal: focused;
+signal: hilight;
source: ;
action: STATE_SET focused 0.0;
transition: LINEAR 0.5;
@@ -244,7 +282,7 @@
}
program {
name:unfocused;
-signal: unfocused;
+signal: unhilight;
source: ;
action: STATE_SET default 0.0;
transition: LINEAR 0.5;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar cobra
Enlightenment CVS committal
Author : cobra
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar
Modified Files:
e_mod_config.c e_mod_main.c
Added Files:
TODO
Log Message:
Some taskbar changes:
A todo
Fix populate taskbar on startup bug
Change inactive apps to silver/gray
Make 'hilight window on mouse over' follow mouse over (I think this was the
intent of the config option...)
Remove some extra calls to internal functions.
This works pretty well in Normal or Inset mode without 'scroll contents' set.
Scroll contents is kind of flaky but sort of works.
Bug: Switching scroll on and off will hang up the scroll function until another
update (desk switch or app change.)
Kevin Brosius [EMAIL PROTECTED]
===
RCS file: /cvs/e/e_modules/taskbar/e_mod_config.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.c 14 Aug 2006 21:14:58 - 1.7
+++ e_mod_config.c 4 Sep 2006 02:05:40 - 1.8
@@ -77,7 +77,7 @@
e_widget_check_checked_set(ob, 1);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, D_(Show Labels), (cfdata-show_label));
+ ob = e_widget_check_add(evas, D_(Show Sliding Labels),
(cfdata-show_label));
//if (cfdata-show_label)
// e_widget_check_checked_set(ob, 1);
e_widget_framelist_object_append(of, ob);
===
RCS file: /cvs/e/e_modules/taskbar/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c9 Aug 2006 07:47:28 - 1.16
+++ e_mod_main.c4 Sep 2006 02:05:40 - 1.17
@@ -140,9 +140,14 @@
e_gadcon_canvas_zone_geometry_get(inst-gcc-gadcon, cx, cy, cw, ch);
evas_object_geometry_get(o, x, y, w, h);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOVE,
_taskbar_cb_obj_moveresize, inst);
evas_object_event_callback_add(o, EVAS_CALLBACK_RESIZE,
_taskbar_cb_obj_moveresize, inst);
taskbar_config-instances = evas_list_append(taskbar_config-instances,
inst);
+
+ // Fill on initial config
+ _taskbar_config_updated(id);
+
return gcc;
}
@@ -304,7 +309,6 @@
evas_object_color_set(b-o_empty, 0, 0, 0, 0);
evas_object_show(b-o_empty);
e_table_pack(b-o_box, b-o_empty, 0, 0, 1, 1);
- evas_object_geometry_get(b-o_box, NULL, NULL, w, h);
e_table_pack_options_set(b-o_empty, 1, 1, /* fill */
1, 1, /* expand */
@@ -343,23 +347,36 @@
ic = _taskbar_icon_new(b, bd);
b-icons = evas_list_append(b-icons, ic);
e_table_pack(b-o_box, ic-o_holder, b-xpos, b-ypos, 1, 1);
+#if 0
e_table_pack_options_set(ic-o_holder, 0, 0,
/* fill */
0, 0,
/* expand */
0.5, 0.5,
/* align */
b-bwidth, b-bheight,
/* min */
b-bwidth, b-bheight
/* max */
);
+#else
+e_table_pack_options_set(ic-o_holder, 1, 1,
/* fill */
+ 0, 0,
/* expand */
+ 0.5, 0.5,
/* align */
+ b-bwmin, b-bhmin,/*
min */
+ b-bwidth, b-bheight
/* max */
+ );
+#endif
+
if (bd-iconic)
_taskbar_icon_signal_emit(ic, instant_iconify, );
if (bd-focused)
_taskbar_icon_signal_emit(ic, instant_focused, );
b-xpos++;
+#if 0
+// vert layout and stacking needs work
if (b-xpos = b-xmax)
{
b-xpos = 0;
b-ypos ++;
//if (b-ypos = b-ymax)
}
+#endif
}
}
@@ -390,24 +407,37 @@
ic = _taskbar_icon_new(b, bd);
b-icons = evas_list_append(b-icons, ic);
e_table_pack(b-o_box, ic-o_holder, b-xpos, b-ypos, 1, 1);
+
+#if 0
e_table_pack_options_set(ic-o_holder, 0, 0, /*
fill */
0, 0, /*
expand */
0.5, 0.5, /*
align */
b-bwidth, b-bheight,/* min
*/
b-bwidth, b-bheight /* max
*/
);
-
+#else
+ e_table_pack_options_set(ic-o_holder, 1, 1,
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_configure.c e_includes.h Added Files: e_int_config_transitions.c e_int_config_transitions.h Log Message: Added transition config dialog. Still needs preview but I'm working on it. === RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.148 retrieving revision 1.149 diff -u -3 -r1.148 -r1.149 --- Makefile.am 3 Sep 2006 09:35:28 - 1.148 +++ Makefile.am 4 Sep 2006 02:07:46 - 1.149 @@ -181,7 +181,8 @@ e_int_config_wallpaper_gradient.h \ e_color_dialog.h \ e_fdo_menu_to_order.h \ -e_sys.h +e_sys.h \ +e_int_config_transitions.h enlightenment_src = \ e_user.c \ @@ -337,6 +338,7 @@ e_color_dialog.c \ e_fdo_menu_to_order.c \ e_sys.c \ +e_int_config_transitions.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- e_configure.c 3 Sep 2006 10:18:33 - 1.57 +++ e_configure.c 4 Sep 2006 02:07:46 - 1.58 @@ -70,7 +70,8 @@ e_configure_standard_item_add(eco, enlightenment/icon_themes, _(Icon Theme), e_int_config_icon_themes); e_configure_standard_item_add(eco, enlightenment/mouse, _(Mouse Cursor), e_int_config_cursor); e_configure_standard_item_add(eco, enlightenment/windows, _(Window Display), e_int_config_window_display); - e_configure_standard_item_add(eco, enlightenment/shelf, _(Shelves), e_int_config_shelf); + e_configure_standard_item_add(eco, enlightenment/e, _(Transitions), e_int_config_transitions); + e_configure_standard_item_add(eco, enlightenment/shelf, _(Shelves), e_int_config_shelf); e_configure_header_item_add(eco, enlightenment/screen_setup, _(Screen)); e_configure_standard_item_add(eco, enlightenment/desktops, _(Virtual Desktops), e_int_config_desks); @@ -93,7 +94,7 @@ e_configure_standard_item_add(eco, enlightenment/winlist, _(Window List), e_int_config_winlist); e_configure_standard_item_add(eco, enlightenment/window_manipulation, _(Window Manipulation), e_int_config_window_manipulation); e_configure_standard_item_add(eco, enlightenment/run, _(Run Command), e_int_config_exebuf); - e_configure_standard_item_add(eco, enlightenment/directories, _(Search Directories), e_int_config_paths); + e_configure_standard_item_add(eco, enlightenment/directories, _(Search Directories), e_int_config_paths); e_configure_header_item_add(eco, enlightenment/extensions, _(Extensions)); e_configure_standard_item_add(eco, enlightenment/modules, _(Modules), e_int_config_modules); === RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- e_includes.h3 Sep 2006 08:51:31 - 1.126 +++ e_includes.h4 Sep 2006 02:07:46 - 1.127 @@ -156,4 +156,4 @@ #include e_color_dialog.h #include e_fdo_menu_to_order.h #include e_sys.h - +#include e_int_config_transitions.h - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ 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 Modified Files: TODO Log Message: Updated todo for transition preview. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.423 retrieving revision 1.424 diff -u -3 -r1.423 -r1.424 --- TODO3 Sep 2006 23:09:14 - 1.423 +++ TODO4 Sep 2006 02:09:04 - 1.424 @@ -29,6 +29,7 @@ (rhythmbox does this a lot apparently) e doesnt realize and still thinks it's iconified. * BUG: Hiding the label of e_widget_slider causes the slider line to disappear +* BUG: Transition config dialog needs preview. ]]] [[[ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar cobra
Enlightenment CVS committal Author : cobra Project : e_modules Module : taskbar Dir : e_modules/taskbar Modified Files: TODO Log Message: Update TODO Kevin Brosius [EMAIL PROTECTED] === RCS file: /cvs/e/e_modules/taskbar/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- TODO4 Sep 2006 02:05:40 - 1.1 +++ TODO4 Sep 2006 02:30:05 - 1.2 @@ -30,6 +30,7 @@ Behavior decisions -- when an app is behind another app on the desktop, and you click on the +- (Is this an Xnest problem? It works for iamsthitha.) + when an app is behind another app on the desktop, and you click on the taskbar, the app will get focus, but be hidden. Should we raise? Should it follow current wm behavior for 'raise on click'? - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
