[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.C

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.104 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.106 by sf-exg, Mon Feb 22 09:47:41 2010 UTC

 bool rxvt_display::ref_init ()
 {
 #ifdef LOCAL_X_IS_UNIX
   if (id[0] == ':')
     {
-      val = rxvt_malloc (5 + strlen (id) + 1);
+      if (!(val = rxvt_temp_buf<char> (5 + strlen (id) + 1)))
+        return false;
       strcpy (val, "unix/");
       strcat (val, id);
       dpy = XOpenDisplay (val);
-      free (val);
     }
   else
 #endif
     dpy = 0;
 {
   rxvt_term * &cur_owner = !clipboard ? selection_owner : clipboard_owner;
   if (cur_owner && cur_owner != owner)
     {
+      rxvt_term *term = cur_owner;
-      cur_owner->selection_clear (clipboard);
+      term->selection_clear (clipboard);
-      cur_owner->flush ();
+      term->flush ();
     }
   cur_owner = owner;
 }
   int l, m;
   l = strlen (locale);
   m = strlen (modifiers);
-  if (!(id = (char *)malloc (l + m + 2)))
+  if (!(id = rxvt_temp_buf<char> (l + m + 2)))
     return 0;
   memcpy (id, locale, l); id[l] = '\n';
   memcpy (id + l + 1, modifiers, m); id[l + m + 1] = 0;
   rxvt_xim *xim = xims.get (id);
-  free (id);
   return xim;
 }
 void rxvt_display::put_xim (rxvt_xim *xim)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines