summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorsebastid <sebastid>2005-02-21 16:16:40 +0000
committersebastid <sebastid@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-02-21 16:16:40 +0000
commitb4192a2fb9726e2705bd875f781d6d2b16112903 (patch)
treea6c12bb2566b8195cb35377f7110a6118e9efe1c /src/bin
parent909227ac7cb8eae2d5288e69812481c63a5468d3 (diff)
Small updates.
Move from e_file to ecore_file SVN revision: 13456
Diffstat (limited to '')
-rw-r--r--src/bin/e.h1
-rw-r--r--src/bin/e_border.c3
-rw-r--r--src/bin/e_file.c2
-rw-r--r--src/bin/e_file.h2
-rw-r--r--src/bin/e_gadman.c1
-rw-r--r--src/bin/e_main.c6
-rw-r--r--src/bin/e_module.c4
-rw-r--r--src/bin/e_path.c2
-rw-r--r--src/bin/e_zone.h3
9 files changed, 14 insertions, 10 deletions
diff --git a/src/bin/e.h b/src/bin/e.h
index 7af3e04..0e0696d 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -23,6 +23,7 @@
23#include <Ecore_Job.h> 23#include <Ecore_Job.h>
24#include <Ecore_Txt.h> 24#include <Ecore_Txt.h>
25#include <Ecore_Config.h> 25#include <Ecore_Config.h>
26#include <Ecore_File.h>
26#include <Ecore_X_Atoms.h> 27#include <Ecore_X_Atoms.h>
27#include <Eet.h> 28#include <Eet.h>
28#include <Edje.h> 29#include <Edje.h>
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 33431d3..e54077e 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -272,8 +272,7 @@ e_border_new(E_Container *con, Ecore_X_Window win, int first_map)
272 272
273 /* FIXME: if first_map is 1 then we should ignore the first hide event 273 /* FIXME: if first_map is 1 then we should ignore the first hide event
274 * or ensure the window is alreayd hidden and events flushed before we 274 * or ensure the window is alreayd hidden and events flushed before we
275 * create a border for it 275 * create a border for it */
276 */
277 if (first_map) 276 if (first_map)
278 { 277 {
279 printf("##- FIRST MAP\n"); 278 printf("##- FIRST MAP\n");
diff --git a/src/bin/e_file.c b/src/bin/e_file.c
index 06d09b1..d143b75 100644
--- a/src/bin/e_file.c
+++ b/src/bin/e_file.c
@@ -4,6 +4,7 @@
4#include "e.h" 4#include "e.h"
5#include <dirent.h> 5#include <dirent.h>
6 6
7#if 0
7/* externally accessible functions */ 8/* externally accessible functions */
8time_t 9time_t
9e_file_mod_time(char *file) 10e_file_mod_time(char *file)
@@ -202,3 +203,4 @@ e_file_ls(char *dir)
202 203
203 return list; 204 return list;
204} 205}
206#endif
diff --git a/src/bin/e_file.h b/src/bin/e_file.h
index 7e1e38a..93c35c5 100644
--- a/src/bin/e_file.h
+++ b/src/bin/e_file.h
@@ -6,6 +6,7 @@
6#ifndef E_FILE_H 6#ifndef E_FILE_H
7#define E_FILE_H 7#define E_FILE_H
8 8
9#if 0
9EAPI time_t e_file_mod_time(char *file); 10EAPI time_t e_file_mod_time(char *file);
10EAPI int e_file_exists(char *file); 11EAPI int e_file_exists(char *file);
11EAPI int e_file_is_dir(char *file); 12EAPI int e_file_is_dir(char *file);
@@ -19,6 +20,7 @@ EAPI char *e_file_get_dir(char *path);
19EAPI int e_file_can_exec(struct stat *st); 20EAPI int e_file_can_exec(struct stat *st);
20EAPI char *e_file_readlink(char *link); 21EAPI char *e_file_readlink(char *link);
21EAPI Evas_List *e_file_ls(char *dir); 22EAPI Evas_List *e_file_ls(char *dir);
23#endif
22 24
23#endif 25#endif
24#endif 26#endif
diff --git a/src/bin/e_gadman.c b/src/bin/e_gadman.c
index e6db9cc..5ac7e0d 100644
--- a/src/bin/e_gadman.c
+++ b/src/bin/e_gadman.c
@@ -445,6 +445,7 @@ e_gadman_client_resize(E_Gadman_Client *gmc, Evas_Coord w, Evas_Coord h)
445 gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay); 445 gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
446 _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE); 446 _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
447 _e_gadman_client_geometry_apply(gmc); 447 _e_gadman_client_geometry_apply(gmc);
448 _e_gadman_client_geometry_to_align(gmc);
448} 449}
449 450
450void 451void
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 8ef5b6a..756dbaf 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
128 } 128 }
129 _e_main_shutdown_push(ecore_shutdown); 129 _e_main_shutdown_push(ecore_shutdown);
130 /* setup my args */ 130 /* setup my args */
131 ecore_app_args_set((int)argc, (const char **)argv); 131 ecore_app_args_set(argc, (const char **)argv);
132 /* setup a handler for when e is asked to exit via a system signal */ 132 /* setup a handler for when e is asked to exit via a system signal */
133 if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_main_cb_signal_exit, NULL)) 133 if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_main_cb_signal_exit, NULL))
134 { 134 {
@@ -443,7 +443,7 @@ _e_main_dirs_init(void)
443 for (i = 0; i < (int)(sizeof(dirs) / sizeof(char *)); i++) 443 for (i = 0; i < (int)(sizeof(dirs) / sizeof(char *)); i++)
444 { 444 {
445 snprintf(buf, sizeof(buf), dirs[i], homedir); 445 snprintf(buf, sizeof(buf), dirs[i], homedir);
446 if (!e_file_mkpath(buf)) 446 if (!ecore_file_mkpath(buf))
447 { 447 {
448 e_error_message_show("Error creating directory:\n" 448 e_error_message_show("Error creating directory:\n"
449 "%s", 449 "%s",
@@ -458,7 +458,7 @@ _e_main_dirs_init(void)
458 /* outside e's main source to populate these directories from gnome/kde */ 458 /* outside e's main source to populate these directories from gnome/kde */
459 /* app menu data etc. */ 459 /* app menu data etc. */
460 snprintf(buf, sizeof(buf), "%s/.e/e/applications/all/eterm.eapp", homedir); 460 snprintf(buf, sizeof(buf), "%s/.e/e/applications/all/eterm.eapp", homedir);
461 if (!e_file_exists(buf)) 461 if (!ecore_file_exists(buf))
462 { 462 {
463 printf("GETTING YOU STARTED!\n"); 463 printf("GETTING YOU STARTED!\n");
464 snprintf(buf, sizeof(buf), 464 snprintf(buf, sizeof(buf),
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index b81dfea..f057a02 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -140,10 +140,10 @@ e_module_new(char *name)
140 } 140 }
141 _e_modules = evas_list_append(_e_modules, m); 141 _e_modules = evas_list_append(_e_modules, m);
142 m->name = strdup(name); 142 m->name = strdup(name);
143 s = e_file_get_dir(modpath); 143 s = ecore_file_get_dir(modpath);
144 if (s) 144 if (s)
145 { 145 {
146 m->dir = e_file_get_dir(s); 146 m->dir = ecore_file_get_dir(s);
147 free(s); 147 free(s);
148 } 148 }
149 m->func.info(m); 149 m->func.info(m);
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 71209ec..dd7a8d3 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -174,7 +174,7 @@ e_path_find(E_Path *ep, const char *file)
174 if (p) 174 if (p)
175 { 175 {
176 snprintf(_e_path_buf, sizeof(_e_path_buf), "%s/%s", p, file); 176 snprintf(_e_path_buf, sizeof(_e_path_buf), "%s/%s", p, file);
177 rp = e_file_realpath(_e_path_buf); 177 rp = ecore_file_realpath(_e_path_buf);
178 if ((rp) && (rp[0] != 0)) 178 if ((rp) && (rp[0] != 0))
179 { 179 {
180 strcpy(_e_path_buf, rp); 180 strcpy(_e_path_buf, rp);
diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 0b393a5..9f30b62 100644
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -20,8 +20,7 @@ struct _E_Zone
20 int x, y, w, h; 20 int x, y, w, h;
21 char *name; 21 char *name;
22 /* num matches the id of the xinerama screen 22 /* num matches the id of the xinerama screen
23 * this zone belongs to. 23 * this zone belongs to. */
24 */
25 int num; 24 int num;
26 E_Container *container; 25 E_Container *container;
27 26