Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_canvas.c e_config.c e_config.h e_container.c e_ipc.c 
        e_main.c e_menu.c e_remote_main.c 


Log Message:


fix up config code so i can do lists and structs etc.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_canvas.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_canvas.c  25 Nov 2004 03:37:44 -0000      1.1
+++ e_canvas.c  5 Dec 2004 07:43:50 -0000       1.2
@@ -12,8 +12,8 @@
    
    _e_canvases = evas_list_prepend(_e_canvases, ee);
    e = ecore_evas_get(ee);
-   evas_image_cache_set(e, e_config_val_image_cache * 1024);
-   evas_font_cache_set(e, e_config_val_font_cache * 1024);
+   evas_image_cache_set(e, e_config->image_cache * 1024);
+   evas_font_cache_set(e, e_config->font_cache * 1024);
 //   evas_image_cache_flush(e);
 //   evas_image_cache_reload(e);
 }
@@ -36,8 +36,8 @@
        
        ee = l->data;
        e = ecore_evas_get(ee);
-       evas_image_cache_set(e, e_config_val_image_cache * 1024);
-       evas_font_cache_set(e, e_config_val_font_cache * 1024);
+       evas_image_cache_set(e, e_config->image_cache * 1024);
+       evas_font_cache_set(e, e_config->font_cache * 1024);
      }
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_config.c  25 Nov 2004 03:37:44 -0000      1.1
+++ e_config.c  5 Dec 2004 07:43:51 -0000       1.2
@@ -11,125 +11,67 @@
 #define DEF_MENUCLICK 0.25
 #endif
 
-char   *e_config_val_desktop_default_background = NULL;
-double  e_config_val_menus_scroll_speed = 1000.0;
-double  e_config_val_menus_fast_mouse_move_thresthold = 500.0;
-double  e_config_val_menus_click_drag_timeout = DEF_MENUCLICK;
-double  e_config_val_framerate = 30.0;
-int     e_config_val_image_cache = 2048;
-int     e_config_val_font_cache = 512;
+E_Config *e_config = NULL;
 
 /* local subsystem functions */
 static void _e_config_save_cb(void *data);
 
-static int _e_config_listener_desktop_default_background(const char *key, 
const Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_menus_scroll_speed(const char *key, const 
Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_menus_fast_mouse_move_threshold(const char *key, 
const Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_menus_click_drag_timeout(const char *key, const 
Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_framerate(const char *key, const 
Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_image_cache(const char *key, const 
Ecore_Config_Type type, const int tag, void *data);
-static int _e_config_listener_font_cache(const char *key, const 
Ecore_Config_Type type, const int tag, void *data);
-
 /* local subsystem globals */
 static Ecore_Job *_e_config_save_job = NULL;
+static E_Config_DD *_e_config_edd = NULL;
 
 /* externally accessible functions */
 int
 e_config_init(void)
 {
-   int ret;
-   
-   ecore_config_init("e");
-   
-   ecore_config_string_create
-     ("e.desktop.default.background",
-      PACKAGE_DATA_DIR"/data/themes/default.eet",
-      'b', "default-background",
-      "The default background for desktops without a custom background");
-   ecore_config_float_create_bound
-     ("e.menus.scroll_speed",
-      1000.0, 1.0, 20000.0, 10.0,
-      0, "menus-scroll-speed",
-      "Pixels per second menus scroll around the screen");
-   ecore_config_float_create_bound
-     ("e.menus.fast_mouse_move_threshold",
-      300.0, 1.0, 2000.0, 1.0,
-      0, "menus-scroll-speed",
-      "Pixels per second menus scroll around the screen");
-   ecore_config_float_create_bound
-     ("e.menus.click_drag_timeout",
-      DEF_MENUCLICK, 0.0, 10.0, 0.01,
-      0, "menus-click-drag-timeout",
-      "Seconds after a mouse press when a release will not hide the menu");
-   ecore_config_float_create_bound
-     ("e.framerate",
-      30.0, 1.0, 200.0, 0.1,
-      0, "framerate",
-      "A hint at the framerate (in frames per second) Enlightenment should try 
and animate at");
-   ecore_config_int_create_bound
-     ("e.image-cache",
-      2048, 0, 32768, 1,
-      0, "image-cache",
-      "The mount of memory (in Kb) to use as a sepculative image cache");
-   ecore_config_int_create_bound
-     ("e.font-cache",
-      512, 0, 4096, 1,
-      0, "font-cache",
-      "The mount of memory (in Kb) to use as a sepculative font cache");
-   
-   ecore_config_load();
-   ret = ecore_config_args_parse();
-   
-   e_config_val_desktop_default_background = 
-     ecore_config_string_get("e.desktop.default.background");
-   ecore_config_listen("e.desktop.default.background",
-                      "e.desktop.default.background",
-                      _e_config_listener_desktop_default_background,
-                      0, NULL);
-   e_config_val_menus_scroll_speed =
-     ecore_config_float_get("e.menus.scroll_speed");
-   ecore_config_listen("e.menus.scroll_speed",
-                      "e.menus.scroll_speed",
-                      _e_config_listener_menus_scroll_speed,
-                      0, NULL);
-   e_config_val_menus_fast_mouse_move_thresthold =
-     ecore_config_float_get("e.menus.fast_mouse_move_threshold");
-   ecore_config_listen("e.menus.fast_mouse_move_threshold",
-                      "e.menus.fast_mouse_move_threshold",
-                      _e_config_listener_menus_fast_mouse_move_threshold,
-                      0, NULL);
-   e_config_val_menus_click_drag_timeout =
-     ecore_config_float_get("e.menus.click_drag_timeout");
-   ecore_config_listen("e.menus.click_drag_timeout",
-                      "e.menus.click_drag_timeout",
-                      _e_config_listener_menus_click_drag_timeout,
-                      0, NULL);
-   e_config_val_framerate =
-     ecore_config_float_get("e.framerate");
-   if (e_config_val_framerate <= 0.0) e_config_val_framerate = 30.0;
-   ecore_config_listen("e.framerate",
-                      "e.framerate",
-                      _e_config_listener_framerate,
-                      0, NULL);
-   e_config_val_image_cache =
-     ecore_config_int_get("e.image-cache");
-   ecore_config_listen("e.image-cache",
-                      "e.image-cache",
-                      _e_config_listener_image_cache,
-                      0, NULL);
-   e_config_val_font_cache =
-     ecore_config_int_get("e.font-cache");
-   ecore_config_listen("e.font-cache",
-                      "e.font-cache",
-                      _e_config_listener_font_cache,
-                      0, NULL);
+   _e_config_edd = E_CONFIG_DD_NEW("E_Config", E_Config);   
+#undef T
+#undef D
+#define T E_Config
+#define D _e_config_edd
+   E_CONFIG_VAL(D, T, desktop_default_background, STR);
+   E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE);
+   E_CONFIG_VAL(D, T, menus_fast_mouse_move_thresthold, DOUBLE);
+   E_CONFIG_VAL(D, T, menus_click_drag_timeout, DOUBLE);
+   E_CONFIG_VAL(D, T, framerate, DOUBLE);
+   E_CONFIG_VAL(D, T, image_cache, INT);
+   E_CONFIG_VAL(D, T, font_cache, INT);
+
+   e_config = e_config_domain_load("e", _e_config_edd);
+   if (!e_config) e_config = E_NEW(E_Config, 1);
+   if (e_config)
+     {
+       e_config->desktop_default_background = 
strdup(PACKAGE_DATA_DIR"/data/themes/default.eet");
+       e_config->menus_scroll_speed = 1000.0;
+       e_config->menus_fast_mouse_move_thresthold = 300.0;
+       e_config->menus_click_drag_timeout = DEF_MENUCLICK;
+       e_config->framerate = 30.0;
+       e_config->image_cache = 2048;
+       e_config->font_cache = 512;
+     }
+   else
+     return 0;
+   E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
+   E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_thresthold, 1.0, 2000.0);
+   E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
+   E_CONFIG_LIMIT(e_config->framerate, 1.0, 200.0);
+   E_CONFIG_LIMIT(e_config->image_cache, 0, 256 * 1024);
+   E_CONFIG_LIMIT(e_config->font_cache, 0, 32 * 1024);
    return 1;
 }
 
 int
 e_config_shutdown(void)
 {
-   /* FIXME: unset listeners */
+   if (e_config)
+     {
+       E_FREE(e_config->desktop_default_background);
+       E_FREE(e_config);
+     }
+   if (_e_config_edd)
+     {
+       E_CONFIG_DD_FREE(_e_config_edd);
+     }
    return 1;
 }
 
@@ -141,7 +83,7 @@
        ecore_job_del(_e_config_save_job);
        _e_config_save_job = NULL;
      }
-   return ecore_config_save();
+   return e_config_domain_save("e", _e_config_edd, e_config);
 }
 
 void
@@ -151,98 +93,53 @@
    _e_config_save_job = ecore_job_add(_e_config_save_cb, NULL);
 }
 
-/* local subsystem functions */
-static void
-_e_config_save_cb(void *data)
-{
-   _e_config_save_job = NULL;
-   e_module_save_all();
-   e_config_save();
-}
-
-static int
-_e_config_listener_desktop_default_background(const char *key, const 
Ecore_Config_Type type, const int tag, void *data)
+void *
+e_config_domain_load(char *domain, E_Config_DD *edd)
 {
-   Evas_List *managers, *l;
+   Eet_File *ef;
+   char buf[4096];
+   char *homedir;
+   void *data = NULL;
    
-   if (e_config_val_desktop_default_background)
-     free(e_config_val_desktop_default_background);
-   e_config_val_desktop_default_background = 
-     ecore_config_string_get("e.desktop.default.background");
-   managers = e_manager_list();
-   for (l = managers; l; l = l->next)
-     {
-       Evas_List *ll;
-       E_Manager *man;
-       
-       man = l->data;
-       for (ll = man->containers; ll; ll = ll->next)
-         {
-            E_Container *con;
-            
-            con = ll->data;
-            e_container_bg_reconfigure(con);
-         }
+   homedir = e_user_homedir_get();
+   snprintf(buf, sizeof(buf), "%s/.e/e/config/%s.cfg", homedir, domain);
+   E_FREE(homedir);
+   ef = eet_open(buf, EET_FILE_MODE_READ);
+   if (ef)
+     {
+       data = eet_data_read(ef, edd, "config");
+       eet_close(ef);
      }
-   return 1;
+   return data;
 }
 
-static int
-_e_config_listener_menus_scroll_speed(const char *key, const Ecore_Config_Type 
type, const int tag, void *data)
-{
-   e_config_val_menus_scroll_speed =
-     ecore_config_float_get("e.menus.scroll_speed");
-   return 1;
-}
-
-static int
-_e_config_listener_menus_fast_mouse_move_threshold(const char *key, const 
Ecore_Config_Type type, const int tag, void *data)
-{
-   e_config_val_menus_fast_mouse_move_thresthold =
-     ecore_config_float_get("e.menus.fast_mouse_move_threshold");
-   return 1;
-}
-
-static int
-_e_config_listener_menus_click_drag_timeout(const char *key, const 
Ecore_Config_Type type, const int tag, void *data)
-{
-   e_config_val_menus_click_drag_timeout =
-     ecore_config_float_get("e.menus.click_drag_timeout");
-   return 1;
-}
-
-static int
-_e_config_listener_framerate(const char *key, const Ecore_Config_Type type, 
const int tag, void *data)
+int
+e_config_domain_save(char *domain, E_Config_DD *edd, void *data)
 {
-   e_config_val_framerate =
-     ecore_config_float_get("e.framerate");
-   if (e_config_val_framerate <= 0.0) e_config_val_framerate = 30.0;
-   edje_frametime_set(1.0 / e_config_val_framerate);
-   return 1;
+   Eet_File *ef;
+   char buf[4096];
+   char *homedir;
+   int ok = 0;
+   
+   /* FIXME: check for other sessions fo E runing */
+   homedir = e_user_homedir_get();
+   snprintf(buf, sizeof(buf), "%s/.e/e/config/%s.cfg", homedir, domain);
+   E_FREE(homedir);
+   ef = eet_open(buf, EET_FILE_MODE_WRITE);
+   if (ef)
+     {
+       ok = eet_data_write(ef, edd, "config", data, 0);
+       eet_close(ef);
+     }
+   return ok;
 }
 
-static int
-_e_config_listener_image_cache(const char *key, const Ecore_Config_Type type, 
const int tag, void *data)
+/* local subsystem functions */
+static void
+_e_config_save_cb(void *data)
 {
-   e_config_val_image_cache =
-     ecore_config_int_get("e.image-cache");
-   ecore_config_listen("e.image-cache",
-                      "e.image-cache",
-                      _e_config_listener_image_cache,
-                      0, NULL);
-   e_canvas_recache();
-   return 1;
-}
+   e_module_save_all();
 
-static int
-_e_config_listener_font_cache(const char *key, const Ecore_Config_Type type, 
const int tag, void *data)
-{
-   e_config_val_font_cache =
-     ecore_config_int_get("e.font-cache");
-   ecore_config_listen("e.font-cache",
-                      "e.font-cache",
-                      _e_config_listener_font_cache,
-                      0, NULL);
-   e_canvas_recache();
-   return 1;
+   e_config_domain_save("e", _e_config_edd, e_config);
+   _e_config_save_job = NULL;
 }
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_config.h  25 Nov 2004 05:31:20 -0000      1.2
+++ e_config.h  5 Dec 2004 07:43:51 -0000       1.3
@@ -1,18 +1,63 @@
 #ifndef E_CONFIG_H
 #define E_CONFIG_H
 
+typedef struct _E_Config    E_Config;
+typedef Eet_Data_Descriptor E_Config_DD;
+
+struct _E_Config
+{
+   char    *desktop_default_background;
+   double   menus_scroll_speed;
+   double   menus_fast_mouse_move_thresthold;
+   double   menus_click_drag_timeout;
+   double   framerate;
+   int      image_cache;
+   int      font_cache;
+};
+
+#define E_CONFIG_DD_NEW(str, typ) \
+   eet_data_descriptor_new(str, sizeof(typ), \
+                             (void *(*) (void *))evas_list_next, \
+                             (void *(*) (void *, void *))evas_list_append, \
+                             (void *(*) (void *))evas_list_data, \
+                             (void *(*) (void *))evas_list_free, \
+                             (void  (*) (void *, int (*) (void *, const char 
*, void *, void *), void *))evas_hash_foreach, \
+                             (void *(*) (void *, const char *, void 
*))evas_hash_add, \
+                             (void  (*) (void *))evas_hash_free)
+#define E_CONFIG_DD_FREE(eed) \
+       if (eed) { eet_data_descriptor_free((eed)); (eed) = NULL; }
+
+#define E_CONFIG_VAL(edd, type, member, dtype) \
+       EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
+#define E_CONFIG_SUB(edd, type, member, eddtype) \
+       EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
+#define E_CONFIG_LIST(edd, type, member, eddtype) \
+       EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
+
+#define CHAR   EET_T_CHAR
+#define SHORT  EET_T_SHORT
+#define INT    EET_T_INT
+#define LL     EET_T_LONG_LONG
+#define FLOAT  EET_T_FLOAT
+#define DOUBLE EET_T_DOUBLE
+#define UCHAR  EET_T_UCHAR
+#define USHORT EET_T_USHORT
+#define UINT   EET_T_UINT
+#define ULL    EET_T_ULONG_LONG
+#define STR    EET_T_STRING
+
+#define E_CONFIG_LIMIT(v, min, max) \
+{if (v > max) v = max; else if (v < min) v = min;}
+
 EAPI int e_config_init(void);
 EAPI int e_config_shutdown(void);
 
+EAPI void *e_config_domain_load(char *domain, E_Config_DD *edd);
+EAPI int   e_config_domain_save(char *domain, E_Config_DD *edd, void *data);
+
 EAPI int e_config_save(void);
 EAPI void e_config_save_queue(void);
-    
-extern EAPI char   *e_config_val_desktop_default_background;
-extern EAPI double  e_config_val_menus_scroll_speed;
-extern EAPI double  e_config_val_menus_fast_mouse_move_thresthold;
-extern EAPI double  e_config_val_menus_click_drag_timeout;
-extern EAPI double  e_config_val_framerate;
-extern EAPI int     e_config_val_image_cache;
-extern EAPI int     e_config_val_font_cache;
+
+extern EAPI E_Config *e_config;
 
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_container.c       25 Nov 2004 03:37:44 -0000      1.1
+++ e_container.c       5 Dec 2004 07:43:51 -0000       1.2
@@ -77,7 +77,7 @@
        evas_object_move(o, 0, 0);
        evas_object_resize(o, con->w, con->h);
        edje_object_file_set(o,
-                            e_config_val_desktop_default_background,
+                            e_config->desktop_default_background,
                             "desktop/background");
        evas_object_show(o);
        
@@ -171,7 +171,7 @@
    o = con->bg_object;
    evas_object_hide(o);
    edje_object_file_set(o,
-                       e_config_val_desktop_default_background,
+                       e_config->desktop_default_background,
                        "desktop/background");
    evas_object_layer_set(o, -1);
    evas_object_show(o);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_ipc.c     1 Dec 2004 07:01:31 -0000       1.3
+++ e_ipc.c     5 Dec 2004 07:43:51 -0000       1.4
@@ -171,32 +171,33 @@
        break;
       case E_IPC_OP_BG_SET:
          {
-           char *file;
-           char *valstr;
-           Evas_List *cl;
-           int cont;
-                     
-
-            file = malloc(e->size + 1);
-            file[e->size] = 0;
-            memcpy(file, e->data, e->size);
-
-           valstr=strdup("desktop/background");
-           cl=edje_file_collection_list(file);
-            cont=1;
-           while(cl && cont)
-             {
-                if(!strcmp(cl->data,valstr))
-               {
-                 cont=0;
-                 ecore_config_string_set("e.desktop.default.background", file);
-               }
-               else
-                cl++;
-            }
-           edje_file_collection_list_free(cl);
-           free(valstr);
-            free(file);
+            char *file;
+            char *valstr;
+            Evas_List *managers, *l;
+            int cont;
+            
+            file = malloc(e->size + 1);
+            file[e->size] = 0;
+            memcpy(file, e->data, e->size);
+            E_FREE(e_config->desktop_default_background);
+            e_config->desktop_default_background = file;
+            
+            managers = e_manager_list();
+            for (l = managers; l; l = l->next)
+              {
+                 Evas_List *ll;
+                 E_Manager *man;
+                 
+                 man = l->data;
+                 for (ll = man->containers; ll; ll = ll->next)
+                   {
+                      E_Container *con;
+                      
+                      con = ll->data;
+                      e_container_bg_reconfigure(con);
+                   }
+              }
+            e_config_save_queue();
           }
       default:
        break;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_main.c    3 Dec 2004 08:56:28 -0000       1.7
+++ e_main.c    5 Dec 2004 07:43:51 -0000       1.8
@@ -161,8 +161,8 @@
      }
    _e_main_shutdown_push(e_config_shutdown);
    
-   /* setup edje to animate @ e_config_val_framerate frames per sec. */
-   edje_frametime_set(1.0 / e_config_val_framerate);
+   /* setup edje to animate @ e_config->framerate frames per sec. */
+   edje_frametime_set(1.0 / e_config->framerate);
    e_canvas_recache();
    
    /* setup init status window/screen */
@@ -375,7 +375,8 @@
        "%s/.e/e/applications/all",
        "%s/.e/e/applications/favorite",
        "%s/.e/e/applications/bar",
-       "%s/.e/e/modules"
+       "%s/.e/e/modules",
+       "%s/.e/e/config"
      };
    int i;
    
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_menu.c    25 Nov 2004 03:37:44 -0000      1.1
+++ e_menu.c    5 Dec 2004 07:43:51 -0000       1.2
@@ -1913,7 +1913,7 @@
    if (ev->win != _e_menu_win) return 1;
    t = ecore_time_get();
    if ((_e_menu_activate_time != 0.0) && 
-       ((t - _e_menu_activate_time) < e_config_val_menus_click_drag_timeout))
+       ((t - _e_menu_activate_time) < e_config->menus_click_drag_timeout))
      return 1;
    ret = _e_menu_active_call();
    if (ret == 1)
@@ -1938,7 +1938,7 @@
    
    ev = event;
    if (ev->win != _e_menu_win) return 1;
-   fast_move_threshold = e_config_val_menus_fast_mouse_move_thresthold;
+   fast_move_threshold = e_config->menus_fast_mouse_move_thresthold;
    dx = ev->x - _e_menu_x;
    dy = ev->y - _e_menu_y;
    d = (dx * dx) + (dy * dy);
@@ -2023,7 +2023,7 @@
    double spd;
    
    t = ecore_time_get();
-   spd = e_config_val_menus_scroll_speed;
+   spd = e_config->menus_scroll_speed;
    dt = t - _e_menu_scroll_start;
    _e_menu_scroll_start = t;
    dx = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_remote_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_remote_main.c     2 Dec 2004 04:24:54 -0000       1.4
+++ e_remote_main.c     5 Dec 2004 07:43:51 -0000       1.5
@@ -34,18 +34,18 @@
 #define SIMPLE_STR_REQ 1
 #define FULL_FUNC      2
 
-#define REQ(opt, desc, ipc, rep) {opt, desc, 0, rep, SIMPLE_REQ, ipc, NULL}
-#define STR(opt, desc, ipc, rep) {opt, desc, 1, rep, SIMPLE_STR_REQ, ipc, NULL}
-#define FNC(opt, desc, param, fn, rep) {opt, desc, param, rep, SIMPLE_FUNC, 0, 
fn}
+#define OREQ(opt, desc, ipc, rep) {opt, desc, 0, rep, SIMPLE_REQ, ipc, NULL}
+#define OSTR(opt, desc, ipc, rep) {opt, desc, 1, rep, SIMPLE_STR_REQ, ipc, 
NULL}
+#define OFNC(opt, desc, param, fn, rep) {opt, desc, param, rep, SIMPLE_FUNC, 
0, fn}
 
 E_IPC_Opt_Handler handlers[] =
 {
-   STR("-module-load", "Load module OPT1 into memory", E_IPC_OP_MODULE_LOAD, 
0),
-   STR("-module-unload", "Unload (and disable) module OPT1 from memory", 
E_IPC_OP_MODULE_UNLOAD, 0),
-   STR("-module-enable", "Enable module OPT1 if not enabled", 
E_IPC_OP_MODULE_ENABLE, 0),
-   STR("-module-disable", "Disable module OPT1 if not disabled", 
E_IPC_OP_MODULE_DISABLE, 0),
-   REQ("-module-list", "List all loaded modules and their states", 
E_IPC_OP_MODULE_LIST, 1),
-   STR("-bg-set", "Set the background edje file to be OPT1", E_IPC_OP_BG_SET, 
0)
+   OSTR("-module-load", "Load module OPT1 into memory", E_IPC_OP_MODULE_LOAD, 
0),
+   OSTR("-module-unload", "Unload (and disable) module OPT1 from memory", 
E_IPC_OP_MODULE_UNLOAD, 0),
+   OSTR("-module-enable", "Enable module OPT1 if not enabled", 
E_IPC_OP_MODULE_ENABLE, 0),
+   OSTR("-module-disable", "Disable module OPT1 if not disabled", 
E_IPC_OP_MODULE_DISABLE, 0),
+   OREQ("-module-list", "List all loaded modules and their states", 
E_IPC_OP_MODULE_LIST, 1),
+   OSTR("-bg-set", "Set the background edje file to be OPT1", E_IPC_OP_BG_SET, 
0)
 };
 
 /* externally accessible functions */




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now. 
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to