E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c
Log Message:
all ibars - 200 size by default.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- e_config.c 20 Apr 2006 11:30:23 - 1.165
+++ e_config.c 21 Apr 2006 06:58:11 - 1.166
@@ -1103,19 +1103,19 @@
CFG_GADCON("shelf", "1");
CFG_GADCON_CLIENT("pager", "default2", 800, 120,
0, "inset", 0, 0);
- CFG_GADCON_CLIENT("ibar", "default2", 800, 16,
+ CFG_GADCON_CLIENT("ibar", "default2", 800, 200,
400 - (16 / 2), "inset", 1, 0);
CFG_GADCON("shelf", "2");
CFG_GADCON_CLIENT("pager", "default3", 800, 120,
0, "inset", 0, 0);
- CFG_GADCON_CLIENT("ibar", "default2", 800, 16,
+ CFG_GADCON_CLIENT("ibar", "default2", 800, 200,
400 - (16 / 2), "inset", 1, 0);
CFG_GADCON("shelf", "3");
CFG_GADCON_CLIENT("pager", "default4", 800, 120,
0, "inset", 0, 0);
- CFG_GADCON_CLIENT("ibar", "default2", 800, 16,
+ CFG_GADCON_CLIENT("ibar", "default2", 800, 200,
400 - (16 / 2), "inset", 1, 0);
}
IFCFGEND;
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
- make the tree header display again
- couple formatting changes
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_tree2.c 20 Apr 2006 04:08:58 - 1.16
+++ ewl_tree2.c 21 Apr 2006 02:07:21 - 1.17
@@ -259,6 +259,9 @@
DCHECK_PARAM_PTR("tree", tree);
DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
+ if (tree->headers_visible == visible)
+ DRETURN(DLEVEL_STABLE);
+
tree->headers_visible = !!visible;
if (!tree->headers_visible)
@@ -416,7 +419,10 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("tree2", tree2);
DCHECK_TYPE("tree2", tree2, EWL_TREE2_TYPE);
-
+
+ if (tree2->dirty == dirty)
+ DRETURN(DLEVEL_STABLE);
+
tree2->dirty = !!dirty;
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -455,7 +461,8 @@
}
void
-ewl_tree2_cb_configure(Ewl_Widget *w, void *ev __UNUSED__, void *data
__UNUSED__)
+ewl_tree2_cb_configure(Ewl_Widget *w, void *ev __UNUSED__,
+ void *data __UNUSED__)
{
Ewl_Tree2 *tree;
Ewl_Tree2_Column *col;
@@ -473,10 +480,12 @@
CURRENT_H(tree));
/* if the tree isn't dirty we're done */
- if (!ewl_tree2_dirty_get(tree)) DRETURN(DLEVEL_STABLE);
+ if (!ewl_tree2_dirty_get(tree))
+ DRETURN(DLEVEL_STABLE);
/* setup the headers */
ewl_container_reset(EWL_CONTAINER(tree->header));
+ ecore_list_goto_first(tree->columns);
while ((col = ecore_list_next(tree->columns)))
{
ewl_container_child_append(EWL_CONTAINER(tree->header),
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: mmm we need AC_MSG_RESULT in the no case, just not in the yes case === RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- configure.in21 Apr 2006 00:47:22 - 1.36 +++ configure.in21 Apr 2006 00:53:13 - 1.37 @@ -166,11 +166,13 @@ PKG_CHECK_MODULES(GST, \ gstreamer-$GST_MAJORMINOR >= $GST_REQS, - HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no") + HAVE_GSTREAMER="yes", AC_MSG_RESULT(no) + HAVE_GSTREAMER="no") PKG_CHECK_MODULES(GSTPLUG, \ gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS, - HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no") + HAVE_GSTPLUG="yes", AC_MSG_RESULT(no) + HAVE_GSTPLUG="no") AM_GST_ELEMENT_CHECK( [ffmpeg], --- 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: fix broken configure output === RCS file: /cvs/e/e17/libs/emotion/configure.in,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- configure.in21 Apr 2006 00:45:52 - 1.35 +++ configure.in21 Apr 2006 00:47:22 - 1.36 @@ -167,12 +167,10 @@ PKG_CHECK_MODULES(GST, \ gstreamer-$GST_MAJORMINOR >= $GST_REQS, HAVE_GSTREAMER="yes", HAVE_GSTREAMER="no") - AC_MSG_RESULT($HAVE_GSTREAMER) PKG_CHECK_MODULES(GSTPLUG, \ gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPLUG_REQS, HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no") - AC_MSG_RESULT($HAVE_GSTPLUG) AM_GST_ELEMENT_CHECK( [ffmpeg], --- 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion vapier
Enlightenment CVS committal
Author : vapier
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion
Modified Files:
configure.in
Log Message:
fix misc broken whitespace
===
RCS file: /cvs/e/e17/libs/emotion/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- configure.in2 Apr 2006 18:26:27 - 1.34
+++ configure.in21 Apr 2006 00:45:52 - 1.35
@@ -58,7 +58,7 @@
else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Package Data
Directory])
fi
-
+
dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
@@ -174,15 +174,15 @@
HAVE_GSTPLUG="yes", HAVE_GSTPLUG="no")
AC_MSG_RESULT($HAVE_GSTPLUG)
-AM_GST_ELEMENT_CHECK(
- [ffmpeg],
- [HAVE_GSTFFMPEG="yes"],
- [HAVE_GSTFFMPEG="no"])
-
-AM_GST_ELEMENT_CHECK(
- [cdiocddasrc],
- [HAVE_GSTCDIOCDDASRC="yes"],
- [HAVE_GSTCDIOCDDASRC="no"])
+ AM_GST_ELEMENT_CHECK(
+ [ffmpeg],
+ [HAVE_GSTFFMPEG="yes"],
+ [HAVE_GSTFFMPEG="no"])
+
+ AM_GST_ELEMENT_CHECK(
+ [cdiocddasrc],
+ [HAVE_GSTCDIOCDDASRC="yes"],
+ [HAVE_GSTCDIOCDDASRC="no"])
fi
if test "$enable_gstreamer$HAVE_GSTREAMER" = "yesno" ; then
AC_MSG_RESULT(gstreamer not found)
@@ -204,20 +204,20 @@
fi
requirements="$requirements gstreamer"
GSTPLUG_MSG="yes"
-else
+ else
requirements="$requirements gstreamer"
GSTPLUG_MSG="yes"
fi
if test "$HAVE_GSTCDIOCDDASRC" = "no"; then
AC_MSG_WARN([You should install gstreamer-plugins-good and make
sure that the cdiocddasrc element is installed])
GSTCDDA_MSG="no (you should install gst-plugins-good and the
cdiocddasrc element)"
-else
+ else
requirements="$requirements gstreamer"
GSTCDDA_MSG="yes"
fi
fi
if test "$HAVE_XINE$HAVE_GSTREAMER" = "nono" ; then
- AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
+ AC_MSG_ERROR([Xine or Gstreamer must be installed to build emotion])
fi
AM_CONDITIONAL([BUILD_XINE_MODULE], [test "$HAVE_XINE" = yes])
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/emotion Dir : e17/libs/emotion/m4 Modified Files: gst-element-check.m4 Log Message: kill bogus code === RCS file: /cvs/e/e17/libs/emotion/m4/gst-element-check.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- gst-element-check.m418 Apr 2006 22:15:09 - 1.3 +++ gst-element-check.m421 Apr 2006 00:32:04 - 1.4 @@ -6,13 +6,13 @@ AC_DEFUN([AM_GST_ELEMENT_CHECK], [ - if test "x$GST_INSPECT" == "x"; then + if test "x$GST_INSPECT" = "x"; then AC_CHECK_PROGS(GST_INSPECT, gst-inspect gst-inspect-0.10, []) fi if test "x$GST_INSPECT" != "x"; then AC_MSG_CHECKING(GStreamer element $1) -if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then +if $GST_INSPECT $1 > /dev/null 2> /dev/null ; then AC_MSG_RESULT(found.) $2 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
Makefile.am array.c mbuff.c str.c ustr.c
Log Message:
Thu Apr 20 16:44:39 2006Michael Jennings (mej)
Added mbuff and ustr to testing routines.
Fleshed out ustr class; doesn't do UTF-8 yet though.
Fixed array removal code. I have no idea how that was working before.
--
===
RCS file: /cvs/e/eterm/libast/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- Makefile.am 7 Mar 2005 22:29:07 - 1.16
+++ Makefile.am 20 Apr 2006 21:44:40 - 1.17
@@ -7,7 +7,7 @@
libast_la_SOURCES =\
array.c builtin_hashes.c conf.c debug.c dlinked_list.c file.c \
linked_list.c mbuff.c mem.c msgs.c obj.c objpair.c options.c \
-regexp.c socket.c str.c strings.c snprintf.c tok.c url.c
+regexp.c socket.c str.c strings.c snprintf.c tok.c url.c ustr.c
libast_la_LDFLAGS = -version-info 2:1:0
MAINTAINERCLEANFILES = Makefile.in
===
RCS file: /cvs/e/eterm/libast/src/array.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- array.c 23 Jul 2004 21:38:39 - 1.19
+++ array.c 20 Apr 2006 21:44:40 - 1.20
@@ -366,7 +366,7 @@
tmp = spif_array_list_new();
REQUIRE_RVAL(!SPIF_ARRAY_ISNULL(tmp), SPIF_NULL_TYPE(array));
memcpy(tmp, self, SPIF_SIZEOF_TYPE(array));
-tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
self->len);
+tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
self->len);
for (i = 0; i < self->len; i++) {
tmp->items[i] = SPIF_CAST(obj) SPIF_OBJ_DUP(SPIF_OBJ(self->items[i]));
}
@@ -384,7 +384,7 @@
tmp = spif_array_vector_new();
REQUIRE_RVAL(!SPIF_ARRAY_ISNULL(tmp), SPIF_NULL_TYPE(array));
memcpy(tmp, self, SPIF_SIZEOF_TYPE(array));
-tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
self->len);
+tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
self->len);
for (i = 0; i < self->len; i++) {
tmp->items[i] = SPIF_CAST(obj) SPIF_OBJ_DUP(SPIF_OBJ(self->items[i]));
}
@@ -402,7 +402,7 @@
tmp = spif_array_map_new();
REQUIRE_RVAL(!SPIF_ARRAY_ISNULL(tmp), SPIF_NULL_TYPE(array));
memcpy(tmp, self, SPIF_SIZEOF_TYPE(array));
-tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
self->len);
+tmp->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
self->len);
for (i = 0; i < self->len; i++) {
tmp->items[i] = SPIF_CAST(obj) SPIF_OBJ_DUP(SPIF_OBJ(self->items[i]));
}
@@ -422,9 +422,9 @@
ASSERT_RVAL(!SPIF_ARRAY_ISNULL(self), FALSE);
self->len++;
if (self->items) {
-self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
SPIF_SIZEOF_TYPE(obj) * self->len);
+self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
sizeof(spif_obj_t) * self->len);
} else {
-self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
self->len);
+self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
self->len);
}
self->items[self->len - 1] = obj;
return TRUE;
@@ -635,15 +635,15 @@
ASSERT_RVAL(!SPIF_ARRAY_ISNULL(self), FALSE);
REQUIRE_RVAL(!SPIF_OBJ_ISNULL(obj), FALSE);
if (self->items) {
-self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
SPIF_SIZEOF_TYPE(obj) * (self->len + 1));
+self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
sizeof(spif_obj_t) * (self->len + 1));
} else {
-self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
(self->len + 1));
+self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
(self->len + 1));
}
for (i = 0; i < self->len && SPIF_CMP_IS_GREATER(SPIF_OBJ_COMP(obj,
self->items[i])); i++);
left = self->len - i;
if (left) {
-memmove(self->items + i + 1, self->items + i, SPIF_SIZEOF_TYPE(obj) *
left);
+memmove(self->items + i + 1, self->items + i, sizeof(spif_obj_t) *
left);
}
self->items[i] = obj;
self->len++;
@@ -672,18 +672,18 @@
}
if (self->items) {
-self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
SPIF_SIZEOF_TYPE(obj) * (self->len + 1));
+self->items = SPIF_CAST_C(spif_obj_t *) REALLOC(self->items,
sizeof(spif_obj_t) * (self->len + 1));
} else {
-self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(SPIF_SIZEOF_TYPE(obj) *
(self->len + 1));
+self->items = SPIF_CAST_C(spif_obj_t *) MALLOC(sizeof(spif_obj_t) *
(self->len + 1));
}
if (left > 0) {
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include/libast
Modified Files:
Makefile.am ustr.h
Log Message:
Thu Apr 20 16:44:39 2006Michael Jennings (mej)
Added mbuff and ustr to testing routines.
Fleshed out ustr class; doesn't do UTF-8 yet though.
Fixed array removal code. I have no idea how that was working before.
--
===
RCS file: /cvs/e/eterm/libast/include/libast/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Makefile.am 7 Mar 2005 22:29:07 - 1.19
+++ Makefile.am 20 Apr 2006 21:44:40 - 1.20
@@ -2,7 +2,7 @@
EXTRA_HEADERS = array.h avl_tree.h dlinked_list.h iterator_if.h
\
linked_list.h list_if.h map_if.h mbuff.h obj.h objpair.h regexp.h \
-socket.h str.h sysdefs.h tok.h types.h url.h vector_if.h
+socket.h str.h sysdefs.h tok.h types.h url.h ustr.h vector_if.h
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(includedir)/$(PACKAGE)
===
RCS file: /cvs/e/eterm/libast/include/libast/ustr.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ustr.h 7 Jun 2005 20:32:37 - 1.1
+++ ustr.h 20 Apr 2006 21:44:40 - 1.2
@@ -70,40 +70,43 @@
#define SPIF_USTR_RINDEX(o, x) SPIF_CAST(stridx)
(SPIF_OBJ_CALL_METHOD((o), rindex)(o, x))
#define SPIF_USTR_SPLICE(o, n1, n2, x) SPIF_CAST(bool)
(SPIF_OBJ_CALL_METHOD((o), splice)(o, n1, n2, x))
#define SPIF_USTR_SPLICE_FROM_PTR(o, n1, n2, x) SPIF_CAST(bool)
(SPIF_OBJ_CALL_METHOD((o), splice_from_ptr)(o, n1, n2, x))
-#define SPIF_USTR_SUBUSTR(o, n1, n2) SPIF_CAST(ustr)
(SPIF_OBJ_CALL_METHOD((o), subustr)(o, n1, n2))
-#define SPIF_USTR_SUBUSTR_TO_PTR(o, n1, n2) SPIF_CAST(charptr)
(SPIF_OBJ_CALL_METHOD((o), subustr_to_ptr)(o, n1, n2))
+#define SPIF_USTR_SUBSTR(o, n1, n2) SPIF_CAST(ustr)
(SPIF_OBJ_CALL_METHOD((o), substr)(o, n1, n2))
+#define SPIF_USTR_SUBSTR_TO_PTR(o, n1, n2) SPIF_CAST(charptr)
(SPIF_OBJ_CALL_METHOD((o), substr_to_ptr)(o, n1, n2))
#define SPIF_USTR_TO_FLOAT(o)SPIF_CAST_C(double)
(SPIF_OBJ_CALL_METHOD((o), to_float)(o))
#define SPIF_USTR_TO_NUM(o, x) SPIF_CAST_C(size_t)
(SPIF_OBJ_CALL_METHOD((o), to_num)(o, x))
#define SPIF_USTR_TRIM(o)SPIF_CAST(bool)
(SPIF_OBJ_CALL_METHOD((o), trim)(o))
#define SPIF_USTR_UPCASE(o) SPIF_CAST(bool)
(SPIF_OBJ_CALL_METHOD((o), upcase)(o))
-#define SPIF_USTR_USTR(obj) (SPIF_CONST_CAST(charptr)
((SPIF_USTR_ISNULL(obj)) \
- ? (SPIF_CAST(charptr)
"") \
- : (SPIF_USTR(obj)->s)))
+#define SPIF_USTR_STR(obj) (SPIF_CONST_CAST(charptr) ((SPIF_USTR_ISNULL(obj))
\
+ ? (SPIF_CAST(charptr)
"") \
+ : (SPIF_USTR(obj)->s)))
+
+typedef spif_int64_t spif_ustridx_t;
SPIF_DECL_OBJ(ustr) {
SPIF_DECL_PARENT_TYPE(obj);
spif_charptr_t s;
-SPIF_DECL_PROPERTY_C(spif_stridx_t, size);
-SPIF_DECL_PROPERTY_C(spif_stridx_t, len);
+SPIF_DECL_PROPERTY_C(spif_ustridx_t, size);
+SPIF_DECL_PROPERTY_C(spif_ustridx_t, len);
};
extern spif_class_t SPIF_CLASS_VAR(ustr);
+extern spif_strclass_t SPIF_STRCLASS_VAR(ustr);
extern spif_ustr_t spif_ustr_new(void);
extern spif_ustr_t spif_ustr_new_from_ptr(spif_charptr_t);
-extern spif_ustr_t spif_ustr_new_from_buff(spif_charptr_t, spif_stridx_t);
+extern spif_ustr_t spif_ustr_new_from_buff(spif_charptr_t, spif_ustridx_t);
extern spif_ustr_t spif_ustr_new_from_fp(FILE *);
extern spif_ustr_t spif_ustr_new_from_fd(int);
extern spif_ustr_t spif_ustr_new_from_num(long);
extern spif_bool_t spif_ustr_del(spif_ustr_t);
extern spif_bool_t spif_ustr_init(spif_ustr_t);
extern spif_bool_t spif_ustr_init_from_ptr(spif_ustr_t, spif_charptr_t);
-extern spif_bool_t spif_ustr_init_from_buff(spif_ustr_t, spif_charptr_t,
spif_stridx_t);
+extern spif_bool_t spif_ustr_init_from_buff(spif_ustr_t, spif_charptr_t,
spif_ustridx_t);
extern spif_bool_t spif_ustr_init_from_fp(spif_ustr_t, FILE *);
extern spif_bool_t spif_ustr_init_from_fd(spif_ustr_t, int);
extern spif_bool_t spif_ustr_init_from_num(spif_ustr_t, long);
extern spif_bool_t spif_ustr_done(spif_ustr_t);
-extern spif_ustr_t spif_ustr_show(spif_ustr_t, spif_charptr_t, spif_ustr_t,
size_t);
+extern spif_str_t spif_ustr_show(spif_ustr_t, spif_charptr_t, spif_str_t,
size_t);
extern spif_cmp_t spif_ustr_comp(spif_ustr_t, spif_ustr_t);
extern spif_ustr_t spif_ustr_dup(spif_ustr_t);
extern spif_classname_t spif_ustr_type(spif_ustr_t
E CVS: libast mej
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast/include Modified Files: libast.h Log Message: Thu Apr 20 16:44:39 2006Michael Jennings (mej) Added mbuff and ustr to testing routines. Fleshed out ustr class; doesn't do UTF-8 yet though. Fixed array removal code. I have no idea how that was working before. -- === RCS file: /cvs/e/eterm/libast/include/libast.h,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- libast.h24 Feb 2006 21:46:11 - 1.63 +++ libast.h20 Apr 2006 21:44:40 - 1.64 @@ -30,8 +30,8 @@ * including all required system headers and LibAST Object headers. * * @author Michael Jennings <[EMAIL PROTECTED]> - * @version $Revision: 1.63 $ - * @date $Date: 2006/02/24 21:46:11 $ + * @version $Revision: 1.64 $ + * @date $Date: 2006/04/20 21:44:40 $ */ #ifndef _LIBAST_H_ @@ -117,6 +117,7 @@ #include #include #include +#include #include #include --- 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast Modified Files: ChangeLog Log Message: Thu Apr 20 16:44:39 2006Michael Jennings (mej) Added mbuff and ustr to testing routines. Fleshed out ustr class; doesn't do UTF-8 yet though. Fixed array removal code. I have no idea how that was working before. -- === RCS file: /cvs/e/eterm/libast/ChangeLog,v retrieving revision 1.143 retrieving revision 1.144 diff -u -3 -r1.143 -r1.144 --- ChangeLog 24 Feb 2006 21:46:11 - 1.143 +++ ChangeLog 20 Apr 2006 21:44:40 - 1.144 @@ -773,3 +773,11 @@ Make removal of options from argv[] optional and off by default. Fixes Eterm problem with WM_COMMAND entries being empty. -- +Thu Apr 20 16:44:39 2006Michael Jennings (mej) + +Added mbuff and ustr to testing routines. + +Fleshed out ustr class; doesn't do UTF-8 yet though. + +Fixed array removal code. I have no idea how that was working before. +-- --- 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/test
Modified Files:
test.c
Log Message:
Thu Apr 20 16:44:39 2006Michael Jennings (mej)
Added mbuff and ustr to testing routines.
Fleshed out ustr class; doesn't do UTF-8 yet though.
Fixed array removal code. I have no idea how that was working before.
--
===
RCS file: /cvs/e/eterm/libast/test/test.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- test.c 24 Feb 2006 21:46:12 - 1.48
+++ test.c 20 Apr 2006 21:44:40 - 1.49
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: test.c,v 1.48 2006/02/24 21:46:12 mej
Exp $";
+static const char cvs_ident[] = "$Id: test.c,v 1.49 2006/04/20 21:44:40 mej
Exp $";
#if defined(HAVE_CONFIG_H) && (HAVE_CONFIG_H != 0)
# include
@@ -41,6 +41,8 @@
int test_obj(void);
int test_str(void);
int test_tok(void);
+int test_mbuff(void);
+int test_ustr(void);
int test_url(void);
int test_list(void);
int test_vector(void);
@@ -1002,6 +1004,475 @@
}
int
+test_mbuff(void)
+{
+spif_mbuff_t testmbuff, test2mbuff;
+spif_mbuffclass_t cls;
+char tmp[] = "this is a test";
+spif_char_t buff[4096] = "abcde";
+char tmp2[] = "string #1\nstring #2";
+FILE *fp;
+int fd, mypipe[2];
+spif_charptr_t foo;
+
+TEST_BEGIN("spif_mbuff_new() function");
+testmbuff = spif_mbuff_new();
+TEST_FAIL_IF(SPIF_MBUFF_ISNULL(testmbuff));
+TEST_PASS();
+
+TEST_BEGIN("spif_obj_get_classname() function");
+cls = SPIF_MBUFF_CLASS(spif_obj_get_class(SPIF_OBJ(testmbuff)));
+TEST_FAIL_IF(cls != SPIF_MBUFF_CLASS(SPIF_MBUFFCLASS_VAR(mbuff)));
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_del() function");
+TEST_FAIL_IF(spif_mbuff_del(testmbuff) != TRUE);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_new_from_ptr() function");
+testmbuff = spif_mbuff_new_from_ptr(SPIF_CHARPTR(tmp), sizeof(tmp));
+TEST_FAIL_IF(spif_mbuff_cmp_with_ptr(testmbuff, SPIF_CHARPTR(tmp),
sizeof(tmp)));
+TEST_FAIL_IF(spif_mbuff_get_size(testmbuff) != sizeof(tmp));
+TEST_FAIL_IF(spif_mbuff_get_len(testmbuff) != (sizeof(tmp)));
+spif_mbuff_del(testmbuff);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_new_from_buff() function");
+testmbuff = spif_mbuff_new_from_buff(buff, sizeof(buff), 10240);
+TEST_FAIL_IF(spif_mbuff_cmp_with_ptr(testmbuff, buff, sizeof(buff)));
+TEST_FAIL_IF(spif_mbuff_get_size(testmbuff) != 10240);
+TEST_FAIL_IF(spif_mbuff_get_len(testmbuff) != sizeof(buff));
+spif_mbuff_del(testmbuff);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_new_from_fp() function");
+pipe(mypipe);
+fd = mypipe[0];
+fp = fdopen(fd, "r");
+write(mypipe[1], tmp2, sizeof(tmp2));
+close(mypipe[1]);
+TEST_FAIL_IF(fp == NULL);
+testmbuff = spif_mbuff_new_from_fp(fp);
+TEST_FAIL_IF(spif_mbuff_cmp_with_ptr(testmbuff, tmp2, sizeof(tmp2)));
+TEST_FAIL_IF(spif_mbuff_get_len(testmbuff) != sizeof(tmp2));
+TEST_FAIL_IF(spif_mbuff_get_size(testmbuff) != sizeof(tmp2));
+spif_mbuff_del(testmbuff);
+fclose(fp);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_new_from_fd() function");
+pipe(mypipe);
+fd = mypipe[0];
+write(mypipe[1], tmp2, sizeof(tmp2));
+close(mypipe[1]);
+testmbuff = spif_mbuff_new_from_fd(fd);
+TEST_FAIL_IF(memcmp(SPIF_MBUFF_BUFF(testmbuff), tmp2, sizeof(tmp2)));
+TEST_FAIL_IF(spif_mbuff_get_len(testmbuff) != sizeof(tmp2));
+TEST_FAIL_IF(spif_mbuff_get_size(testmbuff) != sizeof(tmp2));
+spif_mbuff_del(testmbuff);
+close(fd);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_dup() function");
+testmbuff = spif_mbuff_new_from_ptr(SPIF_CHARPTR(tmp), sizeof(tmp));
+TEST_FAIL_IF(memcmp(SPIF_MBUFF_BUFF(testmbuff), tmp, sizeof(tmp)));
+TEST_FAIL_IF(spif_mbuff_get_size(testmbuff) != sizeof(tmp));
+TEST_FAIL_IF(spif_mbuff_get_len(testmbuff) != sizeof(tmp));
+test2mbuff = spif_mbuff_dup(testmbuff);
+TEST_FAIL_IF(test2mbuff == testmbuff);
+TEST_FAIL_IF(SPIF_MBUFF_BUFF(test2mbuff) == SPIF_MBUFF_BUFF(testmbuff));
+TEST_FAIL_IF(spif_mbuff_cmp(testmbuff, test2mbuff));
+TEST_FAIL_IF(memcmp(SPIF_CHARPTR_C(SPIF_MBUFF_BUFF(test2mbuff)), tmp,
strlen(tmp)));
+TEST_FAIL_IF(spif_mbuff_get_size(test2mbuff) != sizeof(tmp));
+TEST_FAIL_IF(spif_mbuff_get_len(test2mbuff) != sizeof(tmp));
+spif_mbuff_del(testmbuff);
+spif_mbuff_del(test2mbuff);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_index() function");
+testmbuff = spif_mbuff_new_from_ptr(SPIF_CHARPTR(tmp2), strlen(tmp2));
+TEST_FAIL_IF(spif_mbuff_index(testmbuff, '#') != 7);
+TEST_PASS();
+
+TEST_BEGIN("spif_mbuff_rindex() function");
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_combo.c ewl_filepicker.c
Log Message:
- fix segv.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_combo.c 20 Apr 2006 14:24:15 - 1.23
+++ ewl_combo.c 20 Apr 2006 19:57:06 - 1.24
@@ -99,7 +99,6 @@
/* we don't bail out early as the user could have prepended widgets
* to their data, so the selected_idx will be the same but the
* widget is actually different */
-
combo->selected_idx = idx;
/* remove the previously selected value */
@@ -118,9 +117,9 @@
combo->view->assign(combo->selected,
combo->model->fetch(combo->data, idx, 0));
}
- else if ((idx < 0) && combo->view && combo->view->header_fetch)
+ else if (combo->view && combo->view->header_fetch)
combo->selected = combo->view->header_fetch(combo->data,
- combo->selected_idx);
+ combo->selected_idx);
if (combo->selected)
{
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filepicker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_filepicker.c20 Apr 2006 02:58:01 - 1.8
+++ ewl_filepicker.c20 Apr 2006 19:57:06 - 1.9
@@ -144,11 +144,11 @@
ewl_combo_model_set(EWL_COMBO(fp->type_combo), model);
ewl_combo_view_set(EWL_COMBO(fp->type_combo), view);
ewl_combo_data_set(EWL_COMBO(fp->type_combo), fp);
+ ewl_combo_selected_set(EWL_COMBO(fp->type_combo), 0);
ewl_combo_editable_set(EWL_COMBO(fp->type_combo), TRUE);
ewl_callback_append(fp->type_combo, EWL_CALLBACK_VALUE_CHANGED,
ewl_filepicker_cb_type_change, fp);
ewl_container_child_append(EWL_CONTAINER(box), fp->type_combo);
- ewl_combo_selected_set(EWL_COMBO(fp->type_combo), 0);
ewl_widget_show(fp->type_combo);
box = ewl_vbox_new();
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_gstreamer.c emotion_gstreamer.h
Log Message:
LOTS of checks added. Fix the seek a bit (gstreamer plugins have problems with
seek, btw). It's now possible to mute the video, but it's not the correct fix.
Metadata can be grabbed. Beginning of the code for the eos (the way it is done
is too close to glib to be done easily)
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emotion_gstreamer.c 11 Apr 2006 23:31:03 - 1.8
+++ emotion_gstreamer.c 20 Apr 2006 18:23:48 - 1.9
@@ -6,30 +6,29 @@
#include "emotion_gstreamer.h"
-#define EMOTION_PIPELINE_PAUSE(pipeline) \
-{ \
- GstStateChangeReturn res; \
- \
- res = gst_element_set_state ((pipeline), GST_STATE_PAUSED); \
- if (res == GST_STATE_CHANGE_FAILURE) { \
- g_print ("Emotion-Gstreamer ERROR: could not pause\n"); \
- gst_object_unref (GST_OBJECT ((pipeline))); \
- return 0; \
- } \
- res = gst_element_get_state ((pipeline), NULL, NULL, GST_CLOCK_TIME_NONE); \
- if (res != GST_STATE_CHANGE_SUCCESS) { \
- g_print ("Emotion-Gstreamer ERROR: could not complete pause\n"); \
- gst_object_unref (GST_OBJECT ((pipeline))); \
- return 0; \
- } \
-}
+static gboolean
+_emotion_pipeline_pause (GstElement *pipeline)
+{
+ GstStateChangeReturn res;
+
+ res = gst_element_set_state ((pipeline), GST_STATE_PAUSED);
+ if (res == GST_STATE_CHANGE_FAILURE) {
+ g_print ("Emotion-Gstreamer ERROR: could not pause\n");
+ gst_object_unref (GST_OBJECT ((pipeline)));
+ return 0;
+ }
+
+ res = gst_element_get_state ((pipeline), NULL, NULL, GST_CLOCK_TIME_NONE);
+ if (res != GST_STATE_CHANGE_SUCCESS) {
+ g_print ("Emotion-Gstreamer ERROR: could not complete pause\n");
+ gst_object_unref (GST_OBJECT ((pipeline)));
+ return 0;
+ }
+ return 1;
+}
-/* Callbacks to handle errors and EOS */
-static void cb_end_of_stream (GstElement *thread,
- gpointerdata);
-static gboolean cb_idle_eos (gpointer data);
/* Callbacks to display the frame content */
@@ -279,6 +278,7 @@
void**emotion_video)
{
Emotion_Gstreamer_Video *ev;
+ GError *error;
int fds[2];
if (!emotion_video)
@@ -288,16 +288,30 @@
ev = calloc(1, sizeof(Emotion_Gstreamer_Video));
if (!ev) return 0;
+
ev->obj = obj;
ev->obj_data = NULL;
/* Initialization of gstreamer */
- gst_init (NULL, NULL);
+ if (!gst_init_check (NULL, NULL, &error))
+ goto failure_gstreamer;
+
+ ev->pipeline = gst_pipeline_new ("pipeline");
+ if (!ev->pipeline)
+ goto failure_pipeline;
+
+ ev->bus = gst_pipeline_get_bus (GST_PIPELINE (ev->pipeline));
+ if (!ev->bus)
+ goto failure_bus;
/* We allocate the sinks lists */
ev->video_sinks = ecore_list_new ();
+ if (!ev->video_sinks)
+ goto failure_video_sinks;
ecore_list_set_free_cb(ev->video_sinks, ECORE_FREE_CB(free));
ev->audio_sinks = ecore_list_new ();
+ if (!ev->audio_sinks)
+ goto failure_audio_sinks;
ecore_list_set_free_cb(ev->audio_sinks, ECORE_FREE_CB(free));
*emotion_video = ev;
@@ -320,8 +334,27 @@
NULL, NULL);
ecore_main_fd_handler_active_set(ev->fd_ev_handler, ECORE_FD_READ);
}
+ else
+ goto failure_pipe;
return 1;
+
+ failure_pipe:
+ ecore_list_destroy (ev->audio_sinks);
+ failure_audio_sinks:
+ ecore_list_destroy (ev->video_sinks);
+ failure_video_sinks:
+ gst_object_unref (GST_OBJECT (ev->bus));
+ failure_bus:
+ /* this call is not really necessary */
+ gst_element_set_state (ev->pipeline, GST_STATE_NULL);
+ gst_object_unref (GST_OBJECT (ev->pipeline));
+ failure_pipeline:
+ gst_deinit ();
+ failure_gstreamer:
+ free (ev);
+
+ return 0;
}
static int
@@ -330,9 +363,13 @@
Emotion_Gstreamer_Video *ev;
ev = (Emotion_Gstreamer_Video *)video;
+ if (!ev)
+ return 0;
gst_element_set_state (ev->pipeline, GST_STATE_NULL);
gst_object_unref (GST_OBJECT (ev->pipeline));
+ gst_object_unref (GST_OBJECT (ev->bus));
+ gst_deinit ();
ecore_list_destroy (ev->video_sinks);
ecore_list_destroy (ev->audio_sinks);
@@ -380,7 +417,10 @@
sscanf (file,"cdda://%d", &track);
}
printf ("build cdda pipeline\n");
- _cdda_pipeline_build (ev, device, track);
+ if (!(_cdda_pipeline_build (ev, device, track))) {
+printf ("error building CA Audio pipeline\n");
+return 0;
+ }
}
/* Normal media file */
else {
@@ -431,6 +471,8 @@
em_file_close(void *video)
{
Emotion_Gstreamer_Video *ev;
+ GstIterator *iter;
+ gpo
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c
Log Message:
Fix _XROOT... hint (pseudotrans) compatibility hack.
===
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -3 -r1.238 -r1.239
--- desktops.c 18 Apr 2006 17:57:58 - 1.238
+++ desktops.c 20 Apr 2006 17:09:56 - 1.239
@@ -566,8 +566,6 @@
}
HintsSetRootInfo(EoGetWin(dsk), pmap, pixel);
- if (Conf.hints.set_xroot_info_on_root_window && win != VRoot.win)
- HintsSetRootInfo(VRoot.win, pmap, pixel);
}
else if (dsk->bg.bg)
{
@@ -659,6 +657,10 @@
DeskBackgroundConfigure(dsk);
dsk->bg.pmap_set = pmap;
}
+
+ if (bg && dsk->viewable)
+ if (Conf.hints.set_xroot_info_on_root_window && dsk->num > 0)
+HintsSetRootInfo(VRoot.win, pmap, pixel);
if (changed)
ModulesSignal(ESIGNAL_BACKGROUND_CHANGE, dsk);
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: icccm.c Log Message: Revert bad change. ICCCM size matching should never increase size. === RCS file: /cvs/e/e16/e/src/icccm.c,v retrieving revision 1.122 retrieving revision 1.123 diff -u -3 -r1.122 -r1.123 --- icccm.c 19 Apr 2006 19:13:46 - 1.122 +++ icccm.c 20 Apr 2006 17:03:27 - 1.123 @@ -201,8 +201,8 @@ if (aspect > ewin->icccm.aspect_max) h = (int)((double)w / ewin->icccm.aspect_max); } -i = (w + ewin->icccm.w_inc / 2) / ewin->icccm.w_inc; -j = (h + ewin->icccm.h_inc / 2) / ewin->icccm.h_inc; +i = w / ewin->icccm.w_inc; +j = h / ewin->icccm.h_inc; w = i * ewin->icccm.w_inc; h = j * ewin->icccm.h_inc; } --- 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=lnk&kid=120709&bid=263057&dat=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_gadcon.c
Log Message:
hmm- try avoid a segv
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_gadcon.c 20 Apr 2006 11:30:24 - 1.18
+++ e_gadcon.c 20 Apr 2006 14:59:53 - 1.19
@@ -953,6 +953,7 @@
{
if (gcc->menu)
{
+e_menu_post_deactivate_callback_set(gcc->menu, NULL, NULL);
e_object_del(E_OBJECT(gcc->menu));
gcc->menu = 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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion shadoi
Enlightenment CVS committal
Author : shadoi
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/debian
Modified Files:
control
Added Files:
emotion0-bin.install libemotion0-dev.install
libemotion0-gstreamer.install libemotion0-xine.install
libemotion0.install
Removed Files:
emotion0-bin.files libemotion0-dev.files libemotion0.files
Log Message:
Better do this before raster beats me to it.
- fixup package to meet standards version 3.6.2.2
- Add -gstreamer and -xine module packages
- Make gstreamer package actually work
- update dependencies
===
RCS file: /cvs/e/e17/libs/emotion/debian/control,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- control 14 Apr 2006 00:24:36 - 1.7
+++ control 20 Apr 2006 14:41:13 - 1.8
@@ -1,8 +1,8 @@
Source: emotion
Priority: optional
Maintainer: Sytse Wielinga <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev,
libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.7 | automaken,
libtool, libgstreamer0.8-dev
-Standards-Version: 3.6.1.0
+Build-Depends: debhelper (>= 4.0.0), libeet-dev, libevas-dev, libedje-dev,
libecore-dev, libembryo-dev, libxine-dev (>=1.1.0), automake1.9 | automaken,
libtool, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev,
gstreamer0.10-ffmpeg, gstreamer0.10-plugins-good, gstreamer0.10-tools
+Standards-Version: 3.6.2.2
Package: libemotion0
Section: libs
@@ -21,6 +21,28 @@
Description: Headers, static libraries and documentation for Emotion
This package contains development files for the Emotion library, a wrapper
library used in the next-generation Enlightenment suite for video playback.
+
+Package: libemotion0-xine
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libemotion0, libxine1 (>=1.1.0)
+Provides: libemotion-xine
+Description: Video playback library used in Enlightenment DR0.17
+ This is the emotion library, a wrapper library used in the next-generation
+ Enlightenment suite for video playback.
+ .
+ This package provides the xine module for emotion.
+
+Package: libemotion0-gstreamer
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libemotion0, gstreamer0.10-plugins-good,
gstreamer0.10-ffmpeg
+Provides: libemotion-gstreamer
+Description: Video playback library used in Enlightenment DR0.17
+ This is the emotion library, a wrapper library used in the next-generation
+ Enlightenment suite for video playback.
+ .
+ This package provides the gstreamer module for emotion.
Package: emotion0-bin
Section: x11
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_combo.c Log Message: - make the header work again === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_combo.c 10 Apr 2006 03:28:23 - 1.22 +++ ewl_combo.c 20 Apr 2006 14:24:15 - 1.23 @@ -118,7 +118,7 @@ combo->view->assign(combo->selected, combo->model->fetch(combo->data, idx, 0)); } - else if ((idx > -1) && combo->view && combo->view->header_fetch) + else if ((idx < 0) && combo->view && combo->view->header_fetch) combo->selected = combo->view->header_fetch(combo->data, combo->selected_idx); --- 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_model.c ewl_model.h
Log Message:
- model subfetch needs to have it's own callback function so we can pass in
the parent row as well as the row and column
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_model.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_model.c 20 Apr 2006 02:13:43 - 1.7
+++ ewl_model.c 20 Apr 2006 13:59:18 - 1.8
@@ -93,12 +93,12 @@
/**
* @param m: The Ewl_Model to set the subfetch callback into
- * @param get: The Ewl_Model_Fetch callback for subrows
+ * @param get: The Ewl_Model_Subfetch callback for subrows
* @return Returns no value.
* @brief Sets the subfetch callback into the model
*/
void
-ewl_model_subfetch_set(Ewl_Model *m, Ewl_Model_Fetch get)
+ewl_model_subfetch_set(Ewl_Model *m, Ewl_Model_Subfetch get)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("m", m);
@@ -110,10 +110,10 @@
/**
* @param m: The Ewl_Model to get the subfetch callback from
- * @return Returns the Ewl_Model_Fetch for the subfetch callback
+ * @return Returns the Ewl_Model_Subfetch for the subfetch callback
* @brief Gets the subfetch callback from the model
*/
-Ewl_Model_Fetch
+Ewl_Model_Subfetch
ewl_model_subfetch_get(Ewl_Model *m)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_model.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_model.h 20 Apr 2006 02:13:43 - 1.8
+++ ewl_model.h 20 Apr 2006 13:59:18 - 1.9
@@ -19,6 +19,15 @@
unsigned int column);
/**
+ * @def EWL_MODEL_DATA_SUBFETCH(f)
+ * Model callback to handle fetching the data for a given parent at a
+ * given row/column
+ */
+#define EWL_MODEL_DATA_SUBFETCH(f) ((Ewl_Model_Subfetch)f)
+typedef void *(*Ewl_Model_Subfetch)(void *data, unsigned int parent,
+ unsigned int row, unsigned int column);
+
+/**
* @def EWL_MODEL_DATA_SORT(f)
* Model callback to inform the program to sort it's data in the given
* column
@@ -46,7 +55,7 @@
struct Ewl_Model
{
Ewl_Model_Fetch fetch;/**< Retrieve data for a cell */
- Ewl_Model_Fetch subfetch; /**< Check for subdata */
+ Ewl_Model_Subfetch subfetch; /**< Check for subdata */
Ewl_Model_Sort sort; /**< Trigger sort on column */
Ewl_Model_Count count;/**< Count of data items */
};
@@ -59,8 +68,9 @@
void ewl_model_fetch_set(Ewl_Model *m, Ewl_Model_Fetch get);
Ewl_Model_Fetch ewl_model_fetch_get(Ewl_Model *m);
-void ewl_model_subfetch_set(Ewl_Model *m, Ewl_Model_Fetch get);
-Ewl_Model_Fetch ewl_model_subfetch_get(Ewl_Model *m);
+void ewl_model_subfetch_set(Ewl_Model *m,
+ Ewl_Model_Subfetch get);
+Ewl_Model_Subfetch ewl_model_subfetch_get(Ewl_Model *m);
void ewl_model_sort_set(Ewl_Model *m, Ewl_Model_Sort sort);
Ewl_Model_Sort ewl_model_sort_get(Ewl_Model *m);
@@ -68,12 +78,16 @@
void ewl_model_count_set(Ewl_Model *m, Ewl_Model_Count count);
Ewl_Model_Count ewl_model_count_get(Ewl_Model *m);
-/**
- * @}
+/*
+ * Internal stuff.
*/
void *ewl_model_cb_ecore_list_fetch(void *data, unsigned int row,
unsigned int col);
int ewl_model_cb_ecore_list_count(void *data);
+
+/**
+ * @}
+ */
#endif
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
e_mod_main.c
Log Message:
fix battery + freebsd
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_mod_main.c20 Apr 2006 11:48:42 - 1.72
+++ e_mod_main.c20 Apr 2006 11:52:40 - 1.73
@@ -204,7 +204,7 @@
battery_config->battery_check_mode = CHECK_APM;
}
}
- switch (ef->battery_check_mode)
+ switch (battery_config->battery_check_mode)
{
case CHECK_ACPI:
ret = _battery_bsd_acpi_check();
---
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=lnk&kid=120709&bid=263057&dat=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/battery
Modified Files:
e_mod_main.c
Log Message:
ef -> battery_config
bsd mis-port fix
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_mod_main.c20 Apr 2006 11:30:24 - 1.71
+++ e_mod_main.c20 Apr 2006 11:48:42 - 1.72
@@ -195,13 +195,13 @@
{
len = 3;
if (sysctlnametomib("hw.acpi.acline", acline_mib, &len) == 0)
- ef->battery_check_mode = CHECK_ACPI;
+ battery_config->battery_check_mode = CHECK_ACPI;
}
else
{
apm_fd = open("/dev/apm", O_RDONLY);
if (apm_fd != -1)
- ef->battery_check_mode = CHECK_APM;
+ battery_config->battery_check_mode = CHECK_APM;
}
}
switch (ef->battery_check_mode)
---
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=lnk&kid=120709&bid=263057&dat=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/dropshadow
Modified Files:
e_mod_main.c
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/dropshadow/e_mod_main.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_mod_main.c7 Jan 2006 10:39:46 - 1.40
+++ e_mod_main.c20 Apr 2006 11:30:24 - 1.41
@@ -694,7 +694,7 @@
_ds_shadow_resize(Shadow *sh, int w, int h)
{
unsigned char toosmall = 0;
-
+
_ds_shadow_obj_init(sh);
if ((w < ((sh->ds->conf->blur_size * 2) + 2)) ||
(h < ((sh->ds->conf->blur_size * 2) + 2)))
---
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=lnk&kid=120709&bid=263057&dat=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/themes
Modified Files:
default_battery.edc default_clock.edc default_ibar.edc
default_pager.edc
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_battery.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- default_battery.edc 19 Mar 2006 12:24:19 - 1.5
+++ default_battery.edc 20 Apr 2006 11:30:23 - 1.6
@@ -115,6 +115,31 @@
}
}
part {
+name: "ac";
+clip_to: "fade_clip";
+description {
+ state: "default" 0.0;
+ aspect: 0.975609756 0.975609756;
+ align: 1.0 1.0;
+ max: 40 41;
+ visible: 0;
+ rel1 {
+ relative: 0.5 0.5;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ image {
+ normal: "e17_battery_ac.png";
+ }
+}
+description {
+ state: "active" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+}
+ }
+ part {
name: "reading";
type: TEXT;
effect: SOFT_SHADOW;
@@ -168,31 +193,6 @@
align:1.0 0.0;
text_class: "battery";
}
-}
- }
- part {
-name: "ac";
-clip_to: "fade_clip";
-description {
- state: "default" 0.0;
- aspect: 0.975609756 0.975609756;
- align: 1.0 1.0;
- max: 40 41;
- visible: 0;
- rel1 {
- relative: 0.5 0.5;
- }
- rel2 {
- relative: 1.0 1.0;
- }
- image {
- normal: "e17_battery_ac.png";
- }
-}
-description {
- state: "active" 0.0;
- inherit: "default" 0.0;
- visible: 1;
}
}
part {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_clock.edc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- default_clock.edc 19 Mar 2006 12:24:19 - 1.10
+++ default_clock.edc 20 Apr 2006 11:30:23 - 1.11
@@ -1,8 +1,6 @@
images {
image: "e17_clock_bg.png" COMP;
image: "e17_clock_fg.png" COMP;
- image: "e17_ibar_over_h.png" COMP;
- image: "e17_ibar_bg_h.png" COMP;
image: "e17_clock_seconds_00.png" COMP;
image: "e17_clock_seconds_01.png" COMP;
image: "e17_clock_seconds_02.png" COMP;
@@ -189,24 +187,10 @@
script {
public clock_cb(val) {
new buf[11];
-new digitalVal[15];
-new hourStr[4], minuteStr[4], secondStr[4];
new year, month, day, yearday, weekday, hour, minute;
new Float:second;
new v;
-new isAfternoon;
-new digiBuf[2];
-new digitalStyle;
-new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
-
-DIGITAL_STYLE_NONE = 0;
-DIGITAL_STYLE_NORMAL = 1;
-DIGITAL_STYLE_24HOUR = 2;
-
-get_text(PART:"digitalStyle", digiBuf, 2);
-
-digitalStyle = atoi(digiBuf);
-
+
date(year, month, day, yearday, weekday, hour, minute, second);
v = round(second);
#if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE !=
MEDIUMRES_PDA
@@ -216,7 +200,6 @@
#endif
#if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE !=
MEDIUMRES_PDA
buf[0] = 0;
-digitalVal[0] = 0;
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else{snprintf(buf, 10, "%i", v);}
set_state(PART:"seconds", buf, 0.0);
@@ -232,59 +215,6 @@
if (v < 10) {snprintf(buf, 10, "0%i", v);}
else{snprintf(buf, 10, "%i", v);}
set_state(PART:"hour", buf, 0.0);
-
-
-buf[0] = 0;
-v = round(second);
-if (v < 10) {snprintf(buf, 10, "0%i", v);}
-else{snprintf(buf, 10, "%i", v);}
-snprintf(secondStr, 3, "%s", buf);
-
-buf[0] = 0;
-if (minute < 10) {snprintf(buf, 10, "0%i", minute);}
-else {snprintf(buf, 10, "%i", minute);}
-snprintf(minuteStr, 3, "%s", buf);
-
-buf[0] = 0;
-isAfternoon = 0;
-v = hour;
-if (hour >= 12 && hour < 24) { isAfternoon = 1; }
-if (digitalStyle == DIGITAL_STYLE_NORMAL) {
- v = (v % 12);
- if (v == 0) { v = 12; }
-}
-if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) {
-
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/clock
Modified Files:
Makefile.am e_mod_main.c e_mod_main.h
Removed Files:
e_mod_config.c e_mod_config.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/clock/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 18 Feb 2006 04:35:27 - 1.6
+++ Makefile.am 20 Apr 2006 11:30:24 - 1.7
@@ -19,9 +19,7 @@
pkgdir =
$(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
pkg_LTLIBRARIES= module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
-e_mod_config.c \
-e_mod_config.h
+ e_mod_main.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
===
RCS file: /cvs/e/e17/apps/e/src/modules/clock/e_mod_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_mod_main.c12 Mar 2006 16:12:57 - 1.54
+++ e_mod_main.c20 Apr 2006 11:30:24 - 1.55
@@ -3,39 +3,93 @@
*/
#include "e.h"
#include "e_mod_main.h"
-#include "e_mod_config.h"
-/* TODO List:
- *
- */
-
-/* module private routines */
-static Clock *_clock_new();
-static void_clock_shutdown(Clock *clock);
-static void_clock_config_menu_new(Clock *clock);
-
-static Clock_Face *_clock_face_new(Clock *clock, E_Container *con);
-static void_clock_face_free(Clock_Face *face);
-/* static void_clock_face_enable(Clock_Face *face); */
-static void_clock_face_disable(Clock_Face *face);
-static void_clock_face_menu_new(Clock_Face *face);
-static void_clock_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
-static void_clock_face_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj, void *event_info);
-static void_clock_face_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void_clock_face_cb_menu_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
-
-static int _clock_count;
-
-static E_Config_DD *conf_edd;
-static E_Config_DD *conf_face_edd;
-
-const int
- DIGITAL_STYLE_NONE = 0,
- DIGITAL_STYLE_12HOUR = 1,
- DIGITAL_STYLE_24HOUR = 2
- ;
+/***/
+/**/
+/* gadcon requirements */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char
*style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc);
+/* and actually define the gadcon class that this module provides (just 1) */
+static const E_Gadcon_Client_Class _gadcon_class =
+{
+ GADCON_CLIENT_CLASS_VERSION,
+ "clock",
+ {
+ _gc_init, _gc_shutdown, _gc_orient
+ }
+};
+/**/
+/***/
+
+/***/
+/**/
+/* actual module specifics */
-/* public module routines. all modules must have these */
+typedef struct _Instance Instance;
+
+struct _Instance
+{
+ E_Gadcon_Client *gcc;
+ Evas_Object *o_clock;
+};
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, char *name, char *id, char *style)
+{
+ Evas_Object *o;
+ E_Gadcon_Client *gcc;
+ Instance *inst;
+
+ inst = E_NEW(Instance, 1);
+
+ o = edje_object_add(gc->evas);
+ e_theme_edje_object_set(o, "base/theme/modules/clock",
+ "modules/clock/main");
+ evas_object_show(o);
+
+ gcc = e_gadcon_client_new(gc, name, id, style, o);
+ gcc->data = inst;
+
+ inst->gcc = gcc;
+ inst->o_clock = o;
+
+ e_gadcon_client_util_menu_attach(gcc);
+
+ return gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+ Instance *inst;
+
+ inst = gcc->data;
+ evas_object_del(inst->o_clock);
+ free(inst);
+}
+
+static void
+_gc_orient(E_Gadcon_Client *gcc)
+{
+ Instance *inst;
+
+ inst = gcc->data;
+ e_gadcon_client_aspect_set(gcc, 16, 16);
+ e_gadcon_client_min_size_set(gcc, 16, 16);
+}
+/**/
+/***/
+
+/***/
+/**/
+
+/**/
+/***/
+
+/***/
+/**/
+/* module setup */
EAPI E_M
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/cpufreq
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/cpufreq/e_mod_main.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_mod_main.c12 Mar 2006 16:12:57 - 1.34
+++ e_mod_main.c20 Apr 2006 11:30:24 - 1.35
@@ -1,296 +1,302 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
-#include
-#include
-#include
+#include "e.h"
#include "e_mod_main.h"
-#include "config.h"
#ifdef __FreeBSD__
#include
#include
#endif
-/* FIXME: check permissions (can execute) setfreq before trying
- * FIXME: display throttling state ???
- * FIXME: handle multiple cpu's (yes it's likely rare - but possible)
- */
-
-static Cpufreq *_cpufreq_new(E_Module *module);
-static void _cpufreq_free(Cpufreq *cpufreq);
-static void _cpufreq_set_governor(Cpufreq *cpufreq, const char *governor);
-static void _cpufreq_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _cpufreq_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _cpufreq_menu_normal(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _cpufreq_menu_slow(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _cpufreq_menu_very_slow(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _cpufreq_menu_restore_governor(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _cpufreq_menu_governor(void *data, E_Menu *m, E_Menu_Item *mi);
-static void _cpufreq_menu_frequency(void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _cpufreq_config_menu_new(Cpufreq *cpufreq);
-static int _cpufreq_cb_check(void *data);
-
-static Status * _cpufreq_status_new();
-static void _cpufreq_status_free(Status *e);
-static int _cpufreq_status_check_available(Status *e);
-static int _cpufreq_status_check_current(Status *e);
-static int _cpufreq_cb_sort(void *item1, void *item2);
-
-static Cpufreq_Face *_cpufreq_face_new(E_Container *con, Cpufreq *owner);
-static void _cpufreq_face_free(Cpufreq_Face *face);
-static void _cpufreq_face_menu_new(Cpufreq_Face *face);
-static void _cpufreq_face_enable(Cpufreq_Face *face);
-static void _cpufreq_face_disable(Cpufreq_Face *face);
-static void _cpufreq_face_cb_gmc_change(void *data, E_Gadman_Client
*gmc, E_Gadman_Change change);
-static void _cpufreq_face_cb_menu_edit(void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _cpufreq_face_cb_mouse_down(void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static void _cpufreq_face_update_available(Cpufreq_Face *face);
-static void _cpufreq_face_update_current(Cpufreq_Face *face);
-static void _cpufreq_face_cb_set_frequency(void *data, Evas_Object
*o, const char *emission, const char *source);
-static void _cpufreq_face_cb_set_governor(void *data, Evas_Object *o,
const char *emission, const char *source);
+/***/
+/**/
+/* gadcon requirements */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, char *name, char *id, char
*style);
+static void _gc_shutdown(E_Gadcon_Client *gcc);
+static void _gc_orient(E_Gadcon_Client *gcc);
+/* and actually define the gadcon class that this module provides (just 1) */
+static const E_Gadcon_Client_Class _gadcon_class =
+{
+ GADCON_CLIENT_CLASS_VERSION,
+ "cpufreq",
+ {
+ _gc_init, _gc_shutdown, _gc_orient
+ }
+};
+/**/
+/***/
-static E_Config_DD *conf_edd;
-static E_Config_DD *conf_face_edd;
+/***/
+/**/
+/* actual module specifics */
-static int cpufreq_count;
+typedef struct _Instance Instance;
-/* public module routines */
-EAPI E_Module_Api e_modapi =
+struct _Instance
{
- E_MODULE_API_VERSION,
- "Cpufreq"
+ E_Gadcon_Client *gcc;
+ Evas_Object *o_cpu;
};
-EAPI void *
-e_modapi_init(E_Module *module)
-{
- Cpufreq *freq;
-
- freq = _cpufreq_new(module);
- module->config_menu = freq->config_menu;
- return freq;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *module)
-{
- Cpufreq *cpufreq;
+static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static void _menu_cb_post(void *data, E_Menu *m);
+static void _cpufreq_set_governor(const char *governor);
+static void _cpufreq_set_frequency(int fre
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/battery
Modified Files:
Makefile.am e_mod_config.c e_mod_main.c e_mod_main.h
Removed Files:
e_mod_config.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 18 Feb 2006 04:35:27 - 1.7
+++ Makefile.am 20 Apr 2006 11:30:24 - 1.8
@@ -21,8 +21,7 @@
pkg_LTLIBRARIES= module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
-e_mod_config.c \
-e_mod_config.h
+e_mod_config.c
module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_config.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_config.c 18 Mar 2006 16:41:55 - 1.16
+++ e_mod_config.c 20 Apr 2006 11:30:24 - 1.17
@@ -1,7 +1,5 @@
#include "e.h"
#include "e_mod_main.h"
-#include "e_mod_config.h"
-#include "config.h"
struct _E_Config_Dialog_Data
{
@@ -19,7 +17,7 @@
static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
void
-_config_battery_module(E_Container *con, Battery *bat)
+_config_battery_module(void)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@@ -33,15 +31,18 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, v, bat);
- bat->config_dialog = cfd;
+ cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
+_("Battery Monitor Configuration"),
+NULL, 0, v, NULL);
+ battery_config->config_dialog = cfd;
}
static void
-_fill_data(Battery *b, E_Config_Dialog_Data *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
{
- cfdata->alarm_time = b->conf->alarm;
- cfdata->poll_time = b->conf->poll_time;
+ if (!battery_config) return;
+ cfdata->alarm_time = battery_config->alarm;
+ cfdata->poll_time = battery_config->poll_time;
if (cfdata->alarm_time > 0)
cfdata->show_alert = 1;
else
@@ -52,21 +53,17 @@
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
- Battery *b;
- b = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(b, cfdata);
+ _fill_data(cfdata);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Battery *b;
-
- b = cfd->data;
- b->config_dialog = NULL;
+ if (!battery_config) return;
+ battery_config->config_dialog = NULL;
free(cfdata);
}
@@ -86,16 +83,13 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Battery *b;
-
- b = cfd->data;
- e_border_button_bindings_ungrab_all();
- b->conf->poll_time = 10.0;
-
- e_border_button_bindings_grab_all();
+ if (!battery_config) return;
+ if (cfdata->show_alert)
+ battery_config->alarm = cfdata->alarm_time;
+ else
+ battery_config->alarm = 0;
+ _battery_config_updated();
e_config_save_queue();
-
- _battery_face_cb_config_updated(b);
return 1;
}
@@ -130,20 +124,14 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Battery *b;
-
- b = cfd->data;
- e_border_button_bindings_ungrab_all();
-
- b->conf->poll_time = cfdata->poll_time;
+ if (!battery_config) return;
+ battery_config->poll_time = cfdata->poll_time;
if (cfdata->show_alert)
- b->conf->alarm = cfdata->alarm_time;
+ battery_config->alarm = cfdata->alarm_time;
else
- b->conf->alarm = 0;
-
- e_border_button_bindings_grab_all();
+ battery_config->alarm = 0;
+ _battery_config_updated();
e_config_save_queue();
-
- _battery_face_cb_config_updated(b);
return 1;
}
+
===
RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_mod_main.c12 Mar 2006 16:12:56 - 1.70
+++ e_mod_main.c20 Apr 2006 11:30:24 - 1.71
@@ -3,7 +3,6 @@
*/
#include "e.h"
#include "e_mod_main.h"
-#inc
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/start
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.c4 Apr 2006 15:42:25 - 1.21
+++ e_mod_main.c20 Apr 2006 11:30:25 - 1.22
@@ -45,7 +45,6 @@
E_Gadcon_Client *gcc;
Instance *inst;
- printf("CREATE START GADCON %s %s\n", name, id);
inst = E_NEW(Instance, 1);
o = edje_object_add(gc->evas);
@@ -59,13 +58,10 @@
inst->o_button = o;
inst->main_menu = NULL;
+ e_gadcon_client_util_menu_attach(gcc);
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_button_cb_mouse_down, inst);
- /* FIXME: add callback to resize - and based off one dimension, request
-* another to be the same */
- e_gadcon_client_size_request(gcc, 32, 32);
- e_gadcon_client_min_size_set(gcc, 16, 16);
- e_gadcon_client_aspect_set(gcc, 1, 1);
return gcc;
}
@@ -75,6 +71,7 @@
Instance *inst;
inst = gcc->data;
+ evas_object_del(inst->o_button);
free(inst);
}
@@ -84,9 +81,8 @@
Instance *inst;
inst = gcc->data;
- printf("OREINT to %i\n", gcc->gadcon->orient);
- e_gadcon_client_aspect_set(gcc, 20, 20);
- e_gadcon_client_min_size_set(gcc, 20, 20);
+ e_gadcon_client_aspect_set(gcc, 16, 16);
+ e_gadcon_client_min_size_set(gcc, 16, 16);
}
/**/
/***/
@@ -105,15 +101,12 @@
{
Evas_Coord x, y, w, h;
int cx, cy, cw, ch;
- E_Zone *zone;
evas_object_geometry_get(inst->o_button, &x, &y, &w, &h);
- e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon, &cx, &cy, &cw,
&ch);
+ e_gadcon_canvas_zone_geometry_get(inst->gcc->gadcon,
+ &cx, &cy, &cw, &ch);
x += cx;
y += cy;
- zone = e_gadcon_zone_get(inst->gcc->gadcon);
- if (!zone)
- zone = e_util_zone_current_get(e_manager_current_get());
if (!inst->main_menu)
inst->main_menu = e_int_menus_main_new();
if (inst->main_menu)
@@ -152,7 +145,8 @@
x, y, w, h,
dir, ev->timestamp);
edje_object_signal_emit(inst->o_button, "active", "");
-evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
EVAS_BUTTON_NONE, ev->timestamp, NULL);
+evas_event_feed_mouse_up(inst->gcc->gadcon->evas, ev->button,
+ EVAS_BUTTON_NONE, ev->timestamp, NULL);
}
}
}
@@ -184,7 +178,7 @@
e_modapi_init(E_Module *m)
{
e_gadcon_provider_register(&_gadcon_class);
- return NULL;
+ return 1;
}
EAPI int
@@ -216,12 +210,6 @@
e_module_dialog_show(_("Enlightenment Start Module"),
_("Experimental Button module for E17"));
return 1;
-}
-
-int
-e_modapi_config(E_Module *m)
-{
- return 0;
}
/**/
/***/
===
RCS file: /cvs/e/e17/apps/e/src/modules/start/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h10 Feb 2006 09:26:12 - 1.7
+++ e_mod_main.h20 Apr 2006 11:30:25 - 1.8
@@ -1,7 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
-/* standard module api calls e looks for */
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init (E_Module *m);
---
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=lnk&kid=120709&bid=263057&dat=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/debian
Modified Files:
control enlightenment.install
Removed Files:
enlightenment-data.install
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/debian/control,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- control 14 Apr 2006 00:17:01 - 1.15
+++ control 20 Apr 2006 11:30:23 - 1.16
@@ -2,7 +2,7 @@
Section: x11
Priority: optional
Maintainer: E17 Debian Team <[EMAIL PROTECTED]>
-Build-Depends: libevas-dev, libecore-dev, libeet-dev, libedje-dev, edje-bin,
libembryo-dev, xlibs-dev, automake1.7 | automaken, libtool, debhelper (>= 4.0)
+Build-Depends: libevas-dev, libecore-dev, libeet-dev, libedje-dev, edje-bin,
libembryo-dev, libx11-dev, x-dev, libxext-dev, automake1.7 | automaken,
libtool, debhelper (>= 4.0)
Standards-Version: 3.6.2.2
Package: enlightenment
@@ -10,23 +10,12 @@
Section: x11
Recommends: libevas-engine-xrender
Suggests: entrance
-Depends: ${shlibs:Depends}, libe, enlightenment-data (>= 0.16.999), libevas,
libecore, libecore-con, libecore-evas, libecore-file, libecore-ipc,
libecore-job, libecore-txt, libecore-x, libeet, libembryo, embryo-bin,
edje-bin, libedje, libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png,
libevas-saver-eet, libevas-saver-jpeg, libevas-saver-png,
libevas-engine-buffer, libevas-engine-software-x11
+Depends: ${shlibs:Depends}, libe, libevas, libecore, libecore-con,
libecore-evas, libecore-file, libecore-ipc, libecore-job, libecore-txt,
libecore-x, libeet, libembryo, embryo-bin, edje-bin, libedje,
libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png, libevas-saver-eet,
libevas-saver-jpeg, libevas-saver-png, libevas-engine-buffer,
libevas-engine-software-x11
Description: Enlightenment themes, etc.
Enlightenment is an advanced window manager for X11. Unique
features include: a fully animated background, nice drop shadows
around windows, backed by an extremely clean and optimized
foundation of APIs.
-
-Package: enlightenment-data
-Architecture: any
-Section: x11
-Depends: enlightenment (= ${Source-Version})
-Conflicts: enlightenment-data (< 0.16.999)
-Description: Enlightenment themes, etc.
- Enlightenment is an advanced window manager for X11. Unique
- features include: a fully animated background, nice drop shadows
- around windows, a unique application launcher module (ibar). All
- backed by an extremely clean and optimized foundation of APIs.
Package: libe
Section: libs
===
RCS file: /cvs/e/e17/apps/e/debian/enlightenment.install,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- enlightenment.install 20 Apr 2006 10:09:49 - 1.7
+++ enlightenment.install 20 Apr 2006 11:30:23 - 1.8
@@ -21,9 +21,5 @@
debian/tmp/usr/lib/enlightenment/modules/temperature/*/*.so
debian/tmp/usr/lib/enlightenment/modules/temperature/*.png
debian/tmp/usr/share/enlightenment
-debian/tmp/usr/share/enlightenment
-debian/tmp/usr/share/enlightenment
-debian/tmp/usr/share/enlightenment
-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=lnk&kid=120709&bid=263057&dat=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/temperature
Modified Files:
Makefile.am e_mod_config.c e_mod_main.c e_mod_main.h
Removed Files:
e_mod_config.h
Log Message:
e packages build again - also not much point having an enlightenment-data as
it's built as an arch specific package and it is intrinsically required by e
and cannot work without it nor is the data shared betwene e and other apps
unless e itself is installed too
===
RCS file: /cvs/e/e17/apps/e/src/modules/temperature/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 18 Feb 2006 04:35:34 - 1.6
+++ Makefile.am 20 Apr 2006 11:30:25 - 1.7
@@ -20,8 +20,7 @@
pkg_LTLIBRARIES= module.la
module_la_SOURCES = e_mod_main.c \
e_mod_main.h \
-e_mod_config.c \
-e_mod_config.h
+e_mod_config.c
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
===
RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_config.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_config.c 12 Mar 2006 16:12:59 - 1.18
+++ e_mod_config.c 20 Apr 2006 11:30:25 - 1.19
@@ -3,8 +3,6 @@
*/
#include "e.h"
#include "e_mod_main.h"
-#include "e_mod_config.h"
-#include "config.h"
/* celsius */
#define TEMP_LOW_LOW 32
@@ -42,7 +40,7 @@
static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
void
-_config_temperature_module(E_Container *con, Temperature *temp)
+_config_temperature_module(void)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@@ -56,22 +54,23 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, v,
temp);
- temp->config_dialog = cfd;
+ cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
+_("Temperature Configuration"), NULL, 0, v, NULL);
+ temperature_config->config_dialog = cfd;
}
static void
-_fill_data(Temperature *t, E_Config_Dialog_Data *cfdata)
+_fill_data(E_Config_Dialog_Data *cfdata)
{
double p;
- cfdata->units = t->conf->units;
- if (t->conf->units == CELCIUS)
+ cfdata->units = temperature_config->units;
+ if (temperature_config->units == CELCIUS)
cfdata->unit_method = 0;
else
cfdata->unit_method = 1;
- p = t->conf->poll_time;
+ p = temperature_config->poll_time;
cfdata->poll_time = p;
if ((p >= 0) && (p <= 5))
cfdata->poll_method = 1; //Fast
@@ -82,7 +81,7 @@
else if (p > 30)
cfdata->poll_method = 60; //Very Slow
- p = t->conf->low;
+ p = temperature_config->low;
if (cfdata->units == FAHRENHEIT)
p = FAR_2_CEL(p - 1); // -1 so the conversion doesn't make mid go hi
cfdata->low_temp = p;
@@ -93,7 +92,7 @@
else if (p > TEMP_LOW_MID)
cfdata->low_method = TEMP_LOW_HIGH;
- p = t->conf->high;
+ p = temperature_config->high;
if (cfdata->units == FAHRENHEIT)
p = FAR_2_CEL(p - 1);
cfdata->high_temp = p;
@@ -104,11 +103,11 @@
else if (p > TEMP_HIGH_MID)
cfdata->high_method = TEMP_HIGH_HIGH;
- if (!strcmp(t->conf->sensor_name, "temp1"))
+ if (!strcmp(temperature_config->sensor_name, "temp1"))
cfdata->sensor = 0;
- else if (!strcmp(t->conf->sensor_name, "temp2"))
+ else if (!strcmp(temperature_config->sensor_name, "temp2"))
cfdata->sensor = 1;
- else if (!strcmp(t->conf->sensor_name, "temp3"))
+ else if (!strcmp(temperature_config->sensor_name, "temp3"))
cfdata->sensor = 2;
}
@@ -116,21 +115,16 @@
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
- Temperature *t;
- t = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
- _fill_data(t, cfdata);
+ _fill_data(cfdata);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Temperature *t;
-
- t = cfd->data;
- t->config_dialog = NULL;
+ temperature_config->config_dialog = NULL;
free(cfdata);
}
@@ -217,33 +211,23 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Temperature *t;
-
- t = cfd->data;
- e_border_button_bindings_ungrab_all();
if (cfdata->unit_method == 0)
- t->conf->units = CELCIUS;
+ temperature_config->units = CELCIUS;
else
- t->conf->units = FAHRENHEIT;
-
- t->conf->poll_time = (double)cfdata->poll_method;
-
- if (t->conf->unit
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: Makefile.am Log Message: e packages build again - also not much point having an enlightenment-data as it's built as an arch specific package and it is intrinsically required by e and cannot work without it nor is the data shared betwene e and other apps unless e itself is installed too === RCS file: /cvs/e/e17/apps/e/Makefile.am,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- Makefile.am 12 Mar 2006 10:40:47 - 1.24 +++ Makefile.am 20 Apr 2006 11:30:23 - 1.25 @@ -11,7 +11,7 @@ EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN enlightenment.spec \ debian/changelog debian/changelog.in debian/copyright \ debian/rules debian/enlightenment.install \ -debian/enlightenment.docs debian/enlightenment-data.install \ +debian/enlightenment.docs \ debian/libe.install debian/libe-dev.install debian/control \ enlightenment.spec.in --- 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=lnk&kid=120709&bid=263057&dat=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/themes/images Modified Files: e17_clock_bg.png e17_clock_fg.png Log Message: e packages build again - also not much point having an enlightenment-data as it's built as an arch specific package and it is intrinsically required by e and cannot work without it nor is the data shared betwene e and other apps unless e itself is installed too === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_clock_bg.png,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsydm0Wr and /tmp/cvsJCVobN differ === RCS file: /cvs/e/e17/apps/e/data/themes/images/e17_clock_fg.png,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 Binary files /tmp/cvs416iGq and /tmp/cvsBUR10L 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=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/debian
Modified Files:
control
Log Message:
fix edje packages to install
===
RCS file: /cvs/e/e17/libs/edje/debian/control,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- control 14 Apr 2006 00:24:35 - 1.16
+++ control 20 Apr 2006 11:12:29 - 1.17
@@ -8,7 +8,7 @@
Package: edje0-bin
Architecture: any
Section: graphics
-Depends: ${shlibs:Depends}, libedje (= ${Source-Version}), embryo-bin,
libevas-loader-png, libevas-loader-jpeg, libevas-engine-buffer
+Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), embryo-bin,
libevas-loader-png, libevas-loader-jpeg, libevas-engine-buffer
Provides: edje-bin
Description: Various binaries for use with Edje
Edje is a graphical layout and animation library for animated resizable,
@@ -24,7 +24,7 @@
Package: edje0-debug
Architecture: any
Section: graphics
-Depends: ${shlibs:Depends}, libedje (= ${Source-Version}), edje-bin,
libevas-engine-buffer, libevas-engine-software-x11
+Depends: ${shlibs:Depends}, libedje0 (= ${Source-Version}), edje-bin,
libevas-engine-buffer, libevas-engine-software-x11
Provides: edje-debug
Description: Various binaries for use with Edje
Edje is a graphical layout and animation library for animated resizable,
@@ -47,7 +47,7 @@
Architecture: any
Section: libdevel
Architecture: any
-Depends: libedje (= ${Source-Version}), libeet-dev, libecore-dev, libevas-dev,
libembryo-dev
+Depends: libedje0 (= ${Source-Version}), libeet-dev, libecore-dev,
libevas-dev, libembryo-dev
Provides: libedje-dev
Description: Edje headers, static libraries and documentation
Edje is a graphical layout and animation library for animated resizable,
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/debian
Modified Files:
control
Removed Files:
libevas0-loader-edb.install libevas0-saver-edb.install
Log Message:
fix packaging - edb not built by default (frankly- nothing uses it!)
===
RCS file: /cvs/e/e17/libs/evas/debian/control,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- control 14 Apr 2006 00:24:36 - 1.28
+++ control 20 Apr 2006 10:47:06 - 1.29
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: E17 Debian Team <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), automake1.7 |
automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev,
libx11-dev | xlibs-dev, libxrender-dev | xlibs-dev, zlib1g, libjpeg62-dev,
autotools-dev, libtiff4-dev, libungif4-dev, libedb-dev
+Build-Depends: debhelper (>= 4.2.0), cdbs (>= 0.4.3-1.1), automake1.7 |
automaken, libtool, libeet-dev, libfreetype6-dev, libpng12-dev | libpng-dev,
libx11-dev | xlibs-dev, libxrender-dev | xlibs-dev, zlib1g, libjpeg62-dev,
autotools-dev, libtiff4-dev, libungif4-dev
Standards-Version: 3.6.2.2
Package: libevas0
@@ -121,21 +121,6 @@
applications under development.
This package contains the Evas engine module for Xrender.
-Package: libevas0-loader-edb
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libevas, libedb
-Provides: libevas-loader-edb
-Description: Evas module providing the Edb loader
- Evas is an advanced canvas library, providing six engines for rendering: X11,
- OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
- and Qtopia.
- Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas loader module for Edb.
-
Package: libevas0-loader-eet
Section: libs
Architecture: any
@@ -211,21 +196,6 @@
applications under development.
This package contains the Evas loader module for TIFF.
-Package: libevas0-saver-edb
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, libevas, libedb1
-Provides: libevas-saver-edb
-Description: Evas module providing the Edb saver
- Evas is an advanced canvas library, providing six engines for rendering: X11,
- OpenGL (hardware accelerated), DirectFB, the framebuffer, Microsoft Windows
- and Qtopia.
- Due to its simple API, evas can be developed with rapidly, and cleanly.
- Install evas if you want to develop applications against the only
- hardware-accelerated canvas library, or if you want to try out the
- applications under development.
- This package contains the Evas saver module for Edb.
-
Package: libevas0-saver-eet
Section: libs
Architecture: any
@@ -331,7 +301,7 @@
Package: libevas0-loaders-all
Section: graphics
Architecture: any
-Depends: libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png,
libevas-loader-edb, libevas-loader-tiff, libevas-loader-gif
+Depends: libevas-loader-eet, libevas-loader-jpeg, libevas-loader-png,
libevas-loader-tiff, libevas-loader-gif
Provides: libevas-loaders-all
Description: virtual package providing all available Evas loaders
This is a virtual package providing all available Evas loader modules.
@@ -351,7 +321,7 @@
Package: libevas0-savers-all
Section: graphics
Architecture: any
-Depends: libevas-saver-eet, libevas-saver-jpeg, libevas-saver-png,
libevas-saver-edb, libevas-saver-tiff
+Depends: libevas-saver-eet, libevas-saver-jpeg, libevas-saver-png,
libevas-saver-tiff
Provides: libevas-savers-all
Description: virtual package providing all available Evas savers
This is a virtual package providing all available Evas saver modules.
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: evas.spec.in Log Message: fix evas spec deps === RCS file: /cvs/e/e17/libs/evas/evas.spec.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- evas.spec.in20 Apr 2006 03:32:15 - 1.16 +++ evas.spec.in20 Apr 2006 10:39:27 - 1.17 @@ -204,7 +204,7 @@ %package module_engine_software_x11 Summary: Software X11 rendering engine module for Evas Group: System Environment/Libraries -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_software_x11 Software X11 rendering engine module for Evas @@ -217,7 +217,7 @@ %package module_engine_buffer Summary: Buffer rendering engine module for Evas Group: System Environment/Libraries -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_buffer Memory Buffer rendering engine module for Evas @@ -230,7 +230,7 @@ %package module_engine_fb Summary: Framebuffer rendering engine module for Evas Group: System Environment/Libraries -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_fb Framebuffer rendering engine module for Evas @@ -246,7 +246,7 @@ #BuildSuggests: xorg-x11-devel #BuildRequires: XFree86-devel #BuildRequires: xrender-devel -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_xrender_x11 XRender rendering engine module for Evas @@ -288,7 +288,7 @@ Summary: Qtopia rendering engine module for Evas Group: System Environment/Libraries #BuildRequires: qtopia-devel -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_software_qtopia Qtopia rendering engine module for Evas @@ -302,7 +302,7 @@ Summary: Software XCB X11 rendering engine module for Evas Group: System Environment/Libraries #BuildRequires: xcb-devel -Requires: evas_module_engine_software_generic +Requires: evas-module_engine_software_generic Requires: evas %description module_engine_software_xcb Software XCB X11 rendering engine module for Evas --- 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=lnk&kid=120709&bid=263057&dat=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/debian Modified Files: enlightenment.install Log Message: fix package list === RCS file: /cvs/e/e17/apps/e/debian/enlightenment.install,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- enlightenment.install 12 Apr 2006 20:42:41 - 1.6 +++ enlightenment.install 20 Apr 2006 10:09:49 - 1.7 @@ -1,15 +1,29 @@ debian/tmp/usr/bin/enlightenment -debian/tmp/usr/bin/enlightenment_eapp -debian/tmp/usr/bin/enlightenment_eapp_cache_gen -debian/tmp/usr/bin/enlightenment_imc -debian/tmp/usr/bin/enlightenment_remote -debian/tmp/usr/bin/enlightenment_start -debian/tmp/usr/lib/enlightenment/modules/* -debian/tmp/usr/lib/enlightenment/preload/* -debian/tmp/usr/share/enlightenment/doc/* -debian/tmp/usr/share/enlightenment/data/input_methods/* -debian/tmp/usr/share/enlightenment/data/fonts/* -debian/tmp/usr/share/enlightenment/data/images/* -debian/tmp/usr/share/enlightenment/data/other/* +debian/tmp/usr/bin/enlightenment_* +debian/tmp/usr/lib/enlightenment/preload/*.so +debian/tmp/usr/lib/enlightenment/modules/battery/*/*.so +debian/tmp/usr/lib/enlightenment/modules/battery/*.png +debian/tmp/usr/lib/enlightenment/modules/clock/*/*.so +debian/tmp/usr/lib/enlightenment/modules/clock/*.png +debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/*.so +debian/tmp/usr/lib/enlightenment/modules/cpufreq/*.png +debian/tmp/usr/lib/enlightenment/modules/cpufreq/*/freqset +debian/tmp/usr/lib/enlightenment/modules/dropshadow/*/*.so +debian/tmp/usr/lib/enlightenment/modules/dropshadow/*.png +debian/tmp/usr/lib/enlightenment/modules/ibar/*/*.so +debian/tmp/usr/lib/enlightenment/modules/ibar/*.png +debian/tmp/usr/lib/enlightenment/modules/ibox/*/*.so +debian/tmp/usr/lib/enlightenment/modules/ibox/*.png +debian/tmp/usr/lib/enlightenment/modules/pager/*/*.so +debian/tmp/usr/lib/enlightenment/modules/pager/*.png +debian/tmp/usr/lib/enlightenment/modules/start/*/*.so +debian/tmp/usr/lib/enlightenment/modules/start/*.png +debian/tmp/usr/lib/enlightenment/modules/temperature/*/*.so +debian/tmp/usr/lib/enlightenment/modules/temperature/*.png +debian/tmp/usr/share/enlightenment +debian/tmp/usr/share/enlightenment +debian/tmp/usr/share/enlightenment +debian/tmp/usr/share/enlightenment +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=lnk&kid=120709&bid=263057&dat=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:
enlightenment.spec.in
Log Message:
e packages fixed up
===
RCS file: /cvs/e/e17/apps/e/enlightenment.spec.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- enlightenment.spec.in 23 Jan 2006 15:52:47 - 1.4
+++ enlightenment.spec.in 20 Apr 2006 10:09:55 - 1.5
@@ -11,9 +11,11 @@
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Prefix: %{_prefix}
#BuildSuggests: xorg-x11-devel
-BuildRequires: XFree86-devel
-BuildRequires: evas-devel edje-devel ecore-devel eet-devel
-Requires: evas edje ecore eet evas-module_loader_eet evas-module_saver_eet
evas-module_loader_png evas-module_saver_png evas-module_loader_jpeg
evas-module_saver_jpeg evas-module_engine_software_x11 evas-module_engine_buffer
+#BuildRequires: XFree86-devel
+#BuildRequires: evas-devel edje-devel ecore-devel eet-devel
+Requires: evas edje edje-bin ecore eet embryo embryo-bin
+Requires: evas-module_loader_eet evas-module_saver_eet evas-module_loader_png
evas-module_saver_png evas-module_loader_jpeg evas-module_saver_jpeg
evas-module_engine_software_x11 evas-module_engine_buffer
+Requires: ecore-con ecore-ipc ecore-evas ecore-file ecore-job ecore-text
ecore-x
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -23,8 +25,8 @@
Summary: Development headers for Enlightenment.
Group: User Interface/Desktops
Requires: %{name} = %{version}
-Requires: XFree86-devel eet-devel
-Requires: evas-devel edje-devel ecore-devel
+#Requires: XFree86-devel eet-devel
+Requires: evas-devel edje-devel ecore-devel eet-devel embryo-devel
%description devel
Development headers for Enlightenment.
@@ -39,6 +41,8 @@
%install
%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
test -x `which doxygen` && sh gendoc || :
+rm -f `find $RPM_BUILD_ROOT/usr/lib/enlightenment -name "*.a" -print`
+rm -f `find $RPM_BUILD_ROOT/usr/lib/enlightenment -name "*.la" -print`
%clean
test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
@@ -52,19 +56,40 @@
%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING-PLAIN README
-%{_bindir}/*
-%{_libdir}/libe.so.*
-%{_libdir}/%{name}
+%{_bindir}/enlightenment
+%{_bindir}/enlightenment_*
+%{_libdir}/lib*.so.*
+%{_libdir}/%{name}/preload/*.so
+%{_libdir}/%{name}/modules/battery/*/*.so
+%{_libdir}/%{name}/modules/battery/*.png
+%{_libdir}/%{name}/modules/clock/*/*.so
+%{_libdir}/%{name}/modules/clock/*.png
+%{_libdir}/%{name}/modules/cpufreq/*/*.so
+%{_libdir}/%{name}/modules/cpufreq/*.png
+%{_libdir}/%{name}/modules/cpufreq/*/freqset
+%{_libdir}/%{name}/modules/dropshadow/*/*.so
+%{_libdir}/%{name}/modules/dropshadow/*.png
+%{_libdir}/%{name}/modules/ibar/*/*.so
+%{_libdir}/%{name}/modules/ibar/*.png
+%{_libdir}/%{name}/modules/ibox/*/*.so
+%{_libdir}/%{name}/modules/ibox/*.png
+%{_libdir}/%{name}/modules/pager/*/*.so
+%{_libdir}/%{name}/modules/pager/*.png
+%{_libdir}/%{name}/modules/start/*/*.so
+%{_libdir}/%{name}/modules/start/*.png
+%{_libdir}/%{name}/modules/temperature/*/*.so
+%{_libdir}/%{name}/modules/temperature/*.png
%{_datadir}/%{name}
%{_datadir}/locale/*
%{_datadir}/xsessions/%{name}.desktop
%files devel
%defattr(-, root, root)
+%{_bindir}/enlightenment-config
%{_includedir}/enlightenment/*.h
%{_includedir}/E_Lib.h
-%{_libdir}/libe.a
-%{_libdir}/libe.la
-%{_libdir}/libe.so
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
%changelog
---
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=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje
Modified Files:
edje.spec.in
Log Message:
another lib packages right.
===
RCS file: /cvs/e/e17/libs/edje/edje.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje.spec.in23 Jan 2006 15:28:23 - 1.3
+++ edje.spec.in20 Apr 2006 08:09:52 - 1.4
@@ -12,8 +12,8 @@
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel vim-enhanced
-BuildRequires: eet-devel embryo-devel evas-devel ecore-devel
-Requires: evas-module_loader_eet evas-module_saver_eet evas-module_loader_png
evas-module_saver_png evas-module_loader_jpeg evas-module_saver_jpeg
evas-module_engine_software_x11 evas-module_engine_buffer
+#BuildRequires: eet-devel embryo-devel evas-devel ecore-devel
+Requires: evas-module_loader_eet
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -41,6 +41,26 @@
%description devel
Headers, static libraries, test programs and documentation for Edje
+%package bin
+Summary: Edje file compiler/decompiler suite
+Group: System Environment/Libraries
+Requires: %{name} = %{version}
+Requires: embryo-bin
+Requires: evas-module_saver_eet evas-module_loader_png evas-module_saver_png
evas-module_loader_jpeg evas-module_saver_jpeg evas-module_engine_buffer
+
+%description bin
+Edje file compiler/decompiler suite
+
+%package debug
+Summary: Debugging tools for Edje
+Group: System Environment/Libraries
+Requires: %{name} = %{version}
+Requires: edje-bin
+Requires: evas-module_loader_png evas-module_engine_software_x11
+
+%description debug
+Debugging tools for Edje
+
%prep
%setup -q
@@ -64,23 +84,38 @@
%files
%defattr(-, root, root)
%doc AUTHORS COPYING README
-%{_libdir}/libedje.so*
-%{_bindir}/edje
+%{_libdir}/libedje.so.*
+
+%files devel
+%defattr(-, root, root)
+%doc doc/html
+%{_libdir}/*.so
+%{_libdir}/*.la
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+%{_bindir}/edje-config
+%{_includedir}/*.h
+
+%files bin
+%defattr(-, root, root)
%{_bindir}/edje_cc
%{_bindir}/edje_ls
%{_bindir}/edje_decc
%{_bindir}/edje_recc
-%{_bindir}/edje_test
-%{_bindir}/edje_thumb
-%{_datadir}/edje
+%{_datadir}/edje/include/edje.inc
-%files devel
+%files debug
%defattr(-, root, root)
-%doc doc/html
-%{_libdir}/libedje.a
-%{_libdir}/libedje.la
-%{_libdir}/pkgconfig/edje.pc
-%{_bindir}/edje-config
-%{_includedir}/Edje*
+%{_bindir}/edje
+%{_bindir}/edje_test
+%{_bindir}/edje_thumb
+%{_datadir}/edje/data/template/*
+%{_datadir}/edje/data/e_logo.sh
+%{_datadir}/edje/data/src/*.edc
+%{_datadir}/edje/data/images/*.png
+%{_datadir}/edje/data/test/fonts/*.alias
+%{_datadir}/edje/data/test/fonts/*.ttf
+%{_datadir}/edje/data/test/fonts/*.dir
+%{_datadir}/edje/data/test/images/*.png
%changelog
---
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=lnk&kid=120709&bid=263057&dat=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
Modified Files:
ecore.spec.in
Log Message:
tedium. ecore now is properly packaged as an rpm...
===
RCS file: /cvs/e/e17/libs/ecore/ecore.spec.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore.spec.in 8 Sep 2005 21:04:21 - 1.5
+++ ecore.spec.in 20 Apr 2006 07:44:08 - 1.6
@@ -3,7 +3,7 @@
Summary: Enlightened Core X interface library
Name: @PACKAGE@
Version: @VERSION@
-Release: 0.20050908
+Release: 0.%(date '+%Y%m%d')
License: BSD
Group: User Interface/X
Source: %{name}-%{version}.tar.gz
@@ -12,8 +12,8 @@
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment
Project (http://www.enlightenment.org/)}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: xorg-x11-devel
-BuildRequires: libjpeg-devel XFree86-devel openssl-devel
-BuildRequires: evas-devel eet-devel
+#BuildRequires: libjpeg-devel XFree86-devel openssl-devel
+#BuildRequires: evas-devel eet-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@@ -26,12 +26,110 @@
Summary: Ecore headers and development libraries.
Group: Development/Libraries
Requires: %{name} = %{version}
-Requires: libjpeg-devel XFree86-devel openssl-devel
-Requires: evas-devel eet-devel
+#Requires: libjpeg-devel XFree86-devel openssl-devel
+#Requires: evas-devel eet-devel
%description devel
Ecore development files
+%package bin
+Summary: Tools that support Ecore
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description bin
+Tools that support Ecore
+
+%package debug
+Summary: Tools for debugging/demonstration of Ecore
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description debug
+Tools for debugging/demonstration of Ecore
+
+%package ecore-con
+Summary: Ecore Connection Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-con
+Ecore Connection Library
+
+%package ecore-config
+Summary: Ecore Enlightened Property Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-config
+Ecore Enlightened Property Library
+
+%package ecore-dbus
+Summary: Ecore DBus Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-dbus
+Ecore DBus Library
+
+%package ecore-evas
+Summary: Ecore Evas Wrapper Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-evas
+Ecore Evas Wrapper Library
+
+%package ecore-fb
+Summary: Ecore frame buffer system functions
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-fb
+Ecore frame buffer system functions
+
+%package ecore-file
+Summary: Ecore File Library
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-file
+Ecore File Library
+
+%package ecore-ipc
+Summary: Ecore inter-process communication functions
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-ipc
+Ecore inter-process communication functions
+
+%package ecore-job
+Summary: Ecore job dealing functions
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-job
+Ecore job dealing functions
+
+%package ecore-txt
+Summary: Ecore text encoding conversion functions
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-txt
+Ecore text encoding conversion functions
+
+%package ecore-x
+Summary: Ecore functions for dealing with the X Windows System
+Group: Development/Libraries
+Requires: %{name} = %{version}
+
+%description ecore-x
+Ecore functions for dealing with the X Windows System
+
+
+
%prep
%setup -q -n %{name}-%{version}
@@ -39,7 +137,7 @@
CFLAGS="-I/usr/kerberos/include -I/usr/X11R6/include/X11/extensions"
LDFLAGS="-L/usr/kerberos/lib -L/usr/X11R6/%{_lib}"
export CFLAGS LDFLAGS
-%{configure} --prefix=%{_prefix}
+%{configure} --prefix=%{_prefix} --disable-ecore-dfb
%{__make} %{?_smp_mflags} %{?mflags}
%install
@@ -57,17 +155,64 @@
%files
%defattr(-, root, root)
%doc AUTHORS COPYING* README*
-%{_libdir}/*.so.*
-%{_libdir}/*.la
-%{_bindir}/ecore_*
-%{_datadir}/ecore
+%{_libdir}/libecore.so.*
%files devel
%defattr(-, root, root)
%doc doc/html
%{_libdir}/*.so
+%{_libdir}/*.la
%{_libdir}/*.a
%{_bindir}/ecore-config
%{_libdir}/pkgconfig/*
%{_datadir}/aclocal/*
%{_includedir}/*.h
+
+%files bin
+%defattr(-, root, root)
+%{_bindir}/ecore_config
+
+%files debug
+%defattr(-, root, root)
+%{_bindir}/*test
+%{_datadir}/ecore
+
+%files ecore-con
+%defattr(-, root, root)
+%{_libdir}/libecore_con.so.*
+
+%files ecore-config
+%defattr(-, root, root)
+%{_libdir}/libecore_config.so.*
+
+%files ecore-dbus
+%defattr(-, root, root)
+%{_libdir}/libecore_dbus.so.*
+
+%files ecore-evas
+%defattr(-, root, root)
+%{_libdir}
