Small updates.

Move from e_file to ecore_file

SVN revision: 13456

diff --git a/src/bin/e.h b/src/bin/e.h
index 7af3e04..0e0696d 100644 (file)
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -23,6 +23,7 @@
 #include <Ecore_Job.h>
 #include <Ecore_Txt.h>
 #include <Ecore_Config.h>
+#include <Ecore_File.h>
 #include <Ecore_X_Atoms.h>
 #include <Eet.h>
 #include <Edje.h>

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 33431d3..e54077e 100644 (file)
--- 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)
 
    /* FIXME: if first_map is 1 then we should ignore the first hide event
     * or ensure the window is alreayd hidden and events flushed before we
-    * create a border for it
-    */
+    * create a border for it */
    if (first_map)
      {
        printf("##- FIRST MAP\n");

diff --git a/src/bin/e_file.c b/src/bin/e_file.c
index 06d09b1..d143b75 100644 (file)
--- a/src/bin/e_file.c
+++ b/src/bin/e_file.c
@@ -4,6 +4,7 @@
 #include "e.h"
 #include <dirent.h>
 
+#if 0
 /* externally accessible functions */
 time_t
 e_file_mod_time(char *file)
@@ -202,3 +203,4 @@ e_file_ls(char *dir)
 
    return list;
 }
+#endif

diff --git a/src/bin/e_file.h b/src/bin/e_file.h
index 7e1e38a..93c35c5 100644 (file)
--- a/src/bin/e_file.h
+++ b/src/bin/e_file.h
@@ -6,6 +6,7 @@
 #ifndef E_FILE_H
 #define E_FILE_H
 
+#if 0
 EAPI time_t     e_file_mod_time(char *file);
 EAPI int        e_file_exists(char *file);
 EAPI int        e_file_is_dir(char *file);
@@ -19,6 +20,7 @@ EAPI char      *e_file_get_dir(char *path);
 EAPI int        e_file_can_exec(struct stat *st);
 EAPI char      *e_file_readlink(char *link);
 EAPI Evas_List *e_file_ls(char *dir);
+#endif
 
 #endif
 #endif

diff --git a/src/bin/e_gadman.c b/src/bin/e_gadman.c
index e6db9cc..5ac7e0d 100644 (file)
--- 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)
    gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
    _e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
    _e_gadman_client_geometry_apply(gmc);
+   _e_gadman_client_geometry_to_align(gmc);
 }
 
 void

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 8ef5b6a..756dbaf 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
      }
    _e_main_shutdown_push(ecore_shutdown);
    /* setup my args */
-   ecore_app_args_set((int)argc, (const char **)argv);
+   ecore_app_args_set(argc, (const char **)argv);
    /* setup a handler for when e is asked to exit via a system signal */
    if (!ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _e_main_cb_signal_exit, NULL))
      {
@@ -443,7 +443,7 @@ _e_main_dirs_init(void)
    for (i = 0; i < (int)(sizeof(dirs) / sizeof(char *)); i++)
      {
        snprintf(buf, sizeof(buf), dirs[i], homedir);
-       if (!e_file_mkpath(buf))
+       if (!ecore_file_mkpath(buf))
          {
             e_error_message_show("Error creating directory:\n"
                                  "%s",
@@ -458,7 +458,7 @@ _e_main_dirs_init(void)
    /* outside e's main source to populate these directories from gnome/kde */
    /* app menu data etc. */
    snprintf(buf, sizeof(buf), "%s/.e/e/applications/all/eterm.eapp", homedir);
-   if (!e_file_exists(buf))
+   if (!ecore_file_exists(buf))
      {
        printf("GETTING YOU STARTED!\n");
        snprintf(buf, sizeof(buf), 

diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index b81dfea..f057a02 100644 (file)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -140,10 +140,10 @@ e_module_new(char *name)
      }
    _e_modules = evas_list_append(_e_modules, m);
    m->name = strdup(name);
-   s = e_file_get_dir(modpath);
+   s = ecore_file_get_dir(modpath);
    if (s)
      {
-       m->dir = e_file_get_dir(s);
+       m->dir = ecore_file_get_dir(s);
        free(s);
      }
    m->func.info(m);

diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index 71209ec..dd7a8d3 100644 (file)
--- 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)
        if (p)
          {
             snprintf(_e_path_buf, sizeof(_e_path_buf), "%s/%s", p, file);
-            rp = e_file_realpath(_e_path_buf);
+            rp = ecore_file_realpath(_e_path_buf);
             if ((rp) && (rp[0] != 0))
               {
                  strcpy(_e_path_buf, rp);

diff --git a/src/bin/e_zone.h b/src/bin/e_zone.h
index 0b393a5..9f30b62 100644 (file)
--- a/src/bin/e_zone.h
+++ b/src/bin/e_zone.h
@@ -20,8 +20,7 @@ struct _E_Zone
    int                  x, y, w, h;
    char                *name;
    /* num matches the id of the xinerama screen
-    * this zone belongs to.
-    */
+    * this zone belongs to. */
    int                  num;
    E_Container         *container;