Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/express
Dir : e17/apps/express/src
Modified Files:
Makefile.am exp_eb.c exp_main.c
Log Message:
- fix bug talking to everybuddy, seems to be working good now
- connect on startup
- add debugging symbols
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 13 Jan 2005 05:10:36 -0000 1.3
+++ Makefile.am 13 Jan 2005 06:45:51 -0000 1.4
@@ -3,7 +3,7 @@
INCLUDES = @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@ \
@esmart_cflags@ @imlib2_cflags@ @etox_cflags@
-CFLAGS = -W -Wall
+CFLAGS = -W -Wall -g -O0
bin_PROGRAMS = express
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_eb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_eb.c 13 Jan 2005 05:10:36 -0000 1.2
+++ exp_eb.c 13 Jan 2005 06:45:52 -0000 1.3
@@ -115,6 +115,7 @@
e = ev;
exp = ecore_con_server_data_get(e->server);
exp->server.server = e->server;
+
ecore_con_server_send(e->server, exp->server.cookie,
strlen(exp->server.cookie));
return 1;
@@ -233,7 +234,7 @@
exp_eb_cookie_get(Exp *exp)
{
char cookie_file[PATH_MAX];
- unsigned char cookie[8];
+ unsigned char cookie[9];
FILE *cfile = NULL;
unsigned int i;
@@ -243,8 +244,9 @@
if (!cfile) return 0;
exp->server.port = (fgetc(cfile) << 8) + fgetc(cfile);
- for (i = 0; i < sizeof(cookie); i++)
+ for (i = 0; i < 8; i++)
cookie[i] = (unsigned char)fgetc(cfile);
+ cookie[8] = '\0';
fclose(cfile);
exp->server.cookie = strdup(cookie);
@@ -260,7 +262,6 @@
if (!strcmp(cmds[0], "cookie_accepted"))
{
exp_eb_cmd_list_services(exp);
-
}
else if (!strcmp(cmds[0], "cookie_rejected"))
{
@@ -417,9 +418,9 @@
ev->title = strdup(cmds[2]);
ev->msg = strdup(cmds[3]);
- /* ecore_event_add(Exp_EB_EVENT_DIALOG, ev,
- exp_eb_cb_event_dialog_free, NULL);
- */
+ ecore_event_add(Exp_EB_EVENT_DIALOG, ev,
+ exp_eb_cb_event_dialog_free, NULL);
+
/* FIXME FAKE IT FOR NOW */
exp_eb_cmd_dialog_yesno_resolve(exp, ev->tag, 0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exp_main.c 13 Jan 2005 05:10:37 -0000 1.3
+++ exp_main.c 13 Jan 2005 06:45:52 -0000 1.4
@@ -47,8 +47,15 @@
exp_fake_buddies(exp);
+ if (!exp_eb_connect(exp, "oberon"))
+ {
+ printf("Unable to connect to Everybody\n");
+ /* XXX may want to exit here in the future ... */
+ }
+
ecore_main_loop_begin();
+ exp_eb_shutdown();
edje_shutdown();
ecore_evas_shutdown();
ecore_shutdown();
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
