[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[E-devel] Lock dialog and ibar patch



Hi,
Two small patches.

First patch fixes the lock config dialog behavior when the options are
unchecked.  

There is a somewhat intermittent behavior that occurs here independent
of this patch.  I didnt pin down the root cause yet though.  It happens
when, I choose, for example, to "protect this window from me" in the
lock dialog.  After that, right clicking on the title bar doesnt work.
Left or Right clicking on the icon does work though and after some
combination of right and left clicks, the right clicking behavior of the
title bar reverts to normal.

Second patch cleans up the ibar drop overlay when trying to drop an icon
that doesnt exist.

Osei

Index: e_int_border_locks.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.12
diff -u -3 -r1.12 e_int_border_locks.c
--- e_int_border_locks.c	18 Feb 2006 04:35:27 -0000	1.12
+++ e_int_border_locks.c	22 Jul 2006 08:47:27 -0000
@@ -161,6 +161,19 @@
 	cfdata->border->lock_client_maximize = 1;
 	cfdata->border->lock_client_fullscreen = 1;
      }
+   else
+     {
+	cfdata->border->lock_client_location = 0;
+	cfdata->border->lock_client_size = 0;
+	cfdata->border->lock_client_stacking = 0;
+	cfdata->border->lock_client_iconify = 0;
+	cfdata->border->lock_client_desk = 0;
+	cfdata->border->lock_client_sticky = 0;
+	cfdata->border->lock_client_shade = 0;
+	cfdata->border->lock_client_maximize = 0;
+	cfdata->border->lock_client_fullscreen = 0;
+     }
+
    if (cfdata->protect_from_me)
      {
 	cfdata->border->lock_user_location = 1;
@@ -173,15 +186,36 @@
 	cfdata->border->lock_user_maximize = 1;
 	cfdata->border->lock_user_fullscreen = 1;
      }
+   else
+     {
+	cfdata->border->lock_user_location = 0;
+	cfdata->border->lock_user_size = 0;
+	cfdata->border->lock_user_stacking = 0;
+	cfdata->border->lock_user_iconify = 0;
+	cfdata->border->lock_user_desk = 0;
+	cfdata->border->lock_user_sticky = 0;
+	cfdata->border->lock_user_shade = 0;
+	cfdata->border->lock_user_maximize = 0;
+	cfdata->border->lock_user_fullscreen = 0;
+     }
    if (cfdata->important_window)
      {
 	cfdata->border->lock_close = 1;
 	cfdata->border->lock_life = 1;
      }
+   else
+     {
+	cfdata->border->lock_close = 0;
+	cfdata->border->lock_life = 0;
+     }
    if (cfdata->keep_my_border)
      {
 	cfdata->border->lock_border = 1;
      }
+   else
+     {
+	cfdata->border->lock_border = 0;
+     }
    /* FIXME: need to check if the remember stuff will actually work or not
     * (see e_int_border_remember.c where it checks and warns) */
    if (cfdata->remember_locks)
Index: e_mod_main.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/modules/ibar/e_mod_main.c,v
retrieving revision 1.130
diff -r1.130 e_mod_main.c
1218c1218
< 	     return;
---
> 	     goto cleanup;
1261a1262
>    cleanup: