rpms/gnome-panel/devel gnome-panel-2.12.1-close.patch, NONE, 1.1 gnome-panel.spec, 1.85, 1.86

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	gnome-panel.spec 
Added Files:
	gnome-panel-2.12.1-close.patch 
Log Message:
Polish


gnome-panel-2.12.1-close.patch:
 panel-addto.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE gnome-panel-2.12.1-close.patch ---
--- gnome-panel-2.12.1/gnome-panel/panel-addto.c.close	2005-10-17 11:22:44.000000000 -0400
+++ gnome-panel-2.12.1/gnome-panel/panel-addto.c	2005-10-17 11:24:03.000000000 -0400
@@ -855,6 +855,7 @@
 		panel_addto_present_applets (dialog);
 		break;
 
+	case GTK_RESPONSE_CLOSE:
 	case GTK_RESPONSE_CANCEL:
 		gtk_widget_destroy (widget_dialog);
 		break;
@@ -1181,8 +1182,8 @@
 						     GTK_STOCK_GO_BACK,
 						     PANEL_ADDTO_RESPONSE_BACK);
 	gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
-			       GTK_STOCK_CANCEL,
-			       GTK_RESPONSE_CANCEL);
+			       GTK_STOCK_CLOSE,
+			       GTK_RESPONSE_CLOSE);
 	dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
 						     GTK_STOCK_ADD,
 						     PANEL_ADDTO_RESPONSE_ADD);


Index: gnome-panel.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- gnome-panel.spec	6 Oct 2005 15:13:51 -0000	1.85
+++ gnome-panel.spec	17 Oct 2005 15:32:21 -0000	1.86
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.12.1
-Release: 1
+Release: 2
 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
@@ -54,8 +54,11 @@
 %endif
 
 Patch0: gnome-panel-2.12.1-vendor.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=311036
 Patch1: gnome-panel-2.12.1-remove-screenshot-menuitem.patch
 Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=319077
+Patch3: gnome-panel-2.12.1-close.patch
 
 %description
 
@@ -80,6 +83,7 @@
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .remove-screenshot-menuitem
 %patch2 -p1 -b .speak-to-us-ye-old-wise-fish
+%patch3 -p1 -b .close
 
 cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries
 cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas
@@ -187,6 +191,9 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Mon Oct 17 2005 Matthias Clasen  <mclasen at redhat.com> 2.12.1-2
+- Change the "Cancel" button on the "add to" dialog to "Close"
+ 
 * Thu Oct  6 2005 Matthias Clasen  <mclasen at redhat.com> 2.12.1-1
 - Update to 2.12.1
 - Update patches