Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_int_border_locks.c
Log Message:
and actually delete the locks dialog if the window is deleted.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -3 -r1.450 -r1.451
--- e_border.c 17 Oct 2005 11:51:46 -0000 1.450
+++ e_border.c 17 Oct 2005 12:01:33 -0000 1.451
@@ -2551,6 +2551,12 @@
if (bd->shade.anim) ecore_animator_del(bd->shade.anim);
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
+ if (bd->border_locks_dialog)
+ {
+ e_object_del(E_OBJECT(bd->border_locks_dialog));
+ bd->border_locks_dialog = NULL;
+ }
+
_e_border_menus_del(bd);
if (focused == bd)
@@ -2644,6 +2650,12 @@
if (bd->border_menu) e_menu_deactivate(bd->border_menu);
+ if (bd->border_locks_dialog)
+ {
+ e_object_del(E_OBJECT(bd->border_locks_dialog));
+ bd->border_locks_dialog = NULL;
+ }
+
_e_border_menus_del(bd);
if (bd->raise_timer)
{
@@ -2723,11 +2735,6 @@
{
int was_menu = 0;
- if (bd->border_locks_dialog)
- {
- e_object_del(E_OBJECT(bd->border_locks_dialog));
- bd->border_locks_dialog = NULL;
- }
if (bd->border_remember_menu)
{
e_object_del(E_OBJECT(bd->border_remember_menu));
@@ -6133,7 +6140,9 @@
_e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Border *bd;
+
bd = data;
+ if (bd->border_locks_dialog) return;
e_int_border_locks(bd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_border_locks.c 17 Oct 2005 11:51:46 -0000 1.1
+++ e_int_border_locks.c 17 Oct 2005 12:01:33 -0000 1.2
@@ -63,6 +63,7 @@
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Locks"), NULL, 0, &v, bd);
+ bd->border_locks_dialog = cfd;
}
/**--CREATE--**/
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
