[ekg2-commit] ekg2: gg.c (HEAD) [darkjames]

[CVS commit]

Module name:	ekg2
Changes by:	darkjames	2007-09-05 18:11:58

Modified files:
	gg.c

Log message:
- remove some unused variables.
- fix http://bugs.ekg2.org/task/89 (it's when e->event.image_reply.filename == NULL @ solaris), but,
     e->event.image_reply.filename is NULL when smb doesn't have that image (e->event.image_reply.image == NULL)
     so @ more linux-like system it would segv @
#v+
     for (i = 0; i<e->event.image_reply.size; i++) {
	     fputc(e->event.image_reply.image[i],fp);
     }
#v-
	coz e->event.image_reply.image is also NULL.
- fix casting from void * to int. (x86_64)

Index: gg.c
===================================================================
RCS file: /home/cvs/ekg2/plugins/gg/gg.c,v
diff -d -u -r1.220 -r1.221
--- gg.c	9 Aug 2007 14:41:20 -0000	1.220
+++ gg.c	5 Sep 2007 16:11:58 -0000	1.221
@@ -264,7 +264,7 @@
 	userlist_t *u	= *(va_arg(ap, userlist_t **));
 	session_t *s	= *(va_arg(ap, session_t **));
 	gg_private_t *g;
-	int quiet = (int) data;
+	int quiet = (data == NULL);
 	int uin;
 
 	if (!s || !(g = s->priv) || s->plugin != &gg_plugin)
@@ -1129,8 +1129,6 @@
 									char *uid	= xstrdup(tmp);
 									int status	= EKG_STATUS_INVISIBLE;
 									char *descr	= xstrdup(u->descr);
-									char *host	= NULL;
-									int port	= 0;
 									time_t when	= time(NULL);
 									
 									query_emit_id(NULL, PROTOCOL_STATUS, &session, &uid, &status, &descr, &when);
@@ -1166,12 +1164,12 @@
 				break;
 			}
 		case GG_EVENT_IMAGE_REPLY:
-			{
+			if (e->event.image_reply.image) {
 				const char *image_basedir;
 				char *image_file;
 				FILE *fp;
 				int i;
-			
+
 		/* 0th, get basedir */
 				image_basedir = gg_config_images_dir ? 
 					gg_config_images_dir : 			/* dir specified by config */
@@ -1213,6 +1211,10 @@
 				xfree(image_file);
 
 				break;
+			} else {
+				/* XXX, display no image, from libgadu: */
+					/* pusta odpowiedź - klient po drugiej stronie nie ma żądanego obrazka */
+
 			}
 	}
 }