r16047 - in /desktop/experimental/epiphany-browser/debian: changelog patches/09_download_dialog.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May 27 13:53:08 2008
New Revision: 16047

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16047
Log:
09_download_dialog.patch: order buttons correctly for 
CONTENT_ACTION_NONE. Closes: #455720.

Modified:
    desktop/experimental/epiphany-browser/debian/changelog
    desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch

Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=16047&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Tue May 27 13:53:08 2008
@@ -12,6 +12,8 @@
       Closes: #467157.
     + Fix RDF import. Closes: #479546.
   * Refresh patches to apply cleanly.
+  * 09_download_dialog.patch: order buttons correctly for 
+    CONTENT_ACTION_NONE. Closes: #455720.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 27 May 2008 14:14:39 +0200
 

Modified: desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch?rev=16047&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/experimental/epiphany-browser/debian/patches/09_download_dialog.patch Tue May 27 13:53:08 2008
@@ -1,22 +1,39 @@
 Index: embed/mozilla/ContentHandler.cpp
 ===================================================================
 --- embed/mozilla/ContentHandler.cpp.orig	2008-05-26 19:56:35.000000000 +0200
-+++ embed/mozilla/ContentHandler.cpp	2008-05-27 14:38:57.405658401 +0200
-@@ -339,8 +339,11 @@ NS_METHOD GContentHandler::MIMEConfirmAc
++++ embed/mozilla/ContentHandler.cpp	2008-05-27 15:52:24.405658819 +0200
+@@ -330,6 +330,12 @@ NS_METHOD GContentHandler::MIMEConfirmAc
+ 	
+ 	g_free (mime_description);
+ 	
++	if (mAction == CONTENT_ACTION_NONE)
++	{
++		gtk_dialog_add_button (GTK_DIALOG (dialog),
++				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
++	}
++	
+ 	button = gtk_button_new_with_label (_("_Save As..."));
+ 	image = gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON);
+ 	gtk_button_set_image (GTK_BUTTON (button), image);
+@@ -337,10 +343,13 @@ NS_METHOD GContentHandler::MIMEConfirmAc
+ 	gtk_widget_show (button);
+ 	gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, CONTENT_ACTION_SAVEAS);
  
- 	gtk_dialog_add_button (GTK_DIALOG (dialog),
- 			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+-	gtk_dialog_add_button (GTK_DIALOG (dialog),
+-			       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 -	gtk_dialog_add_button (GTK_DIALOG (dialog),
 -			       action_label, mAction);
 +	if (mAction != CONTENT_ACTION_NONE)
 +	{
++		gtk_dialog_add_button (GTK_DIALOG (dialog),
++				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 +		gtk_dialog_add_button (GTK_DIALOG (dialog),
 +				       action_label, mAction);
 +	}
  
  	gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);
   
-@@ -387,23 +390,21 @@ NS_METHOD GContentHandler::MIMEInitiateA
+@@ -387,23 +396,21 @@ NS_METHOD GContentHandler::MIMEInitiateA
  		}
  	}