fix small leaks in efm and e_import_config_dialog

SVN revision: 83137

diff --git a/ChangeLog b/ChangeLog
index 30d5f21..6210aa4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2013-01-23 Mike Blumenkrantz
 
         * module error dialog is no longer remembered across restarts
+        * fixed small leak in efm when performing dnd onto mounted drive icon
+        * fixed small leak in e_import_config_dialog_show during failure case
 
 2013-01-22 Mike Blumenkrantz
 

diff --git a/NEWS b/NEWS
index 796ba75..76c6f77 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -112,3 +112,5 @@ Fixes:
     * fixed gadget dragging on desktop near screen edges
     * fixed bug where "don't composite fullscreen windows" option would cause some windows to stop appearing
     * module error dialog is no longer remembered across restarts
+    * fix small leak in efm when performing dnd onto mounted drive icon
+    * fixed small leak in e_import_config_dialog_show during failure case

diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 4ffff7c..435282c 100644 (file)
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -6969,7 +6969,7 @@ _e_fm2_cb_dnd_selection_notify(void *data, const char *type, void *event)
                evas_object_data_set(sd->obj, "drop_menu_data", mop);
              E_LIST_FOREACH(isel, _e_fm2_cb_drag_finished_show);
           }
-        if (((!mnt) && (!mop)) && (do_lnk || do_copy || do_move))
+        if (((!mnt) || (!mop)) && (do_lnk || do_copy || do_move))
           free(args);
      }
 end:

diff --git a/src/bin/e_import_config_dialog.c b/src/bin/e_import_config_dialog.c
index 022bffb..916cad9 100644 (file)
--- a/src/bin/e_import_config_dialog.c
+++ b/src/bin/e_import_config_dialog.c
@@ -448,7 +448,11 @@ e_import_config_dialog_show(E_Container *con, const char *path, Ecore_End_Cb ok,
    if (!import) return NULL;
 
    dia = e_dialog_new(con, "E", "_import_config_dialog");
-   if (!dia) return NULL;
+   if (!dia)
+     {
+        e_object_del(E_OBJECT(import));
+        return NULL;
+     }
    e_dialog_resizable_set(dia, 1);
 
    e_dialog_title_set(dia, _("Import Settings..."));