From b4804a4025d1097cdcb73a5d906154914b5e2e26 Mon Sep 17 00:00:00 2001
From: xcomputerman <xcomputerman>
Date: Thu, 30 Dec 2004 09:11:29 +0000
Subject: [PATCH] Remove redundant inits, ICCCM focus send should only be done
 if wm property is set

SVN revision: 12649
---
 src/bin/e_border.c | 5 +++--
 src/bin/e_hints.c  | 4 ----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 6408826fe..0d3b990ad 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -385,8 +385,7 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	     if (bd->client.icccm.take_focus)
 	       {
 		  printf("take focus!\n");
-		  /*
-		  ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);*/
+		  ecore_x_icccm_take_focus_send(bd->client.win, ECORE_X_CURRENT_TIME);
 		  e_hints_active_window_set(bd->client.win);
 		  ecore_x_window_focus(bd->client.win);
 	       }
@@ -394,12 +393,14 @@ e_border_focus_set(E_Border *bd, int focus, int set)
 	       {
 		  printf("set focus\n");
 		  ecore_x_window_focus(bd->client.win);
+		  e_hints_active_window_set(bd->client.win);
 	       }
 	  }
 	else
 	  {
 	     printf("remove focus\n");
 	     ecore_x_window_focus(bd->container->manager->win);
+	     e_hints_active_window_set(0);
 	  }
      }
    if ((bd->focused) && (focused != bd))
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index b719752cd..98a9ccd5b 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -16,9 +16,6 @@ e_hints_init(void)
 
    win = ecore_x_window_new(0, -200, -200, 5, 5);
 
-   ecore_x_icccm_init();
-   ecore_x_netwm_init();
-   
    if (roots)
      {
         if (num > 0)
@@ -138,7 +135,6 @@ e_hints_client_stacking_set(void)
 void
 e_hints_active_window_set(Ecore_X_Window win)
 {
-   ecore_x_icccm_take_focus_send(win, ECORE_X_CURRENT_TIME);
    ecore_x_netwm_client_active_set(root, win);
 }