Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
e16-ecore_hints.c eimage.c hints.h icccm.c sound.c ttfont.c
x.c xwin.h
Log Message:
Trivial cleanups.
===================================================================
RCS file: /cvs/e/e16/e/src/e16-ecore_hints.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16-ecore_hints.c 18 Feb 2006 09:50:16 -0000 1.1
+++ e16-ecore_hints.c 21 May 2006 18:44:15 -0000 1.2
@@ -75,8 +75,6 @@
#else /* USE_ECORE_X */
-extern Display *disp;
-
/*
* General stuff
*/
===================================================================
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eimage.c 14 May 2006 10:59:30 -0000 1.6
+++ eimage.c 21 May 2006 18:44:15 -0000 1.7
@@ -259,6 +259,9 @@
int x, y, tx, ty, ww, hh;
int sw, sh;
+ if (tw <= 0 || th <= 0)
+ return;
+
imlib_context_set_image(tile);
sw = imlib_image_get_width();
sh = imlib_image_get_height();
===================================================================
RCS file: /cvs/e/e16/e/src/hints.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- hints.h 29 Apr 2006 19:39:21 -0000 1.8
+++ hints.h 21 May 2006 18:44:15 -0000 1.9
@@ -105,7 +105,6 @@
void ICCCM_Init(void);
void ICCCM_ProcessClientMessage(XClientMessageEvent * event);
void ICCCM_GetTitle(EWin * ewin, Atom atom_change);
-void ICCCM_GetColormap(EWin * ewin);
void ICCCM_Delete(const EWin * ewin);
void ICCCM_Save(const EWin * ewin);
void ICCCM_Iconify(const EWin * ewin);
===================================================================
RCS file: /cvs/e/e16/e/src/icccm.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- icccm.c 3 May 2006 20:52:15 -0000 1.125
+++ icccm.c 21 May 2006 18:44:16 -0000 1.126
@@ -92,7 +92,7 @@
EwinChange(ewin, EWIN_CHANGE_NAME);
}
-void
+static void
ICCCM_GetColormap(EWin * ewin)
{
XWindowAttributes xwa;
===================================================================
RCS file: /cvs/e/e16/e/src/sound.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- sound.c 26 Apr 2006 23:43:07 -0000 1.43
+++ sound.c 21 May 2006 18:44:16 -0000 1.44
@@ -65,7 +65,7 @@
static int sound_fd = -1;
-Ecore_List *sound_list = NULL;
+static Ecore_List *sound_list = NULL;
#ifdef HAVE_LIBESD
static Sample *
===================================================================
RCS file: /cvs/e/e16/e/src/ttfont.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ttfont.c 14 May 2006 19:38:51 -0000 1.51
+++ ttfont.c 21 May 2006 18:44:16 -0000 1.52
@@ -24,7 +24,6 @@
#include "E.h"
#include "eimage.h"
#include "tclass.h"
-#include "xwin.h"
#include <Imlib2.h>
struct _efont
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- x.c 21 May 2006 12:09:14 -0000 1.141
+++ x.c 21 May 2006 18:44:18 -0000 1.142
@@ -64,7 +64,7 @@
int depth;
Colormap cmap;
Pixmap bgpmap;
- int bgcol;
+ unsigned int bgcol;
};
typedef struct _xwin EXID; /* FIXME - Remove */
@@ -110,7 +110,7 @@
EXID *xid;
xid = Ecalloc(1, sizeof(EXID));
- xid->bgcol = -1;
+ xid->bgcol = 0xffffffff;
return xid;
}
@@ -905,7 +905,7 @@
}
void
-ESetWindowBackground(Win win, int col)
+ESetWindowBackground(Win win, unsigned int col)
{
EXID *xid = win;
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- xwin.h 21 May 2006 12:09:14 -0000 1.20
+++ xwin.h 21 May 2006 18:44:18 -0000 1.21
@@ -87,7 +87,7 @@
void EConfigureWindow(Win win, unsigned int mask,
XWindowChanges * wc);
void ESetWindowBackgroundPixmap(Win win, Pixmap pmap);
-void ESetWindowBackground(Win win, int col);
+void ESetWindowBackground(Win win, unsigned int col);
int ETranslateCoordinates(Win src_w, Win dst_w,
int src_x, int src_y,
int *dest_x_return,
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
