Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e.h e_eap_editor.c e_eap_editor.h e_includes.h
e_int_config_apps.c e_ipc_handlers.h e_ipc_handlers_list.h
e_main.c
Removed Files:
e_apps.c e_apps.h e_apps_error.c e_apps_error.h
Log Message:
And ecore_desktop is gone.
Eap Editor must still be fixed!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -3 -r1.180 -r1.181
--- Makefile.am 24 Mar 2007 20:12:16 -0000 1.180
+++ Makefile.am 25 Mar 2007 19:28:50 -0000 1.181
@@ -47,7 +47,6 @@
e_flowlayout.h \
e_int_menus.h \
e_module.h \
-e_apps.h \
e_atoms.h \
e_utils.h \
e_canvas.h \
@@ -149,7 +148,6 @@
e_exehist.h \
e_color_class.h \
e_widget_textblock.h \
-e_apps_error.h \
e_stolen.h \
e_gadcon.h \
e_shelf.h \
@@ -212,7 +210,6 @@
e_flowlayout.c \
e_int_menus.c \
e_module.c \
-e_apps.c \
e_atoms.c \
e_utils.c \
e_canvas.c \
@@ -314,7 +311,6 @@
e_exehist.c \
e_color_class.c \
e_widget_textblock.c \
-e_apps_error.c \
e_stolen.c \
e_gadcon.c \
e_shelf.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- e.h 24 Mar 2007 09:17:30 -0000 1.58
+++ e.h 25 Mar 2007 19:28:50 -0000 1.59
@@ -58,7 +58,6 @@
#include <Ecore_Job.h>
#include <Ecore_Txt.h>
#include <Ecore_Config.h>
-#include <Ecore_Desktop.h>
#include <Ecore_File.h>
#include <Ecore_X_Atoms.h>
#include <Ecore_X_Cursor.h>
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_eap_editor.c 28 Dec 2006 13:43:30 -0000 1.72
+++ e_eap_editor.c 25 Mar 2007 19:28:51 -0000 1.73
@@ -1,6 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#if 0
#include "e.h"
struct _E_Config_Dialog_Data
@@ -588,3 +589,4 @@
cfdata->eap.icon_type = E_APP_ICON_UNKNOWN;
cfdata->editor->img = e_app_icon_add(&(cfdata->eap), cfdata->editor->evas);
}
+#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_eap_editor.h 3 Sep 2006 15:11:04 -0000 1.6
+++ e_eap_editor.h 25 Mar 2007 19:28:51 -0000 1.7
@@ -1,6 +1,7 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
+#if 0
#ifdef E_TYPEDEFS
typedef struct _E_App_Edit E_App_Edit;
@@ -29,5 +30,6 @@
EAPI E_App_Edit *e_eap_edit_show(E_Container *con, E_App *a);
+#endif
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- e_includes.h 24 Mar 2007 20:12:16 -0000 1.151
+++ e_includes.h 25 Mar 2007 19:28:51 -0000 1.152
@@ -23,7 +23,6 @@
#include "e_init.h"
#include "e_int_menus.h"
#include "e_module.h"
-#include "e_apps.h"
#include "e_atoms.h"
#include "e_utils.h"
#include "e_canvas.h"
@@ -121,7 +120,6 @@
#include "e_exehist.h"
#include "e_color_class.h"
#include "e_widget_textblock.h"
-#include "e_apps_error.h"
#include "e_stolen.h"
#include "e_gadcon.h"
#include "e_shelf.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- e_int_config_apps.c 24 Mar 2007 18:18:42 -0000 1.62
+++ e_int_config_apps.c 25 Mar 2007 19:28:51 -0000 1.63
@@ -35,14 +35,18 @@
Evas_Object *o_up_button;
Evas_Object *o_up_all_button;
Evas_Object *o_add_button;
+#if 0
Evas_Object *o_create_button;
+#endif
Evas_Object *o_delete_left_button;
Evas_Object *o_delete_right_button;
Evas_Object *o_regen_button;
Evas_Object *o_move_up_button;
Evas_Object *o_move_down_button;
} gui;
+#if 0
E_App_Edit *editor;
+#endif
};
typedef struct _E_Config_Once
@@ -311,6 +315,7 @@
}
}
+#if 0
static void
_cb_editor_del(void *obj)
{
@@ -323,7 +328,9 @@
// e_fm2_refresh(cfdata->gui.o_fm);
// e_fm2_refresh(cfdata->gui.o_fm_all);
}
+#endif
+#if 0
static void
_cb_button_create(void *data1, void *data2)
{
@@ -401,6 +408,7 @@
e_object_del_attach_func_set(E_OBJECT(cfdata->editor), _cb_editor_del);
}
}
+#endif
static void
_cb_files_selection_change_all(void *data, Evas_Object *obj, void *event_info)
@@ -420,6 +428,7 @@
e_widget_disabled_set(cfdata->gui.o_add_button, 1);
}
+#if 0
static void
_cb_files_edited(void *data, E_Menu *m, E_Menu_Item *mi)
{
@@ -466,6 +475,7 @@
e_menu_item_label_set(mi, _("Edit Application"));
e_menu_item_callback_set(mi, _cb_files_edited, cfdata);
}
+#endif
static void
_cb_files_sorted_changed(void *data, Evas_Object *obj, void *event_info)
@@ -622,13 +632,17 @@
e_fm2_icon_menu_flags_set(mt, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_dir_changed_all, cfdata);
+#if 0
evas_object_smart_callback_add(mt, "selected",
_cb_files_selected_all, cfdata);
+#endif
evas_object_smart_callback_add(mt, "selection_change",
_cb_files_selection_change_all, cfdata);
evas_object_smart_callback_add(mt, "changed",
_cb_files_changed_all, cfdata);
+#if 0
e_fm2_icon_menu_start_extend_callback_set(mt, _cb_files_add_edited, cfdata);
+#endif
e_fm2_path_set(cfdata->gui.o_fm_all, cfdata->path_all, "/");
e_fm2_window_object_set(mt, E_OBJECT(cfd->dia->win));
ob = e_widget_scrollframe_pan_add(evas, mt,
@@ -667,10 +681,12 @@
e_widget_disabled_set(mt, 1);
}
+#if 0
mt = e_widget_button_add(evas, _("Create a new Application"),
"enlightenment/e",
_cb_button_create, cfdata, NULL);
cfdata->gui.o_create_button = mt;
e_widget_framelist_object_append(of, mt);
+#endif
e_widget_table_object_append(ot, of, 0, 0, 2, 4, 1, 1, 1, 1);
@@ -711,13 +727,17 @@
e_fm2_icon_menu_flags_set(mt, E_FM2_MENU_NO_SHOW_HIDDEN);
evas_object_smart_callback_add(mt, "dir_changed",
_cb_files_dir_changed, cfdata);
+#if 0
evas_object_smart_callback_add(mt, "selected",
_cb_files_selected_all2, cfdata);
+#endif
evas_object_smart_callback_add(mt, "selection_change",
_cb_files_selection_change, cfdata);
evas_object_smart_callback_add(mt, "changed",
_cb_files_changed, cfdata);
+#if 0
e_fm2_icon_menu_start_extend_callback_set(mt, _cb_files_add_edited,
cfdata);
+#endif
if ((once) && (once->path))
e_fm2_path_set(cfdata->gui.o_fm, once->path, "/");
else
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- e_ipc_handlers.h 1 Mar 2007 22:39:34 -0000 1.145
+++ e_ipc_handlers.h 25 Mar 2007 19:28:51 -0000 1.146
@@ -929,32 +929,6 @@
* ...
*/
/****************************************************************************/
-#define HDL E_IPC_EAP_EDIT_START
-#if (TYPE == E_REMOTE_OPTIONS)
- OP("-start-eap-edit", 1, "Starts the Eap editor on the eap 'OPT1'", 0, HDL)
-#elif (TYPE == E_REMOTE_OUT)
- REQ_STRING(params[0], HDL);
-#elif (TYPE == E_WM_IN)
- STRING(s, HDL);
- E_App *a;
- if (ecore_file_exists(s))
- {
- a = e_app_new(s, 0);
- if (a)
- e_eap_edit_show(e_container_current_get(e_manager_current_get()), a);
- }
- else
- {
- a = e_app_empty_new(s);
- if (a)
- e_eap_edit_show(e_container_current_get(e_manager_current_get()), a);
- }
- END_STRING(s);
-#elif (TYPE == E_REMOTE_IN)
-#endif
-#undef HDL
-
-/****************************************************************************/
#define HDL E_IPC_OP_MODULE_LOAD
#if (TYPE == E_REMOTE_OPTIONS)
OP("-module-load", 1, "Loads the module named 'OPT1' into memory", 0, HDL)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers_list.h,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_ipc_handlers_list.h 13 Feb 2007 16:33:35 -0000 1.55
+++ e_ipc_handlers_list.h 25 Mar 2007 19:28:51 -0000 1.56
@@ -355,8 +355,6 @@
#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET 331
#define E_IPC_OP_CACHE_FLUSH_INTERVAL_GET_REPLY 332
-#define E_IPC_EAP_EDIT_START 333
-
#define E_IPC_OP_COLOR_CLASS_COLOR_SET 334
#define E_IPC_OP_COLOR_CLASS_COLOR2_SET 335
#define E_IPC_OP_COLOR_CLASS_COLOR3_SET 336
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -3 -r1.208 -r1.209
--- e_main.c 24 Mar 2007 21:23:48 -0000 1.208
+++ e_main.c 25 Mar 2007 19:28:51 -0000 1.209
@@ -445,26 +445,6 @@
efreet_icon_extension_add(".edj");
TS("efreet paths done");
- TS("ecore_desktop");
- /* init FDO desktop */
- if (!ecore_desktop_init())
- {
- e_error_message_show(_("Enlightenment cannot initialize the FDO desktop
system.\n"
- "Perhaps you are out of memory?"));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(ecore_desktop_shutdown);
- TS("ecore_desktop done");
-
- TS("ecore_desktop paths");
- ecore_desktop_paths_extras_clear();
- ecore_desktop_paths_prepend_user(ECORE_DESKTOP_PATHS_ICONS, "~/.e/e/icons");
- snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
- ecore_desktop_paths_append_system(ECORE_DESKTOP_PATHS_ICONS, buf);
- ecore_desktop_paths_regen();
-
- TS("ecore_desktop paths done");
-
TS("ecore_evas init");
/* init the evas wrapper */
if (!ecore_evas_init())
@@ -673,14 +653,6 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_screens_shutdown);
- TS("apps");
- /* init app system */
- if (!e_app_init())
- {
- e_error_message_show(_("Enlightenment cannot set up its app system."));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(e_app_shutdown);
TS("exec");
/* init app system */
if (!e_exec_init())
@@ -904,7 +876,6 @@
if (restart)
{
/* selected shutdown */
- e_app_unmonitor_all();
e_ipc_shutdown();
ecore_file_shutdown();
e_util_env_set("E_RESTART_OK", "1");
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
