From: <enl...@so...> - 2001-01-03 21:03:33
|
Enlightenment CVS committal Author : gilbertt Project : misc Module : camE Modified Files: Makefile example.camErc ftp.c webcam.c Log Message: quick fixups =================================================================== RCS file: /cvsroot/enlightenment/misc/camE/Makefile,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile 2000/11/09 12:50:04 1.4 +++ Makefile 2001/01/03 21:03:34 1.5 @@ -7,7 +7,7 @@ mandir=$(ROOT)${prefix}/man CC=gcc -CFLAGS=-O3 -Wall -I$(srcdir)/.. -I.. -D_GNU_SOURCE `giblib-config --cflags` +CFLAGS=-O3 -g -Wall -I$(srcdir)/.. -I.. -D_GNU_SOURCE `giblib-config --cflags` INSTALL=/usr/bin/install -c INSTALL_PROGRAM=${INSTALL} =================================================================== RCS file: /cvsroot/enlightenment/misc/camE/example.camErc,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- example.camErc 2000/11/10 15:47:56 1.8 +++ example.camErc 2001/01/03 21:03:34 1.9 @@ -25,7 +25,7 @@ lag_reduce = 5 # This goes at the bottom left, with the message from "infofile" appended. # It is run through strftime, so date vars are expanded. -text = %d/%m/%Y %H:%M GMT - +text = %d/%m/%Y %H:%M %Z - width = 352 height = 288 # delay between uploading one shot and starting the next =================================================================== RCS file: /cvsroot/enlightenment/misc/camE/ftp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ftp.c 2000/12/17 20:51:46 1.2 +++ ftp.c 2001/01/03 21:03:34 1.3 @@ -248,8 +248,8 @@ /* initialisation */ ftp_send(1, "bin"); ftp_recv(); - ftp_send(1, "umask 022"); - ftp_recv(); +/* ftp_send(1, "umask 022"); + ftp_recv(); */ /* ok */ break; =================================================================== RCS file: /cvsroot/enlightenment/misc/camE/webcam.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- webcam.c 2000/12/17 20:51:46 1.13 +++ webcam.c 2001/01/03 21:03:34 1.14 @@ -15,6 +15,7 @@ #include <sys/time.h> #include <sys/mman.h> #include <sys/ioctl.h> +#include <sys/stat.h> #include <X11/Xlib.h> #include <Imlib2.h> #include <giblib.h> @@ -235,7 +236,7 @@ if (line[len - 1] == '\n') line[--len] = '\0'; - if (title_text) + if (title_text && title_fn) { gib_imlib_get_text_size(title_fn, title_line, title_style, &w, &h, IMLIB_TEXT_TO_RIGHT); @@ -248,7 +249,7 @@ title_a); } - if (line) + if (line && text_fn) { gib_imlib_get_text_size(text_fn, line, text_style, &w, &h, IMLIB_TEXT_TO_RIGHT); |