Close the Window Properties dialog if the app closes.

SVN revision: 27289

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 381b652..d17e5d9 100644 (file)
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -3093,6 +3093,11 @@ _e_border_free(E_Border *bd)
        e_object_del(E_OBJECT(bd->border_border_dialog));
        bd->border_border_dialog = NULL;
      }
+   if (bd->border_prop_dialog) 
+     {
+       e_object_del(E_OBJECT(bd->border_prop_dialog));
+       bd->border_prop_dialog = NULL;
+     }
    
    e_int_border_menu_del(bd);
 

diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index 8de87c2..b76bfdb 100644 (file)
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -412,6 +412,8 @@ struct _E_Border
    E_Config_Dialog *border_locks_dialog;
    E_Config_Dialog *border_remember_dialog;
    E_Config_Dialog *border_border_dialog;
+   E_Config_Dialog *border_icon_dialog;
+   E_Dialog *border_prop_dialog;
    E_Menu *border_stacking_menu;
    E_Menu *border_maximize_menu;
    Evas_List *pending_move_resize;

diff --git a/src/bin/e_int_border_prop.c b/src/bin/e_int_border_prop.c
index b7fb6b8..aa07e14 100644 (file)
--- a/src/bin/e_int_border_prop.c
+++ b/src/bin/e_int_border_prop.c
@@ -102,6 +102,7 @@ _create_data(E_Dialog *cfd, E_Border *bd)
    
    cfdata = E_NEW(E_Config_Dialog_Data, 1);
    cfdata->border = bd;
+   bd->border_prop_dialog = cfd;
    
 #define IFDUP(prop, dest) \
    if (cfdata->border->prop) cfdata->dest = strdup(cfdata->border->prop)
@@ -298,6 +299,9 @@ _create_data(E_Dialog *cfd, E_Border *bd)
 static void
 _free_data(E_Dialog *cfd, E_Config_Dialog_Data *cfdata)
 {
+   if (cfdata->border)
+     cfdata->border->border_prop_dialog = NULL;
+   
    /* Free the cfdata */
 #define IFREE(x) E_FREE(cfdata->x)
    IFREE(icccm.title);