Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mail
Dir : e_modules/mail
Modified Files:
e_mod_main.c
Log Message:
Some code cleanup:
- When creating new mailboxes in config, create the server handlers if
needed.
===================================================================
RCS file: /cvs/e/e_modules/mail/e_mod_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_mod_main.c 10 Jun 2006 14:43:13 -0000 1.19
+++ e_mod_main.c 10 Jun 2006 17:59:30 -0000 1.20
@@ -151,13 +151,6 @@
edje_object_signal_emit(inst->mail_obj, "label_passive", "");
mail_config->instances = evas_list_append(mail_config->instances, inst);
-
- if (!inst->add_handler)
- inst->add_handler = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD,
_mail_server_add, inst);
- if (!inst->del_handler)
- inst->del_handler = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL,
_mail_server_del, inst);
- if (!inst->data_handler)
- inst->data_handler = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_mail_server_data, inst);
if (!ci->boxes) return gcc;
@@ -181,6 +174,13 @@
mb->monitor = ecore_file_monitor_add(cb->new_path, _mail_mbox_check,
mb);
else
{
+ if (!inst->add_handler)
+ inst->add_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _mail_server_add, inst);
+ if (!inst->del_handler)
+ inst->del_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _mail_server_del, inst);
+ if (!inst->data_handler)
+ inst->data_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, _mail_server_data, inst);
+
_mail_cb_check(inst);
if (!inst->check_timer)
inst->check_timer = ecore_timer_add((ci->check_time * 60.0),
_mail_cb_check, inst);
@@ -1000,12 +1000,20 @@
mb->state = STATE_DISCONNECTED;
mb->cmd = 0;
inst->mboxes = evas_list_append(inst->mboxes, mb);
+
if (cb->type == MAIL_TYPE_MDIR)
mb->monitor = ecore_file_monitor_add(cb->new_path,
_mail_mdir_check, mb);
else if (cb->type == MAIL_TYPE_MBOX)
mb->monitor = ecore_file_monitor_add(cb->new_path,
_mail_mbox_check, mb);
else
{
+ if (!inst->add_handler)
+ inst->add_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, _mail_server_add, inst);
+ if (!inst->del_handler)
+ inst->del_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DEL, _mail_server_del, inst);
+ if (!inst->data_handler)
+ inst->data_handler =
ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA, _mail_server_data, inst);
+
_mail_cb_check(inst);
if (!inst->check_timer)
inst->check_timer =
ecore_timer_add((ci->check_time * 60.0), _mail_cb_check, inst);
@@ -1041,10 +1049,12 @@
cb = d->data;
if ((cb->name) && (box_name))
{
- if (!strcmp(cb->name, box_name))
- found = 1;
+ if (!strcmp(cb->name, box_name))
+ {
+ found = 1;
+ break;
+ }
}
- if (found) break;
}
if (found)
{
@@ -1057,6 +1067,7 @@
(!strcmp(mb->config->name, cb->name)))
{
if (mb->monitor)
ecore_file_monitor_del(mb->monitor);
+ if (mb->server) ecore_con_server_del(mb->server);
mb->server = NULL;
mb->state = STATE_DISCONNECTED;
mb->cmd = 0;
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
