diff -C3 -r openbox-2.3.1/configure openbox-2.3.1-p1/configure
*** openbox-2.3.1/configure	Thu Apr 10 13:53:56 2003
--- openbox-2.3.1-p1/configure	Thu Jul  6 11:52:09 2006
***************
*** 1449,1454 ****
--- 1449,1455 ----
    program_transform_name="s,\$,$program_suffix,;$program_transform_name"
  # Double any \ or $.  echo might interpret backslashes.
  # By default was `s,x,x', remove it if useless.
+ program_transform_name_sh=`echo $program_transform_name | sed 's/;s,x,x,$//'`
  cat <<\_ACEOF >conftest.sed
  s/[\\$]/&&/g;s/;s,x,x,$//
  _ACEOF
***************
*** 1485,1491 ****
  fi
  
  
! PACKAGE=openbox
  
  VERSION=2.3.1
  
--- 1486,1492 ----
  fi
  
  
! PACKAGE=`echo openbox | sed "$program_transform_name_sh"`
  
  VERSION=2.3.1
  
diff -C3 -r openbox-2.3.1/nls/C/Makefile.am openbox-2.3.1-p1/nls/C/Makefile.am
*** openbox-2.3.1/nls/C/Makefile.am	Sat Mar 22 11:55:59 2003
--- openbox-2.3.1-p1/nls/C/Makefile.am	Thu Jul  6 11:52:09 2006
***************
*** 21,26 ****
--- 21,28 ----
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
+ 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
  	fi
***************
*** 29,36 ****
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
- 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
  	fi
--- 31,39 ----
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
  	fi
diff -C3 -r openbox-2.3.1/nls/C/Makefile.in openbox-2.3.1-p1/nls/C/Makefile.in
*** openbox-2.3.1/nls/C/Makefile.in	Thu Apr 10 13:53:58 2003
--- openbox-2.3.1-p1/nls/C/Makefile.in	Thu Jul  6 11:52:09 2006
***************
*** 194,199 ****
--- 194,201 ----
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_US; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
+ 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
  	fi
***************
*** 202,209 ****
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
- 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
  	fi
--- 204,212 ----
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_GB; \
+ 		rm -f $(DESTDIR)$(pkgdatadir)/nls/en_AU; \
  		rm -f $(DESTDIR)$(pkgdatadir)/nls/en; \
  		rmdir $(DESTDIR)$(pkgdatadir)/nls/C; \
  	fi
diff -C3 -r openbox-2.3.1/src/Screen.cc openbox-2.3.1-p1/src/Screen.cc
*** openbox-2.3.1/src/Screen.cc	Sun Apr 20 04:25:29 2003
--- openbox-2.3.1-p1/src/Screen.cc	Thu Jul  6 11:52:09 2006
***************
*** 1558,1564 ****
    // is the window a KDE systray window?
    Window systray;
    if (xatom->getValue(w, XAtom::kde_net_wm_system_tray_window_for,
!                       XAtom::window, (uint32_t) systray) && systray != None) {
      addSystrayWindow(w);
      return;
    }
--- 1558,1564 ----
    // is the window a KDE systray window?
    Window systray;
    if (xatom->getValue(w, XAtom::kde_net_wm_system_tray_window_for,
!                       XAtom::window, (uint32_t&) systray) && systray != None) {
      addSystrayWindow(w);
      return;
    }
***************
*** 1600,1606 ****
    Window systray;
    if (xatom->getValue(w->getClientWindow(),
                        XAtom::kde_net_wm_system_tray_window_for,
!                       XAtom::window, (uint32_t) systray) && systray != None) {
      removeSystrayWindow(w->getClientWindow());
      return;
    }
--- 1600,1606 ----
    Window systray;
    if (xatom->getValue(w->getClientWindow(),
                        XAtom::kde_net_wm_system_tray_window_for,
!                       XAtom::window, (uint32_t&) systray) && systray != None) {
      removeSystrayWindow(w->getClientWindow());
      return;
    }
diff -C3 -r openbox-2.3.1/src/Timer.hh openbox-2.3.1-p1/src/Timer.hh
*** openbox-2.3.1/src/Timer.hh	Sat Mar 22 11:56:00 2003
--- openbox-2.3.1-p1/src/Timer.hh	Thu Jul  6 11:52:09 2006
***************
*** 98,106 ****
    ~_timer_queue(void) {}
  
    void release(const _Tp& value) {
!     c.erase(std::remove(c.begin(), c.end(), value), c.end());
      // after removing the item we need to make the heap again
!     std::make_heap(c.begin(), c.end(), comp);
    }
    bool empty(void) const { return _Base::empty(); }
    size_t size(void) const { return _Base::size(); }
--- 98,106 ----
    ~_timer_queue(void) {}
  
    void release(const _Tp& value) {
!     _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value), _Base::c.end());
      // after removing the item we need to make the heap again
!     std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
    }
    bool empty(void) const { return _Base::empty(); }
    size_t size(void) const { return _Base::size(); }
diff -C3 -r openbox-2.3.1/src/Util.cc openbox-2.3.1-p1/src/Util.cc
*** openbox-2.3.1/src/Util.cc	Sun Apr  6 03:34:42 2003
--- openbox-2.3.1-p1/src/Util.cc	Thu Jul  6 11:52:09 2006
***************
*** 272,278 ****
    static char buf[ICONV_BUFSIZE];
    char *obuf = buf;
    size_t olen = ICONV_BUFSIZE - 1;
!   char *ibuf = (char *) s.c_str();
    size_t ilen = strlen(ibuf);
  
    ic = iconv_open(to, from);
--- 272,278 ----
    static char buf[ICONV_BUFSIZE];
    char *obuf = buf;
    size_t olen = ICONV_BUFSIZE - 1;
!   const char *ibuf = s.c_str();
    size_t ilen = strlen(ibuf);
  
    ic = iconv_open(to, from);
diff -C3 -r openbox-2.3.1/src/Window.hh openbox-2.3.1-p1/src/Window.hh
*** openbox-2.3.1/src/Window.hh	Sun Apr 20 04:25:29 2003
--- openbox-2.3.1-p1/src/Window.hh	Thu Jul  6 11:52:09 2006
***************
*** 411,417 ****
    void installColormap(bool install);
    void restore(bool remap);
    void configure(int dx, int dy, unsigned int dw, unsigned int dh);
!   void setWorkspace(unsigned int n);
    void changeBlackboxHints(const BlackboxHints *net);
    void restoreAttributes(void);
  
--- 411,417 ----
    void installColormap(bool install);
    void restore(bool remap);
    void configure(int dx, int dy, unsigned int dw, unsigned int dh);
!   void setWorkspace(uint32_t n);
    void changeBlackboxHints(const BlackboxHints *net);
    void restoreAttributes(void);
  
diff -C3 -r openbox-2.3.1/src/i18n.cc openbox-2.3.1-p1/src/i18n.cc
*** openbox-2.3.1/src/i18n.cc	Mon Apr 21 12:03:44 2003
--- openbox-2.3.1-p1/src/i18n.cc	Thu Jul  6 11:52:09 2006
***************
*** 110,116 ****
  #  endif // MCLoadBySet
  
    if (catalog_fd == (nl_catd) -1)
!     fprintf(stderr, "failed to open catalog, using default messages\n");
  #endif // HAVE_CATOPEN
  }
  
--- 110,116 ----
  #  endif // MCLoadBySet
  
    if (catalog_fd == (nl_catd) -1)
!     fprintf(stderr, "failed to open catalog %s, using default messages\n", catalog_filename.c_str());
  #endif // HAVE_CATOPEN
  }
  
diff -C3 -r openbox-2.3.1/util/epist/epist.cc openbox-2.3.1-p1/util/epist/epist.cc
*** openbox-2.3.1/util/epist/epist.cc	Sun Apr  6 03:28:03 2003
--- openbox-2.3.1-p1/util/epist/epist.cc	Thu Jul  6 11:52:09 2006
***************
*** 25,30 ****
--- 25,33 ----
  #endif // HAVE_CONFIG_H
  
  extern "C" {
+ #ifdef    HAVE_STDIO_H
+ #  include <stdio.h>
+ #endif // HAVE_STDIO_H
  #ifdef    HAVE_UNISTD_H
  #  include <sys/types.h>
  #  include <unistd.h>
diff -C3 -r openbox-2.3.1/util/epist/window.cc openbox-2.3.1-p1/util/epist/window.cc
*** openbox-2.3.1/util/epist/window.cc	Sun Apr 20 04:25:29 2003
--- openbox-2.3.1-p1/util/epist/window.cc	Thu Jul  6 12:09:59 2006
***************
*** 169,175 ****
  
  void XWindow::updateDesktop() {
    if (! _xatom->getValue(_window, XAtom::net_wm_desktop, XAtom::cardinal,
!                          static_cast<uint32_t &>(_desktop)))
      _desktop = 0;
  }
  
--- 169,175 ----
  
  void XWindow::updateDesktop() {
    if (! _xatom->getValue(_window, XAtom::net_wm_desktop, XAtom::cardinal,
!                          (uint32_t&)_desktop))
      _desktop = 0;
  }