Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_intl.c
Log Message:
dont segv on empty bind param etc. matches. also a note for intle.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- e_config.c 24 Nov 2005 04:23:31 -0000 1.125
+++ e_config.c 25 Nov 2005 04:10:54 -0000 1.126
@@ -1711,8 +1711,10 @@
(eb->button == eb_in->button) &&
(eb->modifiers == eb_in->modifiers) &&
(eb->any_mod == eb_in->any_mod) &&
- (!strcmp(eb->action, eb_in->action)) &&
- (!strcmp(eb->params, eb_in->params)))
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action,
eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params,
eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
return eb;
}
return NULL;
@@ -1731,9 +1733,12 @@
if ((eb->context == eb_in->context) &&
(eb->modifiers == eb_in->modifiers) &&
(eb->any_mod == eb_in->any_mod) &&
- (!strcmp(eb->key, eb_in->key)) &&
- (!strcmp(eb->action, eb_in->action)) &&
- (!strcmp(eb->params, eb_in->params)))
+ (((eb->key) && (eb_in->key) && (!strcmp(eb->key, eb_in->key))) ||
+ ((!eb->key) && (!eb_in->key))) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action,
eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params,
eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
return eb;
}
return NULL;
@@ -1752,10 +1757,14 @@
if ((eb->context == eb_in->context) &&
(eb->modifiers == eb_in->modifiers) &&
(eb->any_mod == eb_in->any_mod) &&
- (!strcmp(eb->signal, eb_in->signal)) &&
- (!strcmp(eb->source, eb_in->source)) &&
- (!strcmp(eb->action, eb_in->action)) &&
- (!strcmp(eb->params, eb_in->params)))
+ (((eb->signal) && (eb_in->signal) && (!strcmp(eb->signal,
eb_in->signal))) ||
+ ((!eb->signal) && (!eb_in->signal))) &&
+ (((eb->source) && (eb_in->source) && (!strcmp(eb->source,
eb_in->source))) ||
+ ((!eb->source) && (!eb_in->source))) &&
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action,
eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params,
eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
return eb;
}
return NULL;
@@ -1776,8 +1785,10 @@
(eb->z == eb_in->z) &&
(eb->modifiers == eb_in->modifiers) &&
(eb->any_mod == eb_in->any_mod) &&
- (!strcmp(eb->action, eb_in->action)) &&
- (!strcmp(eb->params, eb_in->params)))
+ (((eb->action) && (eb_in->action) && (!strcmp(eb->action,
eb_in->action))) ||
+ ((!eb->action) && (!eb_in->action))) &&
+ (((eb->params) && (eb_in->params) && (!strcmp(eb->params,
eb_in->params))) ||
+ ((!eb->params) && (!eb_in->params))))
return eb;
}
return NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_intl.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_intl.c 22 Nov 2005 13:28:10 -0000 1.54
+++ e_intl.c 25 Nov 2005 04:10:54 -0000 1.55
@@ -152,6 +152,7 @@
{
_e_intl_language = strdup(lang);
e_util_env_set("LANGUAGE", _e_intl_language);
+ /* FIXME: maybe we should set these anyway? */
if (getenv("LANG")) e_util_env_set("LANG", _e_intl_language);
if (getenv("LC_ALL")) e_util_env_set("LC_ALL", _e_intl_language);
if (getenv("LC_MESSAGES")) e_util_env_set("LC_MESSAGES",
_e_intl_language);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
