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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.166 by sf-exg, Mon Aug 15 11:01:54 2011 UTC vs.
Revision 1.167 by sf-exg, Fri Aug 19 17:42:09 2011 UTC

 rxvt_term::bg_set_file (const char *file)
 {
   if (!file || !*file)
     return false;
+  bool ret = false;
-  if (const char *p = strchr (file, ';'))
+  const char *p = strchr (file, ';');
+  if (p)
     {
       size_t len = p - file;
       char *f = rxvt_temp_buf<char> (len + 1);
       memcpy (f, file, len);
       f[len] = '\0';
     {
       if (original_asim)
         safe_asimage_destroy (original_asim);
       original_asim = image;
       bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
-      return true;
+      ret = true;
     }
 #  endif
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
     {
       if (pixbuf)
         g_object_unref (pixbuf);
       pixbuf = image;
       bg_flags |= BG_IS_FROM_FILE;
-      return true;
+      ret = true;
     }
 #  endif
+  if (ret)
+    {
+      if (p)
+        bg_set_geometry (p + 1);
+      else
+        bg_set_default_geometry ();
+    }
-  return false;
+  return ret;
 }
 # endif /* BG_IMAGE_FROM_FILE */
 # ifdef ENABLE_TRANSPARENCY

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