Sync with efreet and some cleanup

SVN revision: 47478

2 files changed, 17 insertions, 4 deletions

diff --git a/src/modules/illume-keyboard/e_mod_config.c b/src/modules/illume-keyboard/e_mod_config.c
index 19f06f1124..dfa43fa236 100644
--- a/src/modules/illume-keyboard/e_mod_config.c
+++ b/src/modules/illume-keyboard/e_mod_config.c
@@ -164,6 +164,8 @@ _il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata
                     }
                   nn++;
                }
+	     EINA_LIST_FREE(kbds, desktop)
+	       efreet_desktop_free(desktop);
           }
      }
 
@@ -181,14 +183,15 @@ _il_kbd_config_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata
         int nn = 2;
 
         kbds = efreet_util_desktop_category_list("Keyboard");
-        EINA_LIST_FOREACH(kbds, l, desktop) 
+        EINA_LIST_FREE(kbds, desktop) 
           {
              ow = e_widget_radio_add(evas, desktop->name, nn, rg);
              e_widget_framelist_object_append(of, ow);
              evas_object_smart_callback_add(ow, "changed", 
                                             _il_kbd_config_changed, NULL);
+	     efreet_desktop_free(desktop);
              nn++;
-          }
+	  }
      }
    e_widget_list_object_append(list, of, 1, 0, 0.0);
    return list;
@@ -239,6 +242,8 @@ _il_kbd_config_change_timeout(void *data)
                     }
                   nn++;
                }
+	     EINA_LIST_FREE(kbds, desktop)
+	       efreet_desktop_free(desktop);
           }
      }
 
diff --git a/src/modules/illume-keyboard/e_mod_main.c b/src/modules/illume-keyboard/e_mod_main.c
index f3ea782b30..368ed7c743 100644
--- a/src/modules/illume-keyboard/e_mod_main.c
+++ b/src/modules/illume-keyboard/e_mod_main.c
@@ -71,12 +71,13 @@ _il_kbd_start(void)
         desktop = efreet_util_desktop_file_id_find(il_kbd_cfg->run_keyboard);
         if (!desktop) 
           {
+	     Efreet_Desktop *d;
              Eina_List *kbds, *l;
 
              kbds = efreet_util_desktop_category_list("Keyboard");
              if (kbds) 
                {
-                  EINA_LIST_FOREACH(kbds, l, desktop) 
+                  EINA_LIST_FOREACH(kbds, l, d) 
                     {
                        const char *dname;
 
@@ -84,9 +85,15 @@ _il_kbd_start(void)
                        if (dname) 
                          {
                             if (!strcmp(dname, il_kbd_cfg->run_keyboard))
-                              break;
+			      {
+				 desktop = d;
+				 efreet_desktop_ref(desktop);
+				 break;
+			      }
                          }
                     }
+		  EINA_LIST_FREE(kbds, d)
+		    efreet_desktop_free(d);
                }
           }
         if (desktop) 
@@ -102,6 +109,7 @@ _il_kbd_start(void)
                     ecore_event_handler_add(ECORE_EXE_EVENT_DEL, 
                                             _il_kbd_cb_exit, NULL);
                }
+	     efreet_desktop_free(desktop);
           }
      }
 }