--- rxvt-unicode/src/rxvtfont.C	2008/01/26 15:07:32	1.148
+++ rxvt-unicode/src/rxvtfont.C	2009/03/29 13:36:03	1.150
@@ -218,13 +218,13 @@
 }
 
 void
-rxvt_font::set_name (char *name)
+rxvt_font::set_name (char *name_)
 {
-  if (this->name == name)
+  if (name == name_)
     return;
 
-  if (this->name) free (this->name); // let the compiler optimize
-  this->name = name;
+  if (name) free (name); // let the compiler optimize
+  name = name_;
 }
 
 void
@@ -1135,7 +1135,7 @@
 #if 0 // clipping unfortunately destroys our precious double-width-characters
   // clip width, we can't do better, or can we?
   if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
-    FcPatternAddInteger (p, FC_CHAR_WIDTH, prop->width);
+    FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
 #endif
 
   if (FcPatternGet (p, FC_MINSPACE, 0, &v) != FcResultMatch)