rpms/libwnck/devel libwnck-2.16.0-icon-geometry.patch, NONE, 1.1 libwnck.spec, 1.57, 1.58

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/libwnck/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2774

Modified Files:
	libwnck.spec 
Added Files:
	libwnck-2.16.0-icon-geometry.patch 
Log Message:
cut back the madness


libwnck-2.16.0-icon-geometry.patch:
 ChangeLog        |    6 ++++++
 libwnck/window.c |   13 +++++++++++++
 2 files changed, 19 insertions(+)

--- NEW FILE libwnck-2.16.0-icon-geometry.patch ---
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libwnck/ChangeLog,v
retrieving revision 1.454
diff -u -p -r1.454 ChangeLog
--- ChangeLog	7 Sep 2006 16:36:56 -0000	1.454
+++ ChangeLog	12 Sep 2006 02:04:21 -0000
@@ -1,3 +1,9 @@
+2006-09-11  Ryan Lortie  <desrt at desrt.ca>
+
+	* libwnck/window.c (WnckWindowPrivate, wnck_window_init,
+	wnck_window_set_icon_geometry): Avoid sending spurious icon geometry
+	updates. (Fixes #355523)
+
 2006-09-07  Benjamin Berg  <benjamin at sipsolutions.net>
 
 	* libwnck/tasklist.c: (take_screenshot):
Index: libwnck/window.c
===================================================================
RCS file: /cvs/gnome/libwnck/libwnck/window.c,v
retrieving revision 1.69
diff -u -p -r1.69 window.c
--- libwnck/window.c	20 Jul 2006 17:45:44 -0000	1.69
+++ libwnck/window.c	12 Sep 2006 02:04:26 -0000
@@ -63,6 +63,7 @@ struct _WnckWindowPrivate
   WnckClassGroup *class_group;
   Window group_leader;
   Window transient_for;
+  GdkRectangle icon_geometry;
   char *name;
   char *icon_name;
   char *session_id;
@@ -222,6 +223,7 @@ wnck_window_init (WnckWindow *window)
   window->priv->name = NULL;
   window->priv->icon_name = NULL;
   window->priv->workspace = ALL_WORKSPACES;
+  window->priv->icon_geometry.width = -1; /* invalid cached value */
 
   window->priv->icon_cache = _wnck_icon_cache_new ();
 }
@@ -1661,6 +1663,17 @@ wnck_window_set_icon_geometry (WnckWindo
 			       int         width,
 			       int         height)
 {
+  if (window->priv->icon_geometry.x == x &&
+      window->priv->icon_geometry.y == y &&
+      window->priv->icon_geometry.width == width &&
+      window->priv->icon_geometry.height == height)
+    return;
+
+  window->priv->icon_geometry.x = x;
+  window->priv->icon_geometry.y = y;
+  window->priv->icon_geometry.width = width;
+  window->priv->icon_geometry.height = height;
+
   _wnck_set_icon_geometry (window->priv->xwindow,
                            x, y, width, height);
 }


Index: libwnck.spec
===================================================================
RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libwnck.spec	4 Sep 2006 23:58:01 -0000	1.57
+++ libwnck.spec	12 Sep 2006 02:41:22 -0000	1.58
@@ -6,7 +6,7 @@
 Summary: Window Navigator Construction Kit
 Name: libwnck
 Version: 2.16.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/
 Source0: %{name}-%{version}.tar.bz2
 License: LGPL
@@ -26,6 +26,8 @@
 BuildRequires:  perl-XML-Parser
 BuildRequires:  gettext
 
+Patch0: libwnck-2.16.0-icon-geometry.patch
+
 %description
 
 libwnck (pronounced "libwink") is used to implement pagers, tasklists, 
@@ -53,6 +55,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .icon-geometry
 
 %build
 
@@ -91,6 +94,9 @@
 %{_datadir}/gtk-doc/html/libwnck
 
 %changelog
+* Mon Sep 11 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-2
+- Avoid excessive icon geometry updates
+
 * Mon Sep  4 2006 Matthias Clasen <mclasen at redhat.com> - 2.16.0-1.fc6
 - Update to 2.16.0