Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/express
Dir : e17/apps/express/src
Modified Files:
Express.h Makefile.am exp_buddy.c exp_conversation.c exp_eb.c
exp_gui.c exp_main.c exp_message.c
Log Message:
- stick in -W and -Wall and cleanup the warnings
- hush data/icons
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/Express.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Express.h 12 Jan 2005 23:55:53 -0000 1.2
+++ Express.h 13 Jan 2005 05:10:36 -0000 1.3
@@ -125,7 +125,7 @@
};
-void exp_gui_setup(Exp *exp);
+int exp_gui_init(Exp *exp);
Exp_Conversation * exp_conversation_new(Exp_Buddy *buddy);
void exp_conversation_free(Exp_Conversation *conv);
@@ -133,6 +133,7 @@
void exp_conversation_activate(Exp_Conversation *conv);
void exp_conversation_pos_set(Exp_Conversation *conv, double
pos);
Exp_Conversation * exp_conversation_find_by_buddy(Exp_Buddy *buddy);
+void exp_conversation_destroy(Exp_Conversation *conv);
Exp_Message *exp_message_new(Exp_Conversation *conv, char *text, int sender);
void exp_message_free(Exp_Message *msg);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 12 Jan 2005 23:55:53 -0000 1.2
+++ Makefile.am 13 Jan 2005 05:10:36 -0000 1.3
@@ -3,6 +3,8 @@
INCLUDES = @edje_cflags@ @ecore_cflags@ @edb_cflags@ @evas_cflags@ \
@esmart_cflags@ @imlib2_cflags@ @etox_cflags@
+CFLAGS = -W -Wall
+
bin_PROGRAMS = express
express_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_buddy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_buddy.c 12 Jan 2005 23:55:53 -0000 1.2
+++ exp_buddy.c 13 Jan 2005 05:10:36 -0000 1.3
@@ -255,8 +255,6 @@
{
Evas_Event_Mouse_Down *ev = event_info;
Exp_Buddy *buddy = data;
- static int i = 0;
- char buf[200];
if (!buddy) return;
@@ -269,5 +267,8 @@
exp_buddy_deactivate(buddy);
}
+ return;
+ e = NULL;
+ obj = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_conversation.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_conversation.c 12 Jan 2005 23:55:53 -0000 1.2
+++ exp_conversation.c 13 Jan 2005 05:10:36 -0000 1.3
@@ -133,7 +133,7 @@
exp_conversation_find_by_buddy(Exp_Buddy *buddy)
{
Evas_List *l;
- if (!buddy || !buddy->exp) return;
+ if (!buddy || !buddy->exp) return NULL;
for (l = buddy->exp->conversations; l; l = l->next)
{
@@ -191,7 +191,7 @@
};
conv = exp_conversation_find_by_buddy(buddy);
- if (!conv) return;
+ if (!conv) return 0;
printf("fake it!\n");
exp_message_new(conv, msgs[i], i%2);
i++;
@@ -221,7 +221,7 @@
};
conv = exp_conversation_find_by_buddy(buddy);
- if (!conv) return;
+ if (!conv) return 0;
exp_message_new(conv, msgs[i], i%2);
i++;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_eb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exp_eb.c 12 Jan 2005 23:55:53 -0000 1.1
+++ exp_eb.c 13 Jan 2005 05:10:36 -0000 1.2
@@ -111,7 +111,6 @@
{
Ecore_Con_Event_Server_Add *e;
Exp *exp;
- char *cookie = NULL;
e = ev;
exp = ecore_con_server_data_get(e->server);
@@ -119,6 +118,8 @@
ecore_con_server_send(e->server, exp->server.cookie,
strlen(exp->server.cookie));
return 1;
+ data = NULL;
+ type = 0;
}
static int
@@ -131,7 +132,10 @@
exp = ecore_con_server_data_get(e->server);
printf("disconnected from eb\n");
+
return 1;
+ data = NULL;
+ type = 0;
}
static int
@@ -139,7 +143,7 @@
{
Ecore_Con_Event_Server_Data *e;
Exp *exp;
- char *d, *msg, *tmp;
+ char *d, *msg;
char ** cmds;
int num_params = 0, i, remaining = 0;
@@ -221,6 +225,8 @@
free(msg);
return 1;
+ data = NULL;
+ type = 0;
}
static int
@@ -229,7 +235,7 @@
char cookie_file[PATH_MAX];
unsigned char cookie[8];
FILE *cfile = NULL;
- int i;
+ unsigned int i;
snprintf(cookie_file, sizeof(cookie_file), "%s/authcookie", everybody_dir);
@@ -952,6 +958,11 @@
{
/* FIXME ... */
printf("WARNING: exp_eb_cmd_group_chat_invite not done\n");
+
+ return;
+ exp = NULL;
+ msg = NULL;
+ id = 0;
}
void
@@ -959,6 +970,11 @@
{
/* FIXME ... */
printf("WARNING: exp_eb_cmd_group_chat_send not done\n");
+
+ return;
+ exp = NULL;
+ msg = NULL;
+ id = 0;
}
void
@@ -966,6 +982,10 @@
{
/* FIXME ... */
printf("WARNING: exp_eb_cmd_group_chat_close not done\n");
+
+ return;
+ exp = NULL;
+ id = 0;
}
/* experimental */
@@ -974,6 +994,10 @@
{
/* FIXME ... */
printf("WARNING: exp_eb_cmd_group_chat_hide not done\n");
+
+ return;
+ exp = NULL;
+ id = 0;
}
/* done experimental */
@@ -1114,6 +1138,9 @@
}
free(e);
e = NULL;
+
+ return;
+ data = NULL;
}
static void
@@ -1135,9 +1162,10 @@
free(e);
e = NULL;
-}
-
+ return;
+ data = NULL;
+}
static void
exp_eb_cb_event_buddy_logout_free(void *data, void *ev)
@@ -1158,6 +1186,9 @@
free(e);
e = NULL;
+
+ return;
+ data = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_gui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_gui.c 12 Jan 2005 23:55:53 -0000 1.2
+++ exp_gui.c 13 Jan 2005 05:10:37 -0000 1.3
@@ -96,7 +96,7 @@
Exp *exp = data;
Evas_List *l, *removals = NULL;
- if (!exp) return;
+ if (!exp) return 1;
/* remove conversations that have destroy set */
for (l = exp->conversations; l; l = l->next)
@@ -117,7 +117,7 @@
exp->changes.active_conv = 1;
}
}
- exp->active_conversation == NULL;
+ exp->active_conversation = NULL;
}
while(removals)
{
@@ -178,7 +178,6 @@
if (conv->active)
{
- double p;
edje_object_part_swallow(exp->gui, "express.conversation", conv->cont);
evas_object_show(conv->cont);
@@ -215,4 +214,9 @@
{
exp_conversation_pos_set(exp->active_conversation, dy);
}
+
+ return;
+ obj = NULL;
+ sig = NULL;
+ src = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_main.c 12 Jan 2005 23:55:53 -0000 1.2
+++ exp_main.c 13 Jan 2005 05:10:37 -0000 1.3
@@ -3,6 +3,7 @@
*/
#include "Express.h"
+#include "exp_eb.h"
static void exp_fake_buddies(Exp *exp);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/express/src/exp_message.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exp_message.c 12 Jan 2005 23:55:53 -0000 1.2
+++ exp_message.c 13 Jan 2005 05:10:37 -0000 1.3
@@ -5,7 +5,8 @@
#include "Express.h"
static void _exp_message_realize(Exp_Message *msg);
-static void _exp_message_intercept_resize(void *data, Evas_Object *o,
Evas_Coord w, Evas_Coord h);
+/*static void _exp_message_intercept_resize(void *data, Evas_Object *o,
Evas_Coord w, Evas_Coord h);
+*/
Exp_Message *
exp_message_new(Exp_Conversation *conv, char *text, int sender)
@@ -23,6 +24,8 @@
conv->changed = 1;
msg->changed = 1;
msg->changes.size = 1;
+
+ return msg;
}
void
-------------------------------------------------------
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
