fix patchesgnome-panel-2_23_5-1_fc10

5 files changed, 34 insertions, 35 deletions

diff --git a/.cvsignore b/.cvsignore
index 40425d4..82b4963 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.23.4.tar.bz2
+gnome-panel-2.23.5.tar.bz2
diff --git a/gnome-panel-launch-with-gio.patch b/gnome-panel-launch-with-gio.patch
index 096a868..d5531f8 100644
--- a/gnome-panel-launch-with-gio.patch
+++ b/gnome-panel-launch-with-gio.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-menu-items.c
---- gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio	2008-07-18 21:45:57.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-menu-items.c	2008-07-18 21:52:41.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-menu-items.c
+--- gnome-panel-2.23.5/gnome-panel/panel-menu-items.c.launch-with-gio	2008-07-22 22:37:50.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-menu-items.c	2008-07-22 22:39:01.000000000 -0400
 @@ -41,6 +41,7 @@
  
  #include <libgnome/gnome-url.h>
  #include <libgnomeui/gnome-url.h>
 +#include <libgnomeui/gnome-password-dialog.h>
  
+ #include <libpanel-util/panel-glib.h>
  #include <libpanel-util/panel-keyfile.h>
- 
-@@ -98,6 +99,51 @@ struct _PanelDesktopMenuItemPrivate {
+@@ -99,6 +100,51 @@ struct _PanelDesktopMenuItemPrivate {
  	guint        append_lock_logout : 1;
  };
  
@@ -61,7 +61,7 @@ diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome
  static void
  activate_uri_on_screen (const char *path,
  			GdkScreen  *screen)
-@@ -124,12 +170,28 @@ activate_uri_on_screen (const char *path
+@@ -125,12 +171,28 @@ activate_uri_on_screen (const char *path
  
  		command = g_strdup_printf ("nautilus --no-desktop %s", url);
  		gdk_spawn_command_line_on_screen (screen, command, &error);
@@ -93,9 +93,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/panel-menu-items.c.launch-with-gio gnome
  			char *primary;
  			escaped = g_markup_escape_text (url, -1);
  			primary = g_strdup_printf (_("Could not open location '%s'"),
-diff -up gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c
---- gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c.launch-with-gio	2008-06-17 06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-mount-operation.c	2008-07-18 21:45:57.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c
+--- gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c.launch-with-gio	2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-mount-operation.c	2008-07-22 22:37:50.000000000 -0400
 @@ -102,6 +102,18 @@ password_dialog_button_clicked (GtkDialo
  		anon = gnome_password_dialog_anon_selected (gpd);
  		g_mount_operation_set_anonymous (op, anon);
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ab6b9e2..354ed60 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,8 +22,8 @@
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.23.4
-Release: 5%{?dist}
+Version: 2.23.5
+Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
 
@@ -119,9 +119,6 @@ Patch34: gnome-panel-launch-with-gio.patch
 
 Patch35: clock-wakeups.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=542257
-Patch47: icon-names.patch
-
 Conflicts: gnome-power-manager < 2.15.3
 
 %description
@@ -171,7 +168,6 @@ Panel Applets using the libpanel-applet library.
 %patch33 -p1 -b .use-gio
 %patch34 -p1 -b .launch-with-gio
 %patch35 -p1 -b .clock-wakeups
-%patch47 -p1 -b .icon-names
 
 . %{SOURCE6}
 
@@ -358,6 +354,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Tue Jul 22 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.5-1
+- Update to 2.23.5
+
 * Fri Jul 18 2008 Matthias Clasen  <mclasen@redhat.com> - 2.23.4-5
 - Fix one more icon
 
diff --git a/preferred-apps.patch b/preferred-apps.patch
index 4f61b82..831b983 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,15 +1,15 @@
-diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.c
---- gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps	2008-07-18 21:44:07.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/launcher.c	2008-07-18 21:44:51.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.c
+--- gnome-panel-2.23.5/gnome-panel/launcher.c.preferred-apps	2008-07-22 22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.c	2008-07-22 22:36:59.000000000 -0400
 @@ -23,6 +23,7 @@
  #include <libgnome/gnome-util.h>
  #include <libgnomeui/gnome-url.h>
  #include <gdk/gdkx.h>
 +#include <gmenu-tree.h>
  
+ #include <libpanel-util/panel-glib.h>
  #include <libpanel-util/panel-keyfile.h>
- 
-@@ -42,6 +43,7 @@
+@@ -43,6 +44,7 @@
  #include "panel-compatibility.h"
  #include "panel-ditem-editor.h"
  #include "panel-icon-names.h"
@@ -17,7 +17,7 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1297,3 +1299,173 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1300,3 +1302,173 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -191,9 +191,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.c.preferred-apps gnome-panel-2.
 +					 filename, g_free, NULL);
 +	}
 +}
-diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.4/gnome-panel/launcher.h
---- gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps	2008-07-18 21:44:07.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/launcher.h	2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps gnome-panel-2.23.5/gnome-panel/launcher.h
+--- gnome-panel-2.23.5/gnome-panel/launcher.h.preferred-apps	2008-07-22 22:20:48.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/launcher.h	2008-07-22 22:20:49.000000000 -0400
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -211,9 +211,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/launcher.h.preferred-apps gnome-panel-2.
  
  G_END_DECLS
  
-diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps gnome-panel-2.23.4/gnome-panel/main.c
---- gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps	2008-06-17 06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/main.c	2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps gnome-panel-2.23.5/gnome-panel/main.c
+--- gnome-panel-2.23.5/gnome-panel/main.c.preferred-apps	2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/main.c	2008-07-22 22:20:49.000000000 -0400
 @@ -28,6 +28,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -230,9 +230,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/main.c.preferred-apps gnome-panel-2.23.4
  	panel_global_config_load ();
  	panel_lockdown_init ();
  	panel_profile_load ();
-diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c
---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps	2008-06-17 06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c	2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c.preferred-apps	2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.c	2008-07-22 22:20:49.000000000 -0400
 @@ -818,7 +818,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }
@@ -242,9 +242,9 @@ diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.c.preferred-apps gnome-
  get_all_applications (void)
  {
  	GMenuTree          *tree;
-diff -up gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h
---- gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h.preferred-apps	2008-06-17 06:02:08.000000000 -0400
-+++ gnome-panel-2.23.4/gnome-panel/panel-run-dialog.h	2008-07-18 21:44:07.000000000 -0400
+diff -up gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h
+--- gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h.preferred-apps	2008-07-22 17:50:58.000000000 -0400
++++ gnome-panel-2.23.5/gnome-panel/panel-run-dialog.h	2008-07-22 22:20:49.000000000 -0400
 @@ -32,6 +32,8 @@ G_BEGIN_DECLS
  void panel_run_dialog_present           (GdkScreen  *screen,
  					 guint32    activate_time);
diff --git a/sources b/sources
index aa60fc3..567fadc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5fe8148c05a8dab63a08b7db3c5d9ab6  gnome-panel-2.23.4.tar.bz2
+075172fb7a72e8a35df50e99a5a826af  gnome-panel-2.23.5.tar.bz2