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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.240 by sf-exg, Mon Jun 11 13:23:01 2012 UTC vs.
Revision 1.241 by sf-exg, Mon Jun 11 14:45:53 2012 UTC

   v_align = defaultAlign;
   img = 0;
 }
-bool
+void
 rxvt_image::set_file_geometry (rxvt_screen *s, const char *file)
 {
   if (!file || !*file)
-    return false;
+    return;
   const char *p = strchr (file, ';');
   if (p)
     {
       memcpy (f, file, len);
       f[len] = '\0';
       file = f;
     }
-  bool ret = set_file (s, file);
+  set_file (s, file);
   alpha = 0x8000;
-  if (ret)
-    set_geometry (p ? p + 1 : "");
+  set_geometry (p ? p + 1 : "");
-  return ret;
 }
-bool
+void
 rxvt_image::set_file (rxvt_screen *s, const char *file)
 {
+  rxvt_img *img2 = rxvt_img::new_from_file (s, file);
   delete img;
-  img = rxvt_img::new_from_file (s, file);
+  img = img2;
-  return img != 0;
 }
 # endif /* BG_IMAGE_FROM_FILE */
 bool
 rxvt_term::bg_init ()
 {
 #if BG_IMAGE_FROM_FILE
   if (rs[Rs_backgroundPixmap])
     {
-      if (fimage.set_file_geometry (this, rs[Rs_backgroundPixmap])
+      fimage.set_file_geometry (this, rs[Rs_backgroundPixmap]);
-          && !bg_window_position_sensitive ())
+      if (!bg_window_position_sensitive ())
         update_background ();
     }
 #endif
 }

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