Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_ipc_handlers.h 


Log Message:


no more (null)ipoos

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- e_ipc_handlers.h    24 Nov 2005 07:16:05 -0000      1.111
+++ e_ipc_handlers.h    24 Nov 2005 09:31:34 -0000      1.112
@@ -2360,6 +2360,7 @@
    {
       char *context;
       char modifier[256];
+      char *s1, *s2;
       
       if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
       else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
@@ -2397,13 +2398,17 @@
       if (v->val2 == E_BINDING_MODIFIER_NONE)
          strcpy(modifier, "NONE");
 
+      s1 = v->str1;
+      s2 = v->str2;
+      if (!s1) s1 = "";
+      if (!s2) s2 = "";
       printf("REPLY: BINDING CONTEXT=%s BUTTON=%i MODIFIERS=%s ANY_MOD=%i 
ACTION=\"%s\" PARAMS=\"%s\"\n",
                context,
                 v->val3,
                modifier,
                 v->val4,
-                v->str1,
-                v->str2
+                s1,
+                s2
         );
    }
    END_INT4_STRING2_LIST(v);
@@ -2684,6 +2689,7 @@
    {
       char *context;
       char modifier[256];
+      char *s1, *s2, *s3;
       
       if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
       else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
@@ -2721,13 +2727,19 @@
       if (v->val2 == E_BINDING_MODIFIER_NONE)
          strcpy(modifier, "NONE");
 
+      s1 = v->str1;
+      s2 = v->str2;
+      s3 = v->str3;
+      if (!s1) s1 = "";
+      if (!s2) s2 = "";
+      if (!s3) s3 = "";
       printf("REPLY: BINDING CONTEXT=%s KEY=\"%s\" MODIFIERS=%s ANY_MOD=%i 
ACTION=\"%s\" PARAMS=\"%s\"\n",
                context,
-                v->str1,
+                s1,
                modifier,
                 v->val3,
-                v->str2,
-                v->str3
+                s2,
+                s3
         );
    }
    END_INT3_STRING3_LIST(v);
@@ -5772,6 +5784,7 @@
    {
       char *context;
       char modifier[256];
+      char *s1, *s2, *s3, *s4;
       
       if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
       else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
@@ -5809,14 +5822,22 @@
       if (v->val2 == E_BINDING_MODIFIER_NONE)
          strcpy(modifier, "NONE");
 
+      s1 = v->str1;
+      s2 = v->str2;
+      s3 = v->str3;
+      s4 = v->str4;
+      if (!s1) s1 = "";
+      if (!s2) s2 = "";
+      if (!s3) s3 = "";
+      if (!s4) s4 = "";
       printf("REPLY: BINDING CONTEXT=%s SIGNAL=%s SOURCE=%s MODIFIERS=%s 
ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
                context,
-               v->str1,
-               v->str2,
+               s1,
+               s2,
                modifier,
                 v->val3,
-                v->str3,
-                v->str4
+                s3,
+                s4
         );
    }
    END_INT3_STRING4_LIST(v);
@@ -6101,6 +6122,7 @@
    {
       char *context;
       char modifier[256];
+      char *s1, *s2;
       
       if (v->val1 == E_BINDING_CONTEXT_NONE) context = "NONE";
       else if (v->val1 == E_BINDING_CONTEXT_UNKNOWN) context = "UNKNOWN";
@@ -6138,14 +6160,18 @@
       if (v->val4 == E_BINDING_MODIFIER_NONE)
          strcpy(modifier, "NONE");
 
+      s1 = v->str1;
+      s2 = v->str2;
+      if (!s1) s1 = "";
+      if (!s2) s2 = "";
       printf("REPLY: BINDING CONTEXT=%s DIRECTION=%i Z=%i MODIFIERS=%s 
ANY_MOD=%i ACTION=\"%s\" PARAMS=\"%s\"\n",
                context,
                 v->val2,
                 v->val3,
                modifier,
                 v->val5,
-                v->str1,
-                v->str2
+                s1,
+                s2
         );
    }
    END_INT5_STRING2_LIST(v);




-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to