[EGIT] [core/enlightenment] enlightenment-0.19 06/07: block border-affecting client functions for csd clients

[Mike Blumenkrantz]

discomfitor pushed a commit to branch enlightenment-0.19.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=351fbd177262a570458d813956970cb9bac3176f

commit 351fbd177262a570458d813956970cb9bac3176f
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Sep 24 16:02:44 2015 -0400

    block border-affecting client functions for csd clients
---
 src/bin/e_actions.c | 4 ++++
 src/bin/e_client.c  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index e42faee..3b018a6 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -735,6 +735,7 @@ ACT_FN_GO(window_shaded, )
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (params)
           {
              int v;
@@ -780,6 +781,7 @@ ACT_FN_GO(window_borderless_toggle, __UNUSED__)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         ec->borderless = !ec->borderless;
 
         ec->border.changed = 1;
@@ -798,6 +800,7 @@ ACT_FN_GO(window_border_set, __UNUSED__)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (ec && params)
           {
              eina_stringshare_replace(&ec->bordername, params);
@@ -818,6 +821,7 @@ ACT_FN_GO(window_border_cycle, __UNUSED__)
         E_Client *ec;
 
         ec = (E_Client *)obj;
+        if (!e_comp_object_frame_allowed(ec->frame)) return;
         if (ec && params)
           {
              const char *space;
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 6e663db..8571729 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -3661,6 +3661,7 @@ e_client_shade(E_Client *ec, E_Direction dir)
    if ((ec->shaded) || (ec->shading) || (ec->fullscreen) ||
        ((ec->maximized) && (!e_config->allow_manip))) return;
    if (!e_util_strcmp("borderless", ec->bordername)) return;
+   if (!e_comp_object_frame_allowed(ec->frame)) return;
 
    e_hints_window_shaded_set(ec, 1);
    e_hints_window_shade_direction_set(ec, dir);
@@ -4198,6 +4199,7 @@ e_client_border_set(E_Client *ec, const char *name)
 
    E_OBJECT_CHECK_RETURN(ec, EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(ec, E_CLIENT_TYPE, EINA_FALSE);
+   if (!e_comp_object_frame_allowed(ec->frame)) return EINA_FALSE;
    if (ec->border.changed)
      CRI("CALLING WHEN border.changed SET!");
 

--