From 2463928c90d0c21d16cd5fd341aee4d747821a1c Mon Sep 17 00:00:00 2001
From: Jon Oberheide <jon@focalhost.com>
Date: Thu, 10 Jun 2004 11:11:12 +0000
Subject: remove defunct Revert button and replace OK/Cancel buttons with a
 Close

2004-06-08  Jon Oberheide  <jon@focalhost.com>

	* gal-define-views-dialog.c (gal_define_views_dialog_init),
	gal-define-views.glade: remove defunct Revert button and replace
	OK/Cancel buttons with a Close button.  Fixes bug #48131.

svn path=/trunk/; revision=26279
---
 widgets/menus/gal-define-views-dialog.c |  3 +--
 widgets/menus/gal-define-views.glade    | 42 +--------------------------------
 2 files changed, 2 insertions(+), 43 deletions(-)

(limited to 'widgets/menus')

diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 723ebe58fe..e8afb8efac 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -230,8 +230,7 @@ gal_define_views_dialog_init (GalDefineViewsDialog *dialog)
 	gtk_widget_unref(widget);
 
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OK, GTK_RESPONSE_OK,
+				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 				NULL);
 
 	gdvd_connect_signal(dialog, "button-new",    "clicked", G_CALLBACK(gdvd_button_new_callback));
diff --git a/widgets/menus/gal-define-views.glade b/widgets/menus/gal-define-views.glade
index 8c0101d47f..11395ad8b7 100644
--- a/widgets/menus/gal-define-views.glade
+++ b/widgets/menus/gal-define-views.glade
@@ -23,24 +23,12 @@
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
-	  <child>
-	    <widget class="GtkButton" id="button1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-cancel</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">-6</property>
-	    </widget>
-	  </child>
-
 	  <child>
 	    <widget class="GtkButton" id="button7">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
+	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="response_id">-5</property>
@@ -167,34 +155,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkAlignment" id="alignment3">
-	      <property name="visible">True</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xscale">0</property>
-	      <property name="yscale">1</property>
-
-	      <child>
-		<widget class="GtkButton" id="button-reset">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-revert-to-saved</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GtkLabel" id="label-views">
 	      <property name="visible">True</property>
-- 
cgit v1.2.3