[prev in list] [next in list] [prev in thread] [next in thread] 

List:       enlightenment-svn
Subject:    E CVS: e kwo
From:       Enlightenment CVS <noreply () fitx-00 ! ewr ! caoslinux ! org>
Date:       2007-12-30 21:20:52
Message-ID: 20071230212052.C45A5A30A2 () cvs ! caoslinux ! org
[Download RAW message or body]

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
	E.h buttons.c desktops.c 


Log Message:
Mark deskray stuff as such.

===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.599
retrieving revision 1.600
diff -u -3 -r1.599 -r1.600
--- E.h	30 Dec 2007 20:55:20 -0000	1.599
+++ E.h	30 Dec 2007 21:20:52 -0000	1.600
@@ -69,6 +69,7 @@
 #include "xwin.h"
 
 #define ENABLE_COLOR_MODIFIERS 0	/* Not functional */
+#define ENABLE_DESKRAY         0	/* Not functional */
 
 #define ENABLE_TRANSPARENCY 1
 #define ENABLE_THEME_TRANSPARENCY 1
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- buttons.c	30 Dec 2007 20:40:49 -0000	1.108
+++ buttons.c	30 Dec 2007 21:20:52 -0000	1.109
@@ -949,8 +949,10 @@
 	match = matchregexp(bmd->regex, EoGetName(b));
 	if ((match && !bmd->match) || (!match && bmd->match))
 	   return;
-	if (!strcmp(EoGetName(b), "_DESKTOP_DESKRAY_DRAG_CONTROL"))	/* FIXME - ??? */
+#if ENABLE_DESKRAY
+	if (!strcmp(EoGetName(b), "_DESKTOP_DESKRAY_DRAG_CONTROL"))
 	   return;
+#endif
      }
 
    ButtonToggle(b);
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -3 -r1.274 -r1.275
--- desktops.c	30 Dec 2007 21:18:04 -0000	1.274
+++ desktops.c	30 Dec 2007 21:20:52 -0000	1.275
@@ -79,6 +79,10 @@
 {
    char                s[512];
    const char         *ic1, *ic2, *ic3;
+
+#if ENABLE_DESKRAY
+   const char         *ic4;
+#endif
    char                ac1[64], ac2[64], ac3[64];
    Button             *b;
    ActionClass        *ac;
@@ -171,7 +175,7 @@
 	ic1 = "DESKTOP_DRAGBUTTON_VERT";
 	ic2 = "DESKTOP_RAISEBUTTON_VERT";
 	ic3 = "DESKTOP_LOWERBUTTON_VERT";
-#if 0
+#if ENABLE_DESKRAY
 	ic4 = "DESKTOP_DESKRAY_VERT";
 #endif
      }
@@ -180,7 +184,7 @@
 	ic1 = "DESKTOP_DRAGBUTTON_HORIZ";
 	ic2 = "DESKTOP_RAISEBUTTON_HORIZ";
 	ic3 = "DESKTOP_LOWERBUTTON_HORIZ";
-#if 0
+#if ENABLE_DESKRAY
 	ic4 = "DESKTOP_DESKRAY_HORIZ";
 #endif
      }
@@ -289,7 +293,7 @@
 	ButtonSetCallback(b, DeskButtonCallback, EoObj(dsk));
      }
 
-#if 0				/* What is this anyway? */
+#if ENABLE_DESKRAY
    if (dsk->num > 0)
      {
 	if (Conf.desks.dragdir == 0)
@@ -2081,7 +2085,9 @@
      }
    return 0;
 }
+#endif
 
+#if ENABLE_DESKRAY
 static int
 doDeskray(EWin * edummy, const char *params)
 {
@@ -2113,7 +2119,7 @@
      }
    return 0;
 }
-#endif
+#endif /* ENABLE_DESKRAY */
 
 static void
 DesksInit(void)



-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
[prev in list] [next in list] [prev in thread] [next in thread]