head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.28
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.26
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.24
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.22
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.20
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.18
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.16
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.14
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.12
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.10
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.8
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.6
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.4
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.2
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.1.0.8
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.6
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.4
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.2
	pkgsrc-2006Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.04.01.21.21.20;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2006.01.02.22.05.38;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove wm/openbox2 -- old version of wm/openbox.

No disagreement on pkgsrc-users.
@
text
@$NetBSD: patch-ag,v 1.1 2006/01/02 22:05:38 joerg Exp $

--- util/epist/screen.cc.orig	2006-01-02 21:58:13.000000000 +0000
+++ util/epist/screen.cc
@@@@ -435,19 +435,27 @@@@ void screen::updateEverything() {
 void screen::updateNumDesktops() {
   assert(_managed);
 
+  unsigned long tmp_num_desktops = _num_desktops;
+
   if (! _xatom->getValue(_root, XAtom::net_number_of_desktops, XAtom::cardinal,
-                         (unsigned long)_num_desktops))
+                         tmp_num_desktops))
     _num_desktops = 1;  // assume that there is at least 1 desktop!
+  else
+    _num_desktops = tmp_num_desktops;
 }
 
 
 void screen::updateActiveDesktop() {
   assert(_managed);
 
+  unsigned long tmp_active_desktop = _active_desktop;
+
   if (! _xatom->getValue(_root, XAtom::net_current_desktop, XAtom::cardinal,
-                         (unsigned long)_active_desktop))
+                         tmp_active_desktop))
     _active_desktop = 0;  // there must be at least one desktop, and it must
                           // be the current one
+  else
+    _active_desktop = tmp_active_desktop;
 }
 
 
@


1.1
log
@Fix GCC 3.4+ issues: template instantiation, cast of reference
parameters.
@
text
@d1 1
a1 1
$NetBSD$
@