Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_entry_dialog.h e_includes.h e_main.c
Added Files:
e_fm.c e_fm.h
Log Message:
asparagus time!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- Makefile.am 8 Jul 2006 09:18:03 -0000 1.125
+++ Makefile.am 9 Jul 2006 18:35:56 -0000 1.126
@@ -158,7 +158,8 @@
e_int_gadcon_config.h \
e_confirm_dialog.h \
e_int_border_prop.h \
-e_entry_dialog.h
+e_entry_dialog.h \
+e_fm.h
enlightenment_src = \
e_user.c \
@@ -297,6 +298,7 @@
e_confirm_dialog.c \
e_int_border_prop.c \
e_entry_dialog.c \
+e_fm.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry_dialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_entry_dialog.h 2 Jun 2006 19:07:50 -0000 1.1
+++ e_entry_dialog.h 9 Jul 2006 18:35:56 -0000 1.2
@@ -15,10 +15,10 @@
* @data - the pointer passed to func
*/
-EAPI e_entry_dialog_show(const char *title, const char *icon, const char
*text,
- const char *button_text, const char *button2_text,
- void (*func)(char *text, void *data),
- void (*func2)(void *data), void *data);
+EAPI void e_entry_dialog_show(const char *title, const char *icon, const char
*text,
+ const char *button_text, const char
*button2_text,
+ void (*func)(char *text, void *data),
+ void (*func2)(void *data), void *data);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- e_includes.h 29 May 2006 07:35:41 -0000 1.104
+++ e_includes.h 9 Jul 2006 18:35:56 -0000 1.105
@@ -137,3 +137,5 @@
#include "e_int_gadcon_config.h"
#include "e_confirm_dialog.h"
#include "e_int_border_prop.h"
+#include "e_entry_dialog.h"
+#include "e_fm.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- e_main.c 4 Jul 2006 18:36:29 -0000 1.169
+++ e_main.c 9 Jul 2006 18:35:56 -0000 1.170
@@ -430,11 +430,12 @@
/* init the enlightenment file manager */
- if (!e_fm_icon_init() || !e_fm_init())
+ if (!e_fm_icon_init() || !e_fm_init() || !e_fm2_init())
{
e_error_message_show(_("Enlightenment cannot initialize the File
manager.\n"));
_e_main_shutdown(-1);
}
+ _e_main_shutdown_push(e_fm2_shutdown);
_e_main_shutdown_push(e_fm_shutdown);
_e_main_shutdown_push(e_fm_icon_shutdown);
-------------------------------------------------------------------------
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
