Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_config.c ewl_object.c
Log Message:
Remove unused inner max and min accessors, these can be added back easily if
there is some future need.
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- ewl_config.c 9 Dec 2007 01:00:40 -0000 1.36
+++ ewl_config.c 26 Dec 2007 18:10:36 -0000 1.37
@@ -608,6 +608,31 @@
}
static char *
+ewl_config_file_name_build_get(Ewl_Config *cfg)
+{
+ char cfg_filename[PATH_MAX], *fname;
+ int is_ewl = FALSE;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(cfg, NULL);
+
+ if (!getenv("srcdir"))
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+
+ if (!strcmp(cfg->app_name, "ewl"))
+ is_ewl = TRUE;
+
+ fname = ewl_config_file_name_clean(cfg);
+ snprintf(cfg_filename, sizeof(cfg_filename),
+ "%s/../../data/config/%s%s.cfg", getenv("srcdir"),
+ (is_ewl ? "" : "apps/"), fname);
+
+ FREE(fname);
+
+ DRETURN_PTR(strdup(cfg_filename), DLEVEL_STABLE);
+}
+
+static char *
ewl_config_file_name_system_get(Ewl_Config *cfg)
{
char cfg_filename[PATH_MAX], *fname;
@@ -662,7 +687,12 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET(cfg, FALSE);
- fname = ewl_config_file_name_system_get(cfg);
+ /*
+ * Attempt to load a build relative config file first. This allows for
+ * testing without installing.
+ */
+ fname = ewl_config_file_name_build_get(cfg);
+ if (!fname) fname = ewl_config_file_name_system_get(cfg);
sys_ret = ewl_config_file_load(cfg, TRUE, fname);
FREE(fname);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_object.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_object.c 12 Nov 2007 22:42:22 -0000 1.24
+++ ewl_object.c 26 Dec 2007 18:10:36 -0000 1.25
@@ -770,42 +770,6 @@
}
/**
- * @param o: the object to get the minimum width
- * @return Returns the minimum width of the object @a o.
- * @brief Get the minimum width of an object
- */
-int
-ewl_object_minimum_inner_w_get(Ewl_Object *o)
-{
- int val;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET(o, 0);
-
- val = MINIMUM_W(o);
-
- DRETURN_INT(val, DLEVEL_STABLE);
-}
-
-/**
- * @param o: the object to get the minimum height
- * @return Returns the minimum height of the object.
- * @brief Get the minimum height of an object
- */
-int
-ewl_object_minimum_inner_h_get(Ewl_Object *o)
-{
- int val;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET(o, 0);
-
- val = MINIMUM_H(o);
-
- DRETURN_INT(val, DLEVEL_STABLE);
-}
-
-/**
* @param o: the object to retrieve the minimum dimensions
* @param w: a pointer to an integer to store the minimum width
* @param h: a pointer to an integer to store the minimum height
@@ -966,42 +930,6 @@
if ((val + PADDING_VERTICAL(o) + INSET_VERTICAL(o)) > val)
val += PADDING_VERTICAL(o) + INSET_VERTICAL(o);
-
- DRETURN_INT(val, DLEVEL_STABLE);
-}
-
-/**
- * @param o: the object to get the maximum width
- * @return Returns the maximum width of the object.
- * @brief Get the maximum width of an object
- */
-int
-ewl_object_maximum_inner_w_get(Ewl_Object *o)
-{
- int val;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET(o, 0);
-
- val = MAXIMUM_W(o);
-
- DRETURN_INT(val, DLEVEL_STABLE);
-}
-
-/**
- * @param o: the object to get the maximum height
- * @return Returns the maximum height of the object.
- * @brief Get the maximum height of an object
- */
-int
-ewl_object_maximum_inner_h_get(Ewl_Object *o)
-{
- int val;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET(o, 0);
-
- val = MAXIMUM_H(o);
DRETURN_INT(val, DLEVEL_STABLE);
}
-------------------------------------------------------------------------
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
