enlightenment
/
enlightenment-module-mail
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes for Ecore Api changes. 

SVN revision: 50072
This commit is contained in:
Christopher Michael 2010-07-06 17:52:01 +00:00
parent 37f32c8d53
commit b17e200dc9
4 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/e_mod_main.c
View File

@ -54,8 +54,8 @@ static void _mail_menu_cb_exec (void *data, E_Menu * m, E_Menu_Item * mi);
static Config_Item *_mail_config_item_get (const char *id); static Config_Item *_mail_config_item_get (const char *id);
static Mail *_mail_new (Evas * evas); static Mail *_mail_new (Evas * evas);
static void _mail_free (Mail * mail); static void _mail_free (Mail * mail);
static int _mail_cb_check (void *data); static Eina_Bool _mail_cb_check (void *data);
static int _mail_cb_exe_exit (void *data, int type, void *event); static Eina_Bool _mail_cb_exe_exit (void *data, int type, void *event);
static E_Config_DD *conf_edd = NULL; static E_Config_DD *conf_edd = NULL;
static E_Config_DD *conf_item_edd = NULL; static E_Config_DD *conf_item_edd = NULL;
@ -601,15 +601,14 @@ _mail_free (Mail * mail)
mail = NULL; mail = NULL;
} }
static int static Eina_Bool
_mail_cb_check (void *data) _mail_cb_check (void *data)
{ {
Instance *inst = data; Instance *inst = data;
Eina_List *l; Eina_List *l;
int have_imap = 0, have_pop = 0, have_mbox = 0; int have_imap = 0, have_pop = 0, have_mbox = 0;
if (!inst) if (!inst) return EINA_TRUE;
return 1;
for (l = inst->ci->boxes; l; l = l->next) for (l = inst->ci->boxes; l; l = l->next)
{ {
@ -643,7 +642,7 @@ _mail_cb_check (void *data)
_mail_pop_check_mail (inst); _mail_pop_check_mail (inst);
if (have_mbox) if (have_mbox)
_mail_mbox_check_mail (inst); _mail_mbox_check_mail (inst);
return 1; return EINA_TRUE;
} }
void void
@ -694,17 +693,16 @@ _mail_start_exe (void *data)
cb->exe = ecore_exe_run (cb->exec, cb); cb->exe = ecore_exe_run (cb->exec, cb);
} }
static int static Eina_Bool
_mail_cb_exe_exit (void *data, int type, void *event) _mail_cb_exe_exit (void *data, int type, void *event)
{ {
Config_Box *cb; Config_Box *cb;
cb = data; cb = data;
if (!cb) if (!cb) return EINA_FALSE;
return 0;
cb->exe = NULL; cb->exe = NULL;
ecore_event_handler_del (exit_handler); ecore_event_handler_del (exit_handler);
return 0; return EINA_FALSE;
} }
void void

1
src/e_mod_main.h
View File

@ -1,6 +1,7 @@
/* /*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/ */
#include <libintl.h>
#define D_(str) dgettext(PACKAGE, str) #define D_(str) dgettext(PACKAGE, str)
#ifndef E_MOD_MAIN_H #ifndef E_MOD_MAIN_H

38
src/imap2.c
View File

@ -19,15 +19,15 @@
static ImapClient *_mail_imap_client_find (Ecore_Con_Server *server); static ImapClient *_mail_imap_client_find (Ecore_Con_Server *server);
static ImapClient *_mail_imap_client_get (Config_Box *cb); static ImapClient *_mail_imap_client_get (Config_Box *cb);
static int _mail_imap_server_add (void *data, int type, void *event); static Eina_Bool _mail_imap_server_add (void *data, int type, void *event);
static int _mail_imap_server_del (void *data, int type, void *event); static Eina_Bool _mail_imap_server_del (void *data, int type, void *event);
static int _mail_imap_server_data (void *data, int type, void *event); static Eina_Bool _mail_imap_server_data (void *data, int type, void *event);
static int _mail_imap_server_data_parse (ImapClient *ic, char *line); static int _mail_imap_server_data_parse (ImapClient *ic, char *line);
static void _mail_imap_client_logout (ImapClient *ic); static void _mail_imap_client_logout (ImapClient *ic);
static void _mail_imap_server_idle (ImapClient *ic); static void _mail_imap_server_idle (ImapClient *ic);
static void _mail_imap_server_noop (ImapClient *ic); static void _mail_imap_server_noop (ImapClient *ic);
static int elements (char *p); static int elements (char *p);
static char *find_rn (char *data, unsigned int size); static char *find_rn (char *data, unsigned int size);
static Eina_List *iclients = NULL; static Eina_List *iclients = NULL;
@ -210,31 +210,29 @@ _mail_imap_client_get (Config_Box *cb)
return ic; return ic;
} }
static int static Eina_Bool
_mail_imap_server_add (void *data, int type, void *event) _mail_imap_server_add (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Add *ev = event; Ecore_Con_Event_Server_Add *ev = event;
ImapClient *ic; ImapClient *ic;
ic = _mail_imap_client_find (ev->server); ic = _mail_imap_client_find (ev->server);
if (!ic) if (!ic) return EINA_TRUE;
return 1;
D ("Connect to %s:%s\n", ic->config->host, ic->config->new_path); D ("Connect to %s:%s\n", ic->config->host, ic->config->new_path);
ic->state = IMAP_STATE_CONNECTED; ic->state = IMAP_STATE_CONNECTED;
ic->cmd = 1; ic->cmd = 1;
return 0; return EINA_FALSE;
} }
static int static Eina_Bool
_mail_imap_server_del (void *data, int type, void *event) _mail_imap_server_del (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Del *ev = event; Ecore_Con_Event_Server_Del *ev = event;
ImapClient *ic; ImapClient *ic;
ic = _mail_imap_client_find (ev->server); ic = _mail_imap_client_find (ev->server);
if (!ic) if (!ic) return EINA_TRUE;
return 1;
D ("Disconnect from %s:%s\n", ic->config->host, ic->config->new_path); D ("Disconnect from %s:%s\n", ic->config->host, ic->config->new_path);
if (ic->state != IMAP_STATE_DISCONNECTED) if (ic->state != IMAP_STATE_DISCONNECTED)
@ -253,10 +251,10 @@ _mail_imap_server_del (void *data, int type, void *event)
&& (ic->config->use_exec) && (ic->config->exec)) && (ic->config->use_exec) && (ic->config->exec))
_mail_start_exe (ic->config); _mail_start_exe (ic->config);
return 0; return EINA_FALSE;
} }
static int static Eina_Bool
_mail_imap_server_data (void *data, int type, void *event) _mail_imap_server_data (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Data *ev = event; Ecore_Con_Event_Server_Data *ev = event;
@ -266,10 +264,8 @@ _mail_imap_server_data (void *data, int type, void *event)
unsigned int len, size; unsigned int len, size;
ic = _mail_imap_client_find (ev->server); ic = _mail_imap_client_find (ev->server);
if (!ic) if (!ic) return EINA_TRUE;
return 1; if (ic->state == IMAP_STATE_DISCONNECTED) return EINA_TRUE;
if (ic->state == IMAP_STATE_DISCONNECTED)
return 1;
D ("Data from %s:%s\n", ic->config->host, ic->config->new_path); D ("Data from %s:%s\n", ic->config->host, ic->config->new_path);
@ -282,7 +278,7 @@ _mail_imap_server_data (void *data, int type, void *event)
memcpy (ic->prev.data + ic->prev.size, ev->data, ev->size); memcpy (ic->prev.data + ic->prev.size, ev->data, ev->size);
ic->prev.size += ev->size; ic->prev.size += ev->size;
E_FREE (ev->data); E_FREE (ev->data);
if (ic->prev.size < 2) return 0; if (ic->prev.size < 2) return EINA_FALSE;
reply = ic->prev.data; reply = ic->prev.data;
size = ic->prev.size; size = ic->prev.size;
@ -333,7 +329,7 @@ _mail_imap_server_data (void *data, int type, void *event)
{ {
printf ("Imap Failure: Couldn't find EOL\n"); printf ("Imap Failure: Couldn't find EOL\n");
_mail_imap_client_logout (ic); _mail_imap_client_logout (ic);
return 0; return EINA_FALSE;
} }
*pp = '\0'; *pp = '\0';
/* parse data */ /* parse data */
@ -341,7 +337,7 @@ _mail_imap_server_data (void *data, int type, void *event)
{ {
printf ("Imap Failure: Couldn't parse data\n"); printf ("Imap Failure: Couldn't parse data\n");
_mail_imap_client_logout (ic); _mail_imap_client_logout (ic);
return 0; return EINA_FALSE;
} }
/* next */ /* next */
p = pp + 2; p = pp + 2;
@ -408,7 +404,7 @@ _mail_imap_server_data (void *data, int type, void *event)
ic->cmd = 1; ic->cmd = 1;
_mail_set_text (ic->data); _mail_set_text (ic->data);
D ("\n"); D ("\n");
return 0; return EINA_FALSE;
} }
static int static int

34
src/pop.c
View File

@ -2,9 +2,9 @@
#include "e_mod_main.h" #include "e_mod_main.h"
#include "pop.h" #include "pop.h"
static int _mail_pop_server_add (void *data, int type, void *event); static Eina_Bool _mail_pop_server_add (void *data, int type, void *event);
static int _mail_pop_server_del (void *data, int type, void *event); static Eina_Bool _mail_pop_server_del (void *data, int type, void *event);
static int _mail_pop_server_data (void *data, int type, void *event); static Eina_Bool _mail_pop_server_data (void *data, int type, void *event);
static PopClient *_mail_pop_client_get (void *data); static PopClient *_mail_pop_client_get (void *data);
static PopClient *_mail_pop_client_get_from_server (void *data); static PopClient *_mail_pop_client_get_from_server (void *data);
static void _mail_pop_client_quit (void *data); static void _mail_pop_client_quit (void *data);
@ -119,29 +119,27 @@ _mail_pop_shutdown ()
} }
/* PRIVATES */ /* PRIVATES */
static int static Eina_Bool
_mail_pop_server_add (void *data, int type, void *event) _mail_pop_server_add (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Add *ev = event; Ecore_Con_Event_Server_Add *ev = event;
PopClient *pc; PopClient *pc;
pc = _mail_pop_client_get_from_server (ev->server); pc = _mail_pop_client_get_from_server (ev->server);
if (!pc) if (!pc) return EINA_TRUE;
return 1;
pc->state = POP_STATE_CONNECTED; pc->state = POP_STATE_CONNECTED;
return 0; return EINA_FALSE;
} }
static int static Eina_Bool
_mail_pop_server_del (void *data, int type, void *event) _mail_pop_server_del (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Del *ev = event; Ecore_Con_Event_Server_Del *ev = event;
PopClient *pc; PopClient *pc;
pc = _mail_pop_client_get_from_server (ev->server); pc = _mail_pop_client_get_from_server (ev->server);
if (!pc) if (!pc) return EINA_TRUE;
return 1;
if (pc->state == POP_STATE_DISCONNECTED) if (pc->state == POP_STATE_DISCONNECTED)
printf ("Pop Server Disconnected\n"); printf ("Pop Server Disconnected\n");
@ -150,10 +148,10 @@ _mail_pop_server_del (void *data, int type, void *event)
pc->server = NULL; pc->server = NULL;
pc->state = POP_STATE_DISCONNECTED; pc->state = POP_STATE_DISCONNECTED;
return 0; return EINA_FALSE;
} }
static int static Eina_Bool
_mail_pop_server_data (void *data, int type, void *event) _mail_pop_server_data (void *data, int type, void *event)
{ {
Ecore_Con_Event_Server_Data *ev = event; Ecore_Con_Event_Server_Data *ev = event;
@ -162,10 +160,8 @@ _mail_pop_server_data (void *data, int type, void *event)
int len, num = 0, total = 0; int len, num = 0, total = 0;
pc = _mail_pop_client_get_from_server (ev->server); pc = _mail_pop_client_get_from_server (ev->server);
if (!pc) if (!pc) return EINA_TRUE;
return 1; if (pc->state == POP_STATE_DISCONNECTED) return EINA_TRUE;
if (pc->state == POP_STATE_DISCONNECTED)
return 1;
len = sizeof (in) - 1; len = sizeof (in) - 1;
len = (((len) > (ev->size)) ? ev->size : len); len = (((len) > (ev->size)) ? ev->size : len);
@ -176,13 +172,13 @@ _mail_pop_server_data (void *data, int type, void *event)
{ {
printf ("ERROR: %s\n", in); printf ("ERROR: %s\n", in);
_mail_pop_client_quit (pc); _mail_pop_client_quit (pc);
return 0; return EINA_FALSE;
} }
else if (strncmp (in, "+OK", 3)) else if (strncmp (in, "+OK", 3))
{ {
printf ("Unexpected reply: %s\n", in); printf ("Unexpected reply: %s\n", in);
_mail_pop_client_quit (pc); _mail_pop_client_quit (pc);
return 0; return EINA_FALSE;
} }
pc->state++; pc->state++;
@ -213,7 +209,7 @@ _mail_pop_server_data (void *data, int type, void *event)
default: default:
break; break;
} }
return 0; return EINA_FALSE;
} }
static PopClient * static PopClient *