rpms/gnome-panel/devel gnome-panel-2.14.2-xio-error.patch, 1.1, 1.2 gnome-panel.spec, 1.134, 1.135

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-panel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9321

Modified Files:
	gnome-panel-2.14.2-xio-error.patch gnome-panel.spec 
Log Message:
- don't get stuck in infinite recursion loop from previous
  fix.  Patch by Fredric Crozat


gnome-panel-2.14.2-xio-error.patch:
 panel-applet-frame.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+)

Index: gnome-panel-2.14.2-xio-error.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.14.2-xio-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-panel-2.14.2-xio-error.patch	26 Jul 2006 15:32:36 -0000	1.1
+++ gnome-panel-2.14.2-xio-error.patch	28 Jul 2006 15:13:25 -0000	1.2
@@ -48,11 +48,12 @@
  static void
  panel_applet_frame_activated (Bonobo_Unknown     object,
  			      CORBA_Environment *ev,
-@@ -1373,6 +1393,8 @@ panel_applet_frame_activated (Bonobo_Unk
+@@ -1373,6 +1393,9 @@ panel_applet_frame_activated (Bonobo_Unk
  	ORBit_small_listen_for_broken (object,
  				       G_CALLBACK (panel_applet_frame_cnx_broken),
  				       frame);
-+	panel_applet_frame_old_xio_error_handler = 
++	if (!panel_applet_frame_old_xio_error_handler) 
++         panel_applet_frame_old_xio_error_handler = 
 +           XSetIOErrorHandler (panel_applet_frame_xio_error_handler);
  
  	gtk_container_add (GTK_CONTAINER (frame), widget);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- gnome-panel.spec	26 Jul 2006 15:32:36 -0000	1.134
+++ gnome-panel.spec	28 Jul 2006 15:13:25 -0000	1.135
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.14.2
-Release: 7
+Release: 8
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -229,6 +229,10 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Jul 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-8
+- don't get stuck in infinite recursion loop from previous
+  fix.  Patch by Fredric Crozat
+
 * Wed Jul 26 2006 Ray Strode <rstrode at redhat.com> - 2.14.2-7
 - don't try to talk to X if the connection is dead (bug 200149)