Enlightenment CVS committal

Author  : mej
Project : e_modules
Module  : mount

Dir     : e_modules/mount


Modified Files:
        e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h 


Log Message:
Mon Jan 30 15:22:33 2006                        Michael Jennings (mej)

mount's turn.
----------------------------------------------------------------------

===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_config.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_config.c      30 Jan 2006 05:12:48 -0000      1.11
+++ e_mod_config.c      30 Jan 2006 20:22:49 -0000      1.12
@@ -5,34 +5,35 @@
 
 typedef struct _Cfg_File_Data Cfg_File_Data;
 
-struct _E_Config_Dialog_Data {
-   int                 iconsize;
-   int                 orientation;
-   int                 show_labels;
+struct _E_Config_Dialog_Data
+{
+   int iconsize;
+   int orientation;
+   int show_labels;
 };
 
-struct _Cfg_File_Data {
-   E_Config_Dialog    *cfd;
-   char               *file;
+struct _Cfg_File_Data
+{
+   E_Config_Dialog *cfd;
+   char *file;
 };
 
 /* Protos */
-static void        *_create_data(E_Config_Dialog * cfd);
-static void         _free_data(E_Config_Dialog * cfd,
-                               E_Config_Dialog_Data * cfdata);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas,
-                                          E_Config_Dialog_Data * cfdata);
-static int          _basic_apply_data(E_Config_Dialog * cfd,
-                                      E_Config_Dialog_Data * cfdata);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog * cfd, Evas * 
evas,
-                                             E_Config_Dialog_Data * cfdata);
-static int          _advanced_apply_data(E_Config_Dialog * cfd,
-                                         E_Config_Dialog_Data * cfdata);
+static void *_create_data(E_Config_Dialog *cfd);
+static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+                                          E_Config_Dialog_Data *cfdata);
+static int _basic_apply_data(E_Config_Dialog *cfd,
+                             E_Config_Dialog_Data *cfdata);
+static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+                                             E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd,
+                                E_Config_Dialog_Data *cfdata);
 
 void
-_config_mount_module(E_Container * con, Mount * m)
+_config_mount_module(E_Container *con, Mount *m)
 {
-   E_Config_Dialog    *cfd;
+   E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -49,28 +50,29 @@
 }
 
 static void
-_fill_data(Mount * m, E_Config_Dialog_Data * cfdata)
+_fill_data(Mount *m, E_Config_Dialog_Data *cfdata)
 {
    cfdata->iconsize = m->conf->icon_size;
    cfdata->orientation = m->conf->orientation;
    cfdata->show_labels = m->conf->show_labels;
 }
 
-static void        *
-_create_data(E_Config_Dialog * cfd)
+static void *
+_create_data(E_Config_Dialog *cfd)
 {
    E_Config_Dialog_Data *cfdata;
-   Mount              *m;
+   Mount *m;
 
    m = cfd->data;
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
    return cfdata;
 }
 
 static void
-_free_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   Mount              *m;
+   Mount *m;
 
    m = cfd->data;
    m->config_dialog = NULL;
@@ -78,12 +80,12 @@
 }
 
 static Evas_Object *
-_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas,
-                      E_Config_Dialog_Data * cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+                      E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object        *o, *ob, *of;
-   E_Radio_Group      *rg;
-   Mount              *m;
+   Evas_Object *o, *ob, *of;
+   E_Radio_Group *rg;
+   Mount *m;
 
    m = cfd->data;
    _fill_data(m, cfdata);
@@ -108,9 +110,9 @@
 }
 
 static int
-_basic_apply_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   Mount              *m;
+   Mount *m;
 
    m = cfd->data;
    e_border_button_bindings_ungrab_all();
@@ -124,12 +126,12 @@
 }
 
 static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog * cfd, Evas * evas,
-                         E_Config_Dialog_Data * cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+                         E_Config_Dialog_Data *cfdata)
 {
-   Evas_Object        *o, *ob, *of;
-   E_Radio_Group      *rg;
-   Mount              *m;
+   Evas_Object *o, *ob, *of;
+   E_Radio_Group *rg;
+   Mount *m;
 
    m = cfd->data;
    _fill_data(m, cfdata);
@@ -159,9 +161,9 @@
 }
 
 static int
-_advanced_apply_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
-   Mount              *m;
+   Mount *m;
 
    m = cfd->data;
    e_border_button_bindings_ungrab_all();
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.h      30 Jan 2006 05:12:48 -0000      1.5
+++ e_mod_config.h      30 Jan 2006 20:22:49 -0000      1.6
@@ -3,6 +3,6 @@
 #ifndef E_MOD_CONFIG_H
 #define E_MOD_CONFIG_h
 #include "e_mod_main.h"
-void                _config_mount_module(E_Container * con, Mount * m);
+void _config_mount_module(E_Container *con, Mount *m);
 #endif
 #endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.c        30 Jan 2006 05:12:48 -0000      1.17
+++ e_mod_main.c        30 Jan 2006 20:22:49 -0000      1.18
@@ -7,64 +7,62 @@
 #include "e_mod_config.h"
 #include "config.h"
 
-static int          bar_count;
+static int bar_count;
 static Ecore_Event_Handler *_mount_exe_exit_handler = NULL;
 
 /* Private Module Routines Prototypes */
-static void         _parse_fstab(Mount * mnt);
-static int          _parse_file(char *file, Mount_Point * mntpoint);
-static void         _setup_mountpoints(Mount * mnt);
-static int          _is_mounted(Mount_Point * mntpoint);
-
-static Mount       *_mount_new(E_Module * m);
-static int          _mount_box_init(Mount_Box * mntbox);
-static Mount_Icon  *_mount_icon_new(Mount_Box * mntbox, Mount_Point * point);
-static void         _mount_mountpoint(Mount_Icon * mnticon);
-static void         _unmount_mountpoint(Mount_Icon * mnticon);
-static void         _eject_mountpoint(Mount_Icon * mnticon);
-static void         _mount_free(Mount * mnt);
-static void         _mount_box_free(Mount_Box * mntbox);
-static void         _mount_box_icon_free(Mount_Icon * mnticon);
-static void         _mount_config_menu_new(Mount * mnt);
-static void         _mount_box_menu_new(Mount_Box * mntbox);
-static void         _mount_box_disable(Mount_Box * mntbox);
-static void         _mount_box_cb_menu_edit(void *data, E_Menu * mn,
-                                            E_Menu_Item * mi);
-static void         _mount_box_cb_menu_configure(void *data, E_Menu * mn,
-                                                 E_Menu_Item * mi);
-
-static void         _mount_box_cb_gmc_change(void *data, E_Gadman_Client * gmc,
-                                             E_Gadman_Change change);
-static void         _mount_box_cb_intercept_move(void *data, Evas_Object * o,
-                                                 Evas_Coord x, Evas_Coord y);
-static void         _mount_box_cb_intercept_resize(void *data, Evas_Object * o,
-                                                   Evas_Coord w, Evas_Coord h);
-static void         _mount_icon_cb_intercept_move(void *data, Evas_Object * o,
-                                                  Evas_Coord x, Evas_Coord y);
-static void         _mount_icon_cb_intercept_resize(void *data, Evas_Object * 
o,
-                                                    Evas_Coord w, Evas_Coord 
h);
-static void         _mount_box_iconsize_change(Mount_Box * mntbox);
-static void         _mount_box_cb_mouse_down(void *data, Evas * e,
-                                             Evas_Object * obj,
-                                             void *event_info);
-static void         _change_orient_horiz(Mount * mnt);
-static void         _change_orient_vert(Mount * mnt);
-static void         _set_state(Mount_Icon * ic);
-static void         _mount_icon_cb_edje_mouse_down(void *data, Evas_Object * o,
-                                                   const char *emission,
-                                                   const char *source);
-static int          _mount_exe_cb_exit(void *data, int type, void *event);
+static void _parse_fstab(Mount *mnt);
+static int _parse_file(char *file, Mount_Point *mntpoint);
+static void _setup_mountpoints(Mount *mnt);
+static int _is_mounted(Mount_Point *mntpoint);
+
+static Mount *_mount_new(E_Module *m);
+static int _mount_box_init(Mount_Box *mntbox);
+static Mount_Icon *_mount_icon_new(Mount_Box *mntbox, Mount_Point *point);
+static void _mount_mountpoint(Mount_Icon *mnticon);
+static void _unmount_mountpoint(Mount_Icon *mnticon);
+static void _eject_mountpoint(Mount_Icon *mnticon);
+static void _mount_free(Mount *mnt);
+static void _mount_box_free(Mount_Box *mntbox);
+static void _mount_box_icon_free(Mount_Icon *mnticon);
+static void _mount_config_menu_new(Mount *mnt);
+static void _mount_box_menu_new(Mount_Box *mntbox);
+static void _mount_box_disable(Mount_Box *mntbox);
+static void _mount_box_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
+static void _mount_box_cb_menu_configure(void *data, E_Menu *mn,
+                                         E_Menu_Item *mi);
+
+static void _mount_box_cb_gmc_change(void *data, E_Gadman_Client *gmc,
+                                     E_Gadman_Change change);
+static void _mount_box_cb_intercept_move(void *data, Evas_Object *o,
+                                         Evas_Coord x, Evas_Coord y);
+static void _mount_box_cb_intercept_resize(void *data, Evas_Object *o,
+                                           Evas_Coord w, Evas_Coord h);
+static void _mount_icon_cb_intercept_move(void *data, Evas_Object *o,
+                                          Evas_Coord x, Evas_Coord y);
+static void _mount_icon_cb_intercept_resize(void *data, Evas_Object *o,
+                                            Evas_Coord w, Evas_Coord h);
+static void _mount_box_iconsize_change(Mount_Box *mntbox);
+static void _mount_box_cb_mouse_down(void *data, Evas *e,
+                                     Evas_Object *obj, void *event_info);
+static void _change_orient_horiz(Mount *mnt);
+static void _change_orient_vert(Mount *mnt);
+static void _set_state(Mount_Icon *ic);
+static void _mount_icon_cb_edje_mouse_down(void *data, Evas_Object *o,
+                                           const char *emission,
+                                           const char *source);
+static int _mount_exe_cb_exit(void *data, int type, void *event);
 
 /* Begin Required Module Routines */
-EAPI E_Module_Api   e_modapi = {
+EAPI E_Module_Api e_modapi = {
    E_MODULE_API_VERSION,
    "Mount"
 };
 
-EAPI void          *
-e_modapi_init(E_Module * m)
+EAPI void *
+e_modapi_init(E_Module *m)
 {
-   Mount              *mnt;
+   Mount *mnt;
 
    mnt = _mount_new(m);
    m->config_menu = mnt->config_menu;
@@ -72,9 +70,9 @@
 }
 
 EAPI int
-e_modapi_shutdown(E_Module * m)
+e_modapi_shutdown(E_Module *m)
 {
-   Mount              *mnt;
+   Mount *mnt;
 
    mnt = m->data;
    if (mnt)
@@ -96,9 +94,9 @@
 }
 
 EAPI int
-e_modapi_save(E_Module * m)
+e_modapi_save(E_Module *m)
 {
-   Mount              *mnt;
+   Mount *mnt;
 
    mnt = m->data;
    if (mnt)
@@ -108,14 +106,14 @@
 }
 
 EAPI int
-e_modapi_info(E_Module * m)
+e_modapi_info(E_Module *m)
 {
    m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
    return 1;
 }
 
 EAPI int
-e_modapi_about(E_Module * m)
+e_modapi_about(E_Module *m)
 {
    e_module_dialog_show(_("Enlightenment Mount Module"),
                         _("This is a mount module to mount/unmount devices."));
@@ -123,9 +121,9 @@
 }
 
 EAPI int
-e_modapi_config(E_Module * m)
+e_modapi_config(E_Module *m)
 {
-   Mount              *mnt;
+   Mount *mnt;
 
    mnt = m->data;
    if (mnt)
@@ -136,22 +134,22 @@
 
 /* Begin Private Module Routines */
 static void
-_setup_mountpoints(Mount * mnt)
+_setup_mountpoints(Mount *mnt)
 {
    /* Parse fstab for user mountable devices */
    _parse_fstab(mnt);
 }
 
 static void
-_parse_fstab(Mount * mnt)
+_parse_fstab(Mount *mnt)
 {
-   FILE               *f;
-   char                s[1024];
-   char               *token = NULL;
-   char               *info[4];
-   int                 i, user_mnt;
-   char               *p;
-   Mount_Point        *point;
+   FILE *f;
+   char s[1024];
+   char *token = NULL;
+   char *info[4];
+   int i, user_mnt;
+   char *p;
+   Mount_Point *point;
 
    if ((f = fopen(FSTAB, "r")) == NULL)
      {
@@ -194,6 +192,7 @@
         if (user_mnt)
           {
              point = E_NEW(Mount_Point, 1);
+
              if (!point)
                 return;
              point->device = strdup(info[0]);
@@ -280,14 +279,14 @@
 }
 
 static int
-_parse_file(char *fl, Mount_Point * mntpoint)
+_parse_file(char *fl, Mount_Point *mntpoint)
 {
-   FILE               *f;
-   char                s[1024];
-   char               *token = NULL;
-   char               *device = NULL;
-   char               *path = NULL;
-   int                 mounted;
+   FILE *f;
+   char s[1024];
+   char *token = NULL;
+   char *device = NULL;
+   char *path = NULL;
+   int mounted;
 
    mounted = 0;
    if ((f = fopen(fl, "r")) == NULL)
@@ -318,9 +317,9 @@
 }
 
 static int
-_is_mounted(Mount_Point * mntpoint)
+_is_mounted(Mount_Point *mntpoint)
 {
-   int                 mounted;
+   int mounted;
 
    /* Check proc mounts */
    mounted = _parse_file(PROCMOUNTS, mntpoint);
@@ -335,7 +334,7 @@
 }
 
 static void
-_mount_free(Mount * mnt)
+_mount_free(Mount *mnt)
 {
    _mount_box_free(mnt->box);
 
@@ -348,7 +347,7 @@
 
    while (mnt->mntpoints)
      {
-        Mount_Point        *point;
+        Mount_Point *point;
 
         point = mnt->mntpoints->data;
         if (point->device)
@@ -368,7 +367,7 @@
 }
 
 static void
-_mount_box_free(Mount_Box * mntbox)
+_mount_box_free(Mount_Box *mntbox)
 {
    if (mntbox->con)
       e_object_unref(E_OBJECT(mntbox->con));
@@ -398,7 +397,7 @@
 }
 
 static void
-_mount_box_icon_free(Mount_Icon * mnticon)
+_mount_box_icon_free(Mount_Icon *mnticon)
 {
    mnticon->mntbox->icons = evas_list_remove(mnticon->mntbox->icons, mnticon);
 
@@ -415,16 +414,17 @@
    free(mnticon);
 }
 
-static Mount       *
-_mount_new(E_Module * m)
+static Mount *
+_mount_new(E_Module *m)
 {
-   Mount              *mnt;
-   Evas_List          *managers, *l, *l2;
+   Mount *mnt;
+   Evas_List *managers, *l, *l2;
 
    bar_count = 0;
 
    /* Create New Mount Module Structure */
    mnt = E_NEW(Mount, 1);
+
    if (!mnt)
       return NULL;
 
@@ -445,6 +445,7 @@
      {
         /* Create New Config */
         mnt->conf = E_NEW(Config, 1);
+
         mnt->conf->icon_size = 24;
         mnt->conf->orientation = MOUNT_ORIENT_HORIZ;
         mnt->conf->show_labels = 1;
@@ -466,21 +467,22 @@
 
    for (l = managers; l; l = l->next)
      {
-        E_Manager          *man;
+        E_Manager *man;
 
         man = l->data;
         for (l2 = man->containers; l2; l2 = l2->next)
           {
-             E_Container        *con;
-             Mount_Box          *mntbox;
-             E_Menu_Item        *mi;
+             E_Container *con;
+             Mount_Box *mntbox;
+             E_Menu_Item *mi;
 
              con = l2->data;
              mntbox = E_NEW(Mount_Box, 1);
+
              if (mntbox)
                {
                   mntbox->conf_box_edd =
-                      E_CONFIG_DD_NEW("Mount_Config_Box", Config_Box);
+                     E_CONFIG_DD_NEW("Mount_Config_Box", Config_Box);
 #undef T
 #undef D
 #define T Config_Box
@@ -516,22 +518,22 @@
 }
 
 static void
-_mount_config_menu_new(Mount * mnt)
+_mount_config_menu_new(Mount *mnt)
 {
-   E_Menu             *mn;
+   E_Menu *mn;
 
    mn = e_menu_new();
    mnt->config_menu = mn;
 }
 
 static int
-_mount_box_init(Mount_Box * mntbox)
+_mount_box_init(Mount_Box *mntbox)
 {
-   Evas_Object        *o;
-   Evas_List          *l;
-   E_Gadman_Policy     policy;
-   Evas_Coord          x, y, w, h;
-   char                buffer[1024];
+   Evas_Object *o;
+   Evas_List *l;
+   E_Gadman_Policy policy;
+   Evas_Coord x, y, w, h;
+   char buffer[1024];
 
    if (!mntbox)
       return 0;
@@ -575,8 +577,8 @@
         for (l = mntbox->mnt->mntpoints; l; l = l->next)
           {
              /* Create New Icon */
-             Mount_Icon         *mnticon;
-             Mount_Point        *point;
+             Mount_Icon *mnticon;
+             Mount_Point *point;
 
              point = l->data;
              mnticon = _mount_icon_new(mntbox, point);
@@ -609,7 +611,7 @@
    evas_object_del(o);
 
    policy =
-       E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE | 
E_GADMAN_POLICY_VMOVE;
+      E_GADMAN_POLICY_ANYWHERE | E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_VMOVE;
    mntbox->gmc = e_gadman_client_new(mntbox->con->gadman);
    e_gadman_client_domain_set(mntbox->gmc, "module.mount", bar_count++);
    e_gadman_client_policy_set(mntbox->gmc, policy);
@@ -637,10 +639,10 @@
 }
 
 static void
-_mount_box_menu_new(Mount_Box * mntbox)
+_mount_box_menu_new(Mount_Box *mntbox)
 {
-   E_Menu             *mn;
-   E_Menu_Item        *mi;
+   E_Menu *mn;
+   E_Menu_Item *mi;
 
    mn = e_menu_new();
    mntbox->menu = mn;
@@ -655,10 +657,10 @@
 }
 
 static void
-_mount_box_cb_menu_configure(void *data, E_Menu * m, E_Menu_Item * mi)
+_mount_box_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
 {
-   Mount_Box          *mntbox;
-   Mount              *mnt;
+   Mount_Box *mntbox;
+   Mount *mnt;
 
    mntbox = data;
    if (!mntbox)
@@ -668,7 +670,7 @@
 }
 
 static void
-_mount_box_disable(Mount_Box * mntbox)
+_mount_box_disable(Mount_Box *mntbox)
 {
    mntbox->conf->enabled = 0;
    if (mntbox->bar_object)
@@ -681,56 +683,57 @@
 }
 
 static void
-_mount_box_cb_menu_edit(void *data, E_Menu * mn, E_Menu_Item * mi)
+_mount_box_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi)
 {
-   Mount_Box          *mntbox;
+   Mount_Box *mntbox;
 
    mntbox = data;
    e_gadman_mode_set(mntbox->gmc->gadman, E_GADMAN_MODE_EDIT);
 }
 
 static void
-_mount_box_cb_gmc_change(void *data, E_Gadman_Client * gmc,
+_mount_box_cb_gmc_change(void *data, E_Gadman_Client *gmc,
                          E_Gadman_Change change)
 {
-   Mount_Box          *mntbox;
+   Mount_Box *mntbox;
 
    mntbox = data;
    switch (change)
      {
-       case E_GADMAN_CHANGE_MOVE_RESIZE:
-          e_gadman_client_geometry_get(mntbox->gmc, &mntbox->x, &mntbox->y,
-                                       &mntbox->w, &mntbox->h);
-          edje_extern_object_min_size_set(mntbox->box_object, 0, 0);
-          edje_object_part_swallow(mntbox->bar_object, "items",
-                                   mntbox->box_object);
-
-          evas_object_move(mntbox->bar_object, mntbox->x, mntbox->y);
-          evas_object_move(mntbox->event_object, mntbox->x, mntbox->y);
-          evas_object_move(mntbox->box_object, mntbox->x, mntbox->y);
-
-          evas_object_resize(mntbox->bar_object, mntbox->w, mntbox->h);
-          evas_object_resize(mntbox->event_object, mntbox->w, mntbox->h);
-          evas_object_resize(mntbox->box_object, mntbox->w, mntbox->h);
-          break;
-       case E_GADMAN_CHANGE_EDGE:
-          break;
-       case E_GADMAN_CHANGE_ZONE:
-          break;
-       case E_GADMAN_CHANGE_RAISE:
-          break;
+     case E_GADMAN_CHANGE_MOVE_RESIZE:
+        e_gadman_client_geometry_get(mntbox->gmc, &mntbox->x, &mntbox->y,
+                                     &mntbox->w, &mntbox->h);
+        edje_extern_object_min_size_set(mntbox->box_object, 0, 0);
+        edje_object_part_swallow(mntbox->bar_object, "items",
+                                 mntbox->box_object);
+
+        evas_object_move(mntbox->bar_object, mntbox->x, mntbox->y);
+        evas_object_move(mntbox->event_object, mntbox->x, mntbox->y);
+        evas_object_move(mntbox->box_object, mntbox->x, mntbox->y);
+
+        evas_object_resize(mntbox->bar_object, mntbox->w, mntbox->h);
+        evas_object_resize(mntbox->event_object, mntbox->w, mntbox->h);
+        evas_object_resize(mntbox->box_object, mntbox->w, mntbox->h);
+        break;
+     case E_GADMAN_CHANGE_EDGE:
+        break;
+     case E_GADMAN_CHANGE_ZONE:
+        break;
+     case E_GADMAN_CHANGE_RAISE:
+        break;
      }
 }
 
-static Mount_Icon  *
-_mount_icon_new(Mount_Box * mntbox, Mount_Point * point)
-{
-   Mount_Icon         *mnticon;
-   Evas_Object        *o;
-   Evas_Coord          w, h, x, y;
-   char                buffer[1024];
+static Mount_Icon *
+_mount_icon_new(Mount_Box *mntbox, Mount_Point *point)
+{
+   Mount_Icon *mnticon;
+   Evas_Object *o;
+   Evas_Coord w, h, x, y;
+   char buffer[1024];
 
    mnticon = E_NEW(Mount_Icon, 1);
+
    if (!mnticon)
       return NULL;
 
@@ -778,7 +781,7 @@
       edje_object_file_set(o, buffer, "modules/mount/icon");
    evas_object_show(o);
 
-   char               *strip = strrchr(point->path, '/');
+   char *strip = strrchr(point->path, '/');
 
    if (!strip)
      {
@@ -814,9 +817,9 @@
    evas_object_del(o);
 
    w = mntbox->mnt->conf->icon_size + mntbox->icon_inset.l +
-       mntbox->icon_inset.r;
+      mntbox->icon_inset.r;
    h = mntbox->mnt->conf->icon_size + mntbox->icon_inset.t +
-       mntbox->icon_inset.b;
+      mntbox->icon_inset.b;
 
    e_box_pack_end(mntbox->box_object, mnticon->bg_object);
    e_box_pack_options_set(mnticon->bg_object, 1, 1, 0, 0, 0.5, 0.5, w, h, w, 
h);
@@ -825,10 +828,10 @@
 }
 
 static void
-_mount_box_cb_intercept_move(void *data, Evas_Object * o, Evas_Coord x,
+_mount_box_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x,
                              Evas_Coord y)
 {
-   Mount_Box          *mntbox;
+   Mount_Box *mntbox;
 
    mntbox = data;
    evas_object_move(o, x, y);
@@ -841,10 +844,10 @@
 }
 
 static void
-_mount_box_cb_intercept_resize(void *data, Evas_Object * o, Evas_Coord w,
+_mount_box_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w,
                                Evas_Coord h)
 {
-   Mount_Box          *mntbox;
+   Mount_Box *mntbox;
 
    mntbox = data;
    evas_object_resize(o, w, h);
@@ -857,10 +860,10 @@
 }
 
 static void
-_mount_icon_cb_intercept_move(void *data, Evas_Object * o, Evas_Coord x,
+_mount_icon_cb_intercept_move(void *data, Evas_Object *o, Evas_Coord x,
                               Evas_Coord y)
 {
-   Mount_Icon         *mnticon;
+   Mount_Icon *mnticon;
 
    mnticon = data;
    evas_object_move(o, x, y);
@@ -875,10 +878,10 @@
 }
 
 static void
-_mount_icon_cb_intercept_resize(void *data, Evas_Object * o, Evas_Coord w,
+_mount_icon_cb_intercept_resize(void *data, Evas_Object *o, Evas_Coord w,
                                 Evas_Coord h)
 {
-   Mount_Icon         *mnticon;
+   Mount_Icon *mnticon;
 
    mnticon = data;
    evas_object_resize(o, w, h);
@@ -893,11 +896,11 @@
 }
 
 static void
-_mount_box_iconsize_change(Mount_Box * mntbox)
+_mount_box_iconsize_change(Mount_Box *mntbox)
 {
-   Evas_List          *l;
-   Evas_Coord          w, h, x, y;
-   char                buffer[1024];
+   Evas_List *l;
+   Evas_Coord w, h, x, y;
+   char buffer[1024];
 
    if ((mntbox->x == -1) || (mntbox->y == -1) ||
        (mntbox->w == -1) || (mntbox->h == -1))
@@ -909,8 +912,8 @@
    e_box_freeze(mntbox->box_object);
    for (l = mntbox->icons; l; l = l->next)
      {
-        Mount_Icon         *ic;
-        Evas_Object        *o;
+        Mount_Icon *ic;
+        Evas_Object *o;
 
         ic = l->data;
 
@@ -938,16 +941,16 @@
         evas_object_del(o);
 
         w = mntbox->mnt->conf->icon_size + mntbox->icon_inset.l +
-            mntbox->icon_inset.r;
+           mntbox->icon_inset.r;
         h = mntbox->mnt->conf->icon_size + mntbox->icon_inset.t +
-            mntbox->icon_inset.b;
+           mntbox->icon_inset.b;
 
         e_box_pack_options_set(ic->bg_object, 1, 1,     /* fill */
                                0, 0,    /* expand */
                                0.0, 0.5,        /* align */
                                w, h,    /* min */
                                w, h     /* max */
-            );
+           );
      }
    e_box_thaw(mntbox->box_object);
    evas_event_thaw(mntbox->evas);
@@ -965,12 +968,12 @@
 }
 
 static void
-_change_orient_horiz(Mount * mnt)
+_change_orient_horiz(Mount *mnt)
 {
-   Evas_List          *l2;
-   Evas_Object        *o;
-   Evas_Coord          w, h;
-   Mount_Box          *mntbox;
+   Evas_List *l2;
+   Evas_Object *o;
+   Evas_Coord w, h;
+   Mount_Box *mntbox;
 
    mntbox = mnt->box;
    evas_event_freeze(mntbox->evas);
@@ -982,13 +985,13 @@
    e_box_freeze(mntbox->box_object);
 
    w = mntbox->mnt->conf->icon_size + mntbox->icon_inset.l +
-       mntbox->icon_inset.r;
+      mntbox->icon_inset.r;
    h = mntbox->mnt->conf->icon_size + mntbox->icon_inset.t +
-       mntbox->icon_inset.b;
+      mntbox->icon_inset.b;
 
    for (l2 = mntbox->icons; l2; l2 = l2->next)
      {
-        Mount_Icon         *ic;
+        Mount_Icon *ic;
 
         ic = l2->data;
         o = ic->bg_object;
@@ -1004,7 +1007,7 @@
                                0.5, 0.5,        /* align */
                                w, h,    /* min */
                                w, h     /* max */
-            );
+           );
      }
    e_box_align_set(mntbox->box_object, 0.5, 0.5);
    e_box_orientation_set(mntbox->box_object, 1);
@@ -1018,12 +1021,12 @@
 }
 
 static void
-_change_orient_vert(Mount * mnt)
+_change_orient_vert(Mount *mnt)
 {
-   Evas_List          *l2;
-   Evas_Object        *o;
-   Evas_Coord          w, h;
-   Mount_Box          *mntbox;
+   Evas_List *l2;
+   Evas_Object *o;
+   Evas_Coord w, h;
+   Mount_Box *mntbox;
 
    mntbox = mnt->box;
    evas_event_freeze(mntbox->evas);
@@ -1035,13 +1038,13 @@
    e_box_freeze(mntbox->box_object);
 
    w = mntbox->mnt->conf->icon_size + mntbox->icon_inset.l +
-       mntbox->icon_inset.r;
+      mntbox->icon_inset.r;
    h = mntbox->mnt->conf->icon_size + mntbox->icon_inset.t +
-       mntbox->icon_inset.b;
+      mntbox->icon_inset.b;
 
    for (l2 = mntbox->icons; l2; l2 = l2->next)
      {
-        Mount_Icon         *ic;
+        Mount_Icon *ic;
 
         ic = l2->data;
         o = ic->bg_object;
@@ -1057,7 +1060,7 @@
                                0.5, 0.5,        /* align */
                                w, h,    /* min */
                                w, h     /* max */
-            );
+           );
      }
    e_box_align_set(mntbox->box_object, 0.5, 0.5);
    e_box_orientation_set(mntbox->box_object, 0);
@@ -1071,10 +1074,10 @@
 }
 
 static void
-_mount_mountpoint(Mount_Icon * mnticon)
+_mount_mountpoint(Mount_Icon *mnticon)
 {
-   char                buf[1024];
-   Ecore_Exe          *x;
+   char buf[1024];
+   Ecore_Exe *x;
 
    fprintf(stderr, "Trying To Mount %s\n", mnticon->mntpoint->path);
    snprintf(buf, sizeof(buf), MOUNT " %s", mnticon->mntpoint->path);
@@ -1085,10 +1088,10 @@
 }
 
 static void
-_unmount_mountpoint(Mount_Icon * mnticon)
+_unmount_mountpoint(Mount_Icon *mnticon)
 {
-   char                buf[1024];
-   Ecore_Exe          *x;
+   char buf[1024];
+   Ecore_Exe *x;
 
    fprintf(stderr, "Trying To Unount %s\n", mnticon->mntpoint->path);
    snprintf(buf, sizeof(buf), UMOUNT " %s", mnticon->mntpoint->path);
@@ -1099,10 +1102,10 @@
 }
 
 static void
-_eject_mountpoint(Mount_Icon * mnticon)
+_eject_mountpoint(Mount_Icon *mnticon)
 {
-   char                buf[1024];
-   Ecore_Exe          *x;
+   char buf[1024];
+   Ecore_Exe *x;
 
    fprintf(stderr, "Trying To Eject %s\n", mnticon->mntpoint->path);
    snprintf(buf, sizeof(buf), EJECT " %s", mnticon->mntpoint->device);
@@ -1113,13 +1116,13 @@
 }
 
 static void
-_mount_box_cb_mouse_down(void *data, Evas * e, Evas_Object * obj,
+_mount_box_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
                          void *event_info)
 {
    Evas_Event_Mouse_Down *ev;
-   Mount_Box          *mntbox;
-   E_Manager          *man;
-   E_Container        *con;
+   Mount_Box *mntbox;
+   E_Manager *man;
+   E_Container *con;
 
    ev = event_info;
    mntbox = data;
@@ -1142,7 +1145,7 @@
 }
 
 static void
-_set_state(Mount_Icon * ic)
+_set_state(Mount_Icon *ic)
 {
    if (ic->mntpoint->mounted)
      {
@@ -1155,17 +1158,17 @@
 }
 
 static void
-_mount_icon_cb_edje_mouse_down(void *data, Evas_Object * o,
+_mount_icon_cb_edje_mouse_down(void *data, Evas_Object *o,
                                const char *emission, const char *source)
 {
-   Mount_Icon         *ic;
+   Mount_Icon *ic;
 
    ic = data;
    if (!strcmp(emission, "mouse,down,1"))
      {
         _mount_exe_exit_handler =
-            ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _mount_exe_cb_exit,
-                                    NULL);
+           ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _mount_exe_cb_exit,
+                                   NULL);
         if (ic->mntpoint->mounted == 0)
           {
              /* Mount */
@@ -1194,11 +1197,11 @@
 _mount_exe_cb_exit(void *data, int type, void *event)
 {
    Ecore_Exe_Event_Del *ev;
-   Ecore_Exe          *x;
-   Mount_Icon         *ic;
-   Mount_Point        *point;
-   char               *tag;
-   int                 mounted;
+   Ecore_Exe *x;
+   Mount_Icon *ic;
+   Mount_Point *point;
+   char *tag;
+   int mounted;
 
    ev = event;
    if (!ev->exe)
@@ -1249,9 +1252,9 @@
 void
 _mount_cb_config_updated(void *data)
 {
-   Mount              *m;
-   Mount_Box          *mntbox;
-   Evas_List          *l;
+   Mount *m;
+   Mount_Box *mntbox;
+   Evas_List *l;
 
    m = data;
    if (!m)
@@ -1263,7 +1266,7 @@
 
    for (l = mntbox->icons; l; l = l->next)
      {
-        Mount_Icon         *ic;
+        Mount_Icon *ic;
 
         ic = l->data;
         if (m->conf->show_labels)
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h        30 Jan 2006 05:12:48 -0000      1.8
+++ e_mod_main.h        30 Jan 2006 20:22:49 -0000      1.9
@@ -15,86 +15,94 @@
 typedef struct _Mount_Icon Mount_Icon;
 typedef struct _Mount_Point Mount_Point;
 
-typedef enum eject_mode {
+typedef enum eject_mode
+{
    NO_EJECT,
    MANUAL_EJECT,
    AUTO_EJECT
 } Eject_Mode;
 
-struct _Config {
-   int                 icon_size;
-   int                 orientation;
-   unsigned char       show_labels;
-};
-
-struct _Config_Box {
-   unsigned char       enabled;
-};
-
-struct _Mount {
-   E_Container        *con;
-   Mount_Box          *box;
-   E_Menu             *config_menu;
-   E_Menu             *config_menu_size;
-   E_Menu             *config_menu_options;
-
-   Config             *conf;
-   E_Config_DD        *conf_edd;
-   Evas_List          *mntpoints;
-   E_Config_Dialog    *config_dialog;
-};
-
-struct _Mount_Box {
-   Mount              *mnt;
-   E_Container        *con;
-   Evas               *evas;
-   E_Menu             *menu;
-   E_Gadman_Client    *gmc;
-
-   Config_Box         *conf;
-   E_Config_DD        *conf_box_edd;
-
-   Evas_Object        *bar_object;
-   Evas_Object        *box_object;
-   Evas_Object        *event_object;
-
-   Evas_List          *icons;
-
-   Evas_Coord          x, y, w, h;
-   double              align, align_req;
-   struct {
-      Evas_Coord          l, r, t, b;
+struct _Config
+{
+   int icon_size;
+   int orientation;
+   unsigned char show_labels;
+};
+
+struct _Config_Box
+{
+   unsigned char enabled;
+};
+
+struct _Mount
+{
+   E_Container *con;
+   Mount_Box *box;
+   E_Menu *config_menu;
+   E_Menu *config_menu_size;
+   E_Menu *config_menu_options;
+
+   Config *conf;
+   E_Config_DD *conf_edd;
+   Evas_List *mntpoints;
+   E_Config_Dialog *config_dialog;
+};
+
+struct _Mount_Box
+{
+   Mount *mnt;
+   E_Container *con;
+   Evas *evas;
+   E_Menu *menu;
+   E_Gadman_Client *gmc;
+
+   Config_Box *conf;
+   E_Config_DD *conf_box_edd;
+
+   Evas_Object *bar_object;
+   Evas_Object *box_object;
+   Evas_Object *event_object;
+
+   Evas_List *icons;
+
+   Evas_Coord x, y, w, h;
+   double align, align_req;
+   struct
+   {
+      Evas_Coord l, r, t, b;
    } icon_inset;
 };
 
-struct _Mount_Icon {
-   Mount_Box          *mntbox;
-   Mount_Point        *mntpoint;
-
-   Evas_Object        *bg_object;
-   Evas_Object        *icon_object;
-   Evas_Object        *overlay_object;
-   Evas_Object        *txt_object;
-};
-
-struct _Mount_Point {
-   char               *device;
-   char               *path;
-   char               *part;
+struct _Mount_Icon
+{
+   Mount_Box *mntbox;
+   Mount_Point *mntpoint;
+
+   Evas_Object *bg_object;
+   Evas_Object *icon_object;
+   Evas_Object *overlay_object;
+   Evas_Object *txt_object;
+};
+
+struct _Mount_Point
+{
+   char *device;
+   char *path;
+   char *part;
 
-   int                 mounted;
-   Eject_Mode          eject_mode;
+   int mounted;
+   Eject_Mode eject_mode;
 };
 
 EAPI extern E_Module_Api e_modapi;
 
-EAPI void          *e_modapi_init(E_Module * m);
-EAPI int            e_modapi_shutdown(E_Module * m);
-EAPI int            e_modapi_save(E_Module * m);
-EAPI int            e_modapi_info(E_Module * m);
-EAPI int            e_modapi_about(E_Module * m);
-EAPI int            e_modapi_config(E_Module * m);
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+EAPI int e_modapi_info(E_Module *m);
+EAPI int e_modapi_about(E_Module *m);
+EAPI int e_modapi_config(E_Module *m);
 
-void                _mount_cb_config_updated(void *data);
+void _mount_cb_config_updated(void *data);
 
 #endif




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to