--- rxvt-unicode/src/rxvt.h	2012/06/10 13:07:56	1.505
+++ rxvt-unicode/src/rxvt.h	2012/11/30 07:02:12	1.510
@@ -280,11 +280,12 @@
   void destroy ()
   {
     delete img;
+    img = 0;
   }
 
   rxvt_image ();
-  bool set_file_geometry (rxvt_screen *s, const char *file);
-  bool set_file (rxvt_screen *s, const char *file);
+  void set_file_geometry (rxvt_screen *s, const char *file);
+  void set_file (rxvt_screen *s, const char *file);
   bool set_geometry (const char *geom, bool update = false);
 };
 # endif
@@ -1211,9 +1212,6 @@
 
   rxvt_img *bg_img;
 
-  int target_x;
-  int target_y;
-  bool bg_set_position (int x, int y);
   bool bg_window_size_sensitive ();
   bool bg_window_position_sensitive ();
 
@@ -1447,6 +1445,13 @@
 
   // screen.C
 
+  bool option (uint8_t opt) const NOTHROW
+  {
+    return options[opt >> 3] & (1 << (opt & 7));
+  }
+
+  void set_option (uint8_t opt, bool set = true) NOTHROW;
+
   int fgcolor_of (rend_t r) const NOTHROW
   {
     int base = GET_BASEFG (r);
@@ -1475,13 +1480,6 @@
     return base;
   }
 
-  bool option (uint8_t opt) const NOTHROW
-  {
-    return options[opt >> 3] & (1 << (opt & 7));
-  }
-
-  void set_option (uint8_t opt, bool set = true) NOTHROW;
-
   // modifies first argument(!)
   void tt_paste (char *data, unsigned int len) NOTHROW;
   void paste (char *data, unsigned int len) NOTHROW;
@@ -1568,15 +1566,6 @@
   const char *x_resource (const char *name);
   void extract_resources ();
   void extract_keysym_resources ();
-  void find_resources (const char *n_prefix, const char *c_prefix, int mode,
-                       Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
-  bool parse_bool_resource (const char *str)
-  {
-    return (!strcasecmp (str, "TRUE")
-            || !strcasecmp (str, "YES")
-            || !strcasecmp (str, "ON")
-            || !strcasecmp (str, "1"));
-  }
 };
 
 #endif /* _RXVT_H_ */