--- e17.orig/apps/e/src/bin/e_remote_main.c	2005-05-20 08:22:38.000000000 +0200
+++ e17/apps/e/src/bin/e_remote_main.c	2005-05-20 08:20:25.000000000 +0200
@@ -76,10 +76,10 @@
 	     p = strchr(pp, '|');
 	     if (p)
 	       {
-		  if (!strncmp(pp, "SHIFT|", 6)) eb->modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strncmp(pp, "CTRL|", 5)) eb->modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strncmp(pp, "ALT|", 4)) eb->modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |= E_BINDING_MODIFIER_WIN;
+		  if (!strncmp(pp, "SHIFT|", 6)) eb->modifiers |= ECORE_X_MODIFIER_SHIFT;
+		  else if (!strncmp(pp, "CTRL|", 5)) eb->modifiers |= ECORE_X_MODIFIER_CTRL;
+		  else if (!strncmp(pp, "ALT|", 4)) eb->modifiers |= ECORE_X_MODIFIER_ALT;
+		  else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |= ECORE_X_MODIFIER_WIN;
 		  else if (strlen(pp) > 0)
 		    {
 		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
@@ -90,11 +90,11 @@
 	       }
 	     else
 	       {
-		  if (!strcmp(pp, "SHIFT")) eb->modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strcmp(pp, "CTRL")) eb->modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strcmp(pp, "ALT")) eb->modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strcmp(pp, "WIN")) eb->modifiers |= E_BINDING_MODIFIER_WIN;
-		  else if (!strcmp(pp, "NONE")) eb->modifiers = E_BINDING_MODIFIER_NONE;
+		  if (!strcmp(pp, "SHIFT")) eb->modifiers |= ECORE_X_MODIFIER_SHIFT;
+		  else if (!strcmp(pp, "CTRL")) eb->modifiers |= ECORE_X_MODIFIER_CTRL;
+		  else if (!strcmp(pp, "ALT")) eb->modifiers |= ECORE_X_MODIFIER_ALT;
+		  else if (!strcmp(pp, "WIN")) eb->modifiers |= ECORE_X_MODIFIER_WIN;
+		  else if (!strcmp(pp, "NONE")) eb->modifiers = 0;
 		  else if (strlen(pp) > 0)
 		    {
 		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
@@ -171,10 +171,10 @@
 	     p = strchr(pp, '|');
 	     if (p)
 	       {
-		  if (!strncmp(pp, "SHIFT|", 6)) eb->modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strncmp(pp, "CTRL|", 5)) eb->modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strncmp(pp, "ALT|", 4)) eb->modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |= E_BINDING_MODIFIER_WIN;
+		  if (!strncmp(pp, "SHIFT|", 6)) eb->modifiers |= ECORE_X_MODIFIER_SHIFT;
+		  else if (!strncmp(pp, "CTRL|", 5)) eb->modifiers |= ECORE_X_MODIFIER_CTRL;
+		  else if (!strncmp(pp, "ALT|", 4)) eb->modifiers |= ECORE_X_MODIFIER_ALT;
+		  else if (!strncmp(pp, "WIN|", 4)) eb->modifiers |= ECORE_X_MODIFIER_WIN;
 		  else if (strlen(pp) > 0)
 		    {
 		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
@@ -185,11 +185,11 @@
 	       }
 	     else
 	       {
-		  if (!strcmp(pp, "SHIFT")) eb->modifiers |= E_BINDING_MODIFIER_SHIFT;
-		  else if (!strcmp(pp, "CTRL")) eb->modifiers |= E_BINDING_MODIFIER_CTRL;
-		  else if (!strcmp(pp, "ALT")) eb->modifiers |= E_BINDING_MODIFIER_ALT;
-		  else if (!strcmp(pp, "WIN")) eb->modifiers |= E_BINDING_MODIFIER_WIN;
-		  else if (!strcmp(pp, "NONE")) eb->modifiers = E_BINDING_MODIFIER_NONE;
+		  if (!strcmp(pp, "SHIFT")) eb->modifiers |= ECORE_X_MODIFIER_SHIFT;
+		  else if (!strcmp(pp, "CTRL")) eb->modifiers |= ECORE_X_MODIFIER_CTRL;
+		  else if (!strcmp(pp, "ALT")) eb->modifiers |= ECORE_X_MODIFIER_ALT;
+		  else if (!strcmp(pp, "WIN")) eb->modifiers |= ECORE_X_MODIFIER_WIN;
+		  else if (!strcmp(pp, "NONE")) eb->modifiers = 0;
 		  else if (strlen(pp) > 0)
 		    {
 		       printf("OPT3 moidifier unknown. Must be or mask of:\n"
@@ -378,6 +378,12 @@
 	       "Perhaps you are out of memory?\n");
 	exit(-1);
      }
+   if (!ecore_x_init(display_name))
+     {
+	printf("ERROR: Enlightenment_remote cannot Initialize Ecore X!\n"
+	       "Perhaps you are out of memory or wrong display name?\n");
+	exit(-1);
+     }
    /* init ipc */
    if (!ecore_ipc_init())
      {
@@ -401,6 +407,7 @@
    e_ipc_codec_shutdown();
    _e_ipc_shutdown();
    ecore_ipc_shutdown();
+   ecore_x_shutdown();
    ecore_shutdown();
    
    /* just return 0 to keep the compiler quiet */
@@ -969,27 +976,27 @@
 _e_ipc_modifier_str(int mod)
 {
    _mod_buf[0] = 0;
-   if (mod & E_BINDING_MODIFIER_SHIFT)
+   if (mod & ECORE_X_MODIFIER_SHIFT)
      {
 	if (_mod_buf[0] != 0) strcat(_mod_buf, "|");
 	strcat(_mod_buf, "SHIFT");
      }
-   if (mod & E_BINDING_MODIFIER_CTRL)
+   if (mod & ECORE_X_MODIFIER_CTRL)
      {
 	if (_mod_buf[0] != 0) strcat(_mod_buf, "|");
 	strcat(_mod_buf, "CTRL");
      }
-   if (mod & E_BINDING_MODIFIER_ALT)
+   if (mod & ECORE_X_MODIFIER_ALT)
      {
 	if (_mod_buf[0] != 0) strcat(_mod_buf, "|");
 	strcat(_mod_buf, "ALT");
      }
-   if (mod & E_BINDING_MODIFIER_WIN)
+   if (mod & ECORE_X_MODIFIER_WIN)
      {
 	if (_mod_buf[0] != 0) strcat(_mod_buf, "|");
 	strcat(_mod_buf, "WIN");
      }
-   if (mod == E_BINDING_MODIFIER_NONE)
+   if (mod == 0)
      strcpy(_mod_buf, "NONE");
    return _mod_buf;
 }