Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
aclass.c aclass.h iclass.c tclass.c
Log Message:
Image/text class destroy is broken (and never used).
===================================================================
RCS file: /cvs/e/e16/e/src/aclass.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- aclass.c 23 Feb 2008 12:09:35 -0000 1.45
+++ aclass.c 23 Feb 2008 12:13:28 -0000 1.46
@@ -189,7 +189,7 @@
return ac;
}
-void
+static void
ActionclassDestroy(ActionClass * ac)
{
int i;
@@ -211,6 +211,7 @@
Efree(ac->list);
Efree(ac->name);
Efree(ac->tooltipstring);
+
Efree(ac);
mode_action_destroy = 1;
}
===================================================================
RCS file: /cvs/e/e16/e/src/aclass.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- aclass.h 27 Jul 2007 16:59:49 -0000 1.7
+++ aclass.h 23 Feb 2008 12:13:28 -0000 1.8
@@ -29,7 +29,6 @@
/* aclass.c */
int AclassConfigLoad(FILE * fs);
ActionClass *ActionclassCreate(const char *name, int global);
-void ActionclassDestroy(ActionClass * ac);
Action *ActionCreate(char event, char anymod, int mod, int anybut,
int but, char anykey, const char *key,
const char *tooltipstring);
===================================================================
RCS file: /cvs/e/e16/e/src/iclass.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- iclass.c 23 Feb 2008 12:09:36 -0000 1.131
+++ iclass.c 23 Feb 2008 12:13:28 -0000 1.132
@@ -32,6 +32,8 @@
#include "tclass.h"
#include "xwin.h"
+#define ENABLE_DESTROY 0 /* Broken */
+
#if ENABLE_COLOR_MODIFIERS
typedef struct
{
@@ -223,6 +225,7 @@
return is;
}
+#if ENABLE_DESTROY
static void
ImagestateDestroy(ImageState * is)
{
@@ -253,6 +256,7 @@
ImagestateDestroy(isa->clicked);
ImagestateDestroy(isa->disabled);
}
+#endif /* ENABLE_DESTROY */
static void
ImagestateColorsAlloc(ImageState * is)
@@ -343,6 +347,7 @@
return ic;
}
+#if ENABLE_DESTROY
static void
ImageclassDestroy(ImageClass * ic)
{
@@ -372,6 +377,7 @@
Efree(ic);
}
+#endif /* ENABLE_DESTROY */
ImageClass *
ImageclassAlloc(const char *name, int fallback)
@@ -1438,7 +1444,9 @@
if (!strcmp(param2, "delete"))
{
+#if ENABLE_DESTROY
ImageclassDestroy(ic);
+#endif
}
else if (!strcmp(param2, "modify"))
{
@@ -1551,7 +1559,7 @@
{
ImageclassIpc,
"imageclass", NULL,
- "List imageclasses, create/delete/modify/apply an imageclass",
+ "List imageclasses, apply an imageclass",
NULL}
,
};
===================================================================
RCS file: /cvs/e/e16/e/src/tclass.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- tclass.c 23 Feb 2008 12:09:38 -0000 1.59
+++ tclass.c 23 Feb 2008 12:13:28 -0000 1.60
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -29,6 +29,8 @@
#include "tclass.h"
#include "xwin.h"
+#define ENABLE_DESTROY 0 /* Broken */
+
static Ecore_List *tclass_list = NULL;
static char *
@@ -66,6 +68,7 @@
return ts;
}
+#if ENABLE_DESTROY
static void
TextStateDestroy(TextState * ts)
{
@@ -78,6 +81,7 @@
Efree(ts);
}
+#endif
static TextClass *
TextclassCreate(const char *name)
@@ -98,6 +102,7 @@
return tc;
}
+#if ENABLE_DESTROY
static void
TextclassDestroy(TextClass * tc)
{
@@ -127,6 +132,7 @@
Efree(tc);
}
+#endif /* ENABLE_DESTROY */
TextClass *
TextclassAlloc(const char *name, int fallback)
@@ -403,7 +409,7 @@
p = params;
l = 0;
param1[0] = param2[0] = '\0';
- sscanf(params, "%1000s %1000s %n", param1, param2, &l);
+ sscanf(p, "%1000s %1000s %n", param1, param2, &l);
p += l;
if (!strncmp(param1, "list", 2))
@@ -433,7 +439,9 @@
if (!strcmp(param2, "delete"))
{
+#if ENABLE_DESTROY
TextclassDestroy(tc);
+#endif
}
else if (!strcmp(param2, "modify"))
{
@@ -498,7 +506,7 @@
}
else
{
- IpcPrintf("Error: Unknown operation specified\n");
+ IpcPrintf("Error: unknown operation specified\n");
}
}
@@ -506,7 +514,7 @@
{
TextclassIpc,
"textclass", NULL,
- "List textclasses, create/delete/modify/apply a textclass",
+ "List textclasses, apply a textclass",
NULL}
,
};
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
