drop lost of patchesgnome-panel-2_25_5-1_fc11

4 files changed, 22 insertions, 30 deletions

diff --git a/.cvsignore b/.cvsignore
index e5bf972..0e8ad6f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.25.3.tar.bz2
+gnome-panel-2.25.5.tar.bz2
diff --git a/applet-error.patch b/applet-error.patch
index d4ed3ec..9a3228a 100644
--- a/applet-error.patch
+++ b/applet-error.patch
@@ -1,7 +1,7 @@
-diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c
---- gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error	2008-02-11 16:15:47.000000000 -0500
-+++ gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c	2008-02-13 20:35:59.000000000 -0500
-@@ -1242,6 +1242,21 @@ panel_applet_frame_event_listener (Bonob
+diff -up gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c
+--- gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c.applet-error	2009-01-20 09:04:47.000000000 -0500
++++ gnome-panel-2.25.5/gnome-panel/panel-applet-frame.c	2009-01-20 14:22:33.000000000 -0500
+@@ -1246,6 +1246,21 @@ panel_applet_frame_event_listener (Bonob
  		panel_applet_frame_set_size_hints_from_any (frame, any);
  }
  
@@ -23,14 +23,14 @@ diff -up gnome-panel-2.21.91/gnome-panel/panel-applet-frame.c.applet-error gnome
  static void
  panel_applet_frame_activated (CORBA_Object  object,
  			      const char   *error_reason,
-@@ -1266,7 +1281,9 @@ panel_applet_frame_activated (CORBA_Obje
- 	if (error_reason != NULL || object == CORBA_OBJECT_NIL) {
- 		g_warning (G_STRLOC ": failed to load applet %s:\n%s",
- 			   frame->priv->iid, error_reason);
--		panel_applet_frame_loading_failed (frame, frame_act->id);
-+		if (!in_default_panel_config (frame_act->id)) {
-+			panel_applet_frame_loading_failed (frame, frame_act->id);
-+		}
- 		g_free (frame_act->id);
- 		g_free (frame_act);
- 		return;
+@@ -1425,7 +1440,9 @@ panel_applet_frame_activated (CORBA_Obje
+ 	return;
+ 
+ error_out:
+-	panel_applet_frame_loading_failed (frame, frame_act->id);
++	if (!in_default_panel_config (frame_act->id)) {
++		panel_applet_frame_loading_failed (frame, frame_act->id);
++	}
+ 	if (widget)
+ 		g_object_unref (widget);
+ 	panel_applet_stop_loading (frame_act->id);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 2848a98..451f4dc 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.25.3
-Release: 5%{?dist}
+Version: 2.25.5
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -113,15 +113,7 @@ Patch11: applet-error.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=520111
 Patch24: gnome-panel-2.21.92-allow-spurious-view-done-signals.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=554343
-Patch25: gnome-panel-2.24.1-smoother-slide-in.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=536915
-Patch26: gnome-panel-2.24.0-hide-shutdown-if-unavailable.patch
-
 Patch35: clock-wakeups.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=555710
-Patch36: tryexec.patch
 
 Conflicts: gnome-power-manager < 2.15.3
 
@@ -168,10 +160,7 @@ Panel Applets using the libpanel-applet library.
 %patch10 -p1 -b .preferred-apps
 %patch11 -p1 -b .applet-error
 %patch24 -p1 -b .allow-spurious-view-done-signals
-#%patch25 -p1 -b .smoother-slide-in
-%patch26 -p1 -b .hide-shutdown-item-if-unavailable
 %patch35 -p1 -b .clock-wakeups
-%patch36 -p1 -b .tryexec
 
 libtoolize --force --copy
 
@@ -373,6 +362,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jan 20 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Fri Jan 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.3-4
 - And don't write %s into desktop files
 
diff --git a/sources b/sources
index ae3bc2c..b869e2d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72173f5fe7775cf9c432e2e60ef856df  gnome-panel-2.25.3.tar.bz2
+ca67bbaa5e109d8e86424e2ace8e8683  gnome-panel-2.25.5.tar.bz2