--- rxvt-unicode/src/main.C	2011/01/08 10:37:21	1.346
+++ rxvt-unicode/src/main.C	2011/01/20 16:41:23	1.348
@@ -1092,12 +1092,6 @@
   if (fix_screen || old_height == 0)
     scr_reset ();
 
-#ifdef HAVE_BG_PIXMAP
-//  TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
-//  if (bgPixmap.pixmap)
-//    scr_touch (false);
-#endif
-
 #ifdef USE_XIM
   IMSetPosition ();
 #endif
@@ -1355,7 +1349,7 @@
       if (!p)
         continue;
 
-      s = rxvt_splitcommastring (p);
+      s = rxvt_strsplit (',', p);
 
       for (i = found = 0; !found && s[i]; i++)
         {
@@ -1377,7 +1371,7 @@
           for (j = 0; j < xim_styles->count_styles; j++)
             if (input_style == xim_styles->supported_styles[j])
               {
-                rxvt_freecommastring (s);
+                rxvt_free_strsplit (s);
 
                 found = 1;
                 goto foundpet;
@@ -1385,7 +1379,7 @@
 
         }
 
-      rxvt_freecommastring (s);
+      rxvt_free_strsplit (s);
     }
 
 foundpet:
@@ -1551,7 +1545,7 @@
     {
       bool found = false;
 
-      s = rxvt_splitcommastring (p);
+      s = rxvt_strsplit (',', p);
 
       for (i = 0; s[i]; i++)
         {
@@ -1567,7 +1561,7 @@
             }
         }
 
-      rxvt_freecommastring (s);
+      rxvt_free_strsplit (s);
 
       if (found)
         goto done;