kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport personal apps and xkbswitch fixes from last 2 commits 

SVN revision: 83593
This commit is contained in:
Mike Blumenkrantz 2013-02-04 11:53:54 +00:00
parent e33b133624
commit 397713edc8
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-02-04 Mike Blumenkrantz
* fix possible crash in xkb rule parsing
* fix list update on deletion of personal app launchers
2013-02-01 Mike Blumenkrantz
* fixed leak in profile list dbus method

2
NEWS
View File

@ -20,6 +20,8 @@ Fixes:
* fixed bugs where keyboard layouts could not be applied or selected
* fixed leak in profile list dbus method
* fixed behavior of Up/Down keys in filemanager when typebuf was visible
* fix possible crash in xkb rule parsing
* fix list update on deletion of personal app launchers
Changes since 0.17.0:

6
src/modules/conf_applications/e_int_config_apps_personal.c
View File

@ -199,14 +199,18 @@ _btn_cb_del(void *data, void *data2 __UNUSED__)
E_Config_Dialog_Data *cfdata = data;
const Eina_List *l;
const E_Ilist_Item *it;
int x = -1;
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->obj.list), l, it)
{
const char *file;
x++;
if (!it->selected) continue;
file = e_widget_ilist_item_data_get(it);
if (file) ecore_file_unlink(file);
if (!file) break;
ecore_file_unlink(file);
e_widget_ilist_remove_num(cfdata->obj.list, x);
}
}

8
src/modules/xkbswitch/e_mod_parse.c
View File

@ -88,7 +88,7 @@ parse_rules(void)
if (n) *n = '\0';
/* means end of section */
if (!buf[0]) break;
if (eina_strlen_bounded(buf, 3) < 2) break;
/* get rid of initial 2 spaces here */
p = buf + 2;
tmp = strdup(p);
@ -125,7 +125,7 @@ parse_rules(void)
n = strchr(buf, '\n');
if (n) *n = '\0';
if (!buf[0]) break;
if (eina_strlen_bounded(buf, 3) < 2) break;
p = buf + 2;
tmp = strdup(p);
@ -167,7 +167,7 @@ parse_rules(void)
n = strchr(buf, '\n');
if (n) *n = '\0';
if (!buf[0]) break;
if (eina_strlen_bounded(buf, 3) < 2) break;
p = buf + 2;
tmp = strdup(p);
@ -210,7 +210,7 @@ parse_rules(void)
n = strchr(buf, '\n');
if (n) *n = '\0';
if (!buf[0]) break;
if (eina_strlen_bounded(buf, 3) < 2) break;
p = buf + 2;
tmp = strdup(p);