r16209 - in /desktop/unstable/epiphany-browser: ./ debian/changelog debian/control debian/control.in debian/patches/09_download_dialog.patch debian/patches/series debian/rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Jun 8 19:51:48 UTC 2008 

Author: joss
Date: Sun Jun  8 19:51:47 2008
New Revision: 16209

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16209
Log:
* 09_download_dialog.patch: 
  + Fix the logic that got wrong in some cases. This removes some 
    unnecessary prompts and makes the dialog more consistent.
* Remove the seahorse conflict, it is too much.
* Upload to unstable; drop check-dist include.

Added:
    desktop/unstable/epiphany-browser/
      - copied from r16207, desktop/experimental/epiphany-browser/
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/control.in
    desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch
    desktop/unstable/epiphany-browser/debian/patches/series
    desktop/unstable/epiphany-browser/debian/rules

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sun Jun  8 19:51:47 2008
@@ -1,8 +1,16 @@
-epiphany-browser (2.22.2-2) UNRELEASED; urgency=low
-
+epiphany-browser (2.22.2-2) unstable; urgency=low
+
+  [ Loic Minier ]
   * Cleanup rules and postinsts; fix priority of epiphany-webkit.
 
- -- Loic Minier <lool at dooz.org>  Wed, 04 Jun 2008 12:34:25 +0200
+  [ Josselin Mouette ]
+  * 09_download_dialog.patch: 
+    + Fix the logic that got wrong in some cases. This removes some 
+      unnecessary prompts and makes the dialog more consistent.
+  * Remove the seahorse conflict, it is too much.
+  * Upload to unstable; drop check-dist include.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 08 Jun 2008 21:51:41 +0200
 
 epiphany-browser (2.22.2-1) experimental; urgency=low
 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Sun Jun  8 19:51:47 2008
@@ -61,7 +61,6 @@
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
            epiphany-extensions (<< 2.22.1-3),
-           seahorse (<< 2.22.1-3),
            python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger

Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Sun Jun  8 19:51:47 2008
@@ -61,7 +61,6 @@
          ${misc:Depends}
 Conflicts: epiphany-browser (<< 2.20),
            epiphany-extensions (<< 2.22.1-3),
-           seahorse (<< 2.22.1-3),
            python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger

Modified: desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/09_download_dialog.patch Sun Jun  8 19:51:47 2008
@@ -1,72 +1,7 @@
-Index: embed/mozilla/ContentHandler.cpp
+Index: epiphany-2.22.2/data/glade/prefs-dialog.glade
 ===================================================================
---- embed/mozilla/ContentHandler.cpp.orig	2008-05-26 19:56:35.000000000 +0200
-+++ 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),
--			       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 +396,21 @@ NS_METHOD GContentHandler::MIMEInitiateA
- 		}
- 	}
- 
--#ifndef HAVE_GECKO_1_9
- 	if (auto_downloads)
- 	{
--		mAction = CONTENT_ACTION_OPEN;
-+		mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_DOWNLOAD;
- 	}
- 	else
--#endif /* !HAVE_GECKO_1_9 */
- 	{
--		mAction = CONTENT_ACTION_OPEN_TMP;
-+		mAction = mHelperApp ? CONTENT_ACTION_OPEN_TMP : CONTENT_ACTION_SAVEAS;
- 	}
- 
--	if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE)
-+	if (mPermission != EPHY_MIME_PERMISSION_SAFE)
- 	{
--		mAction = CONTENT_ACTION_DOWNLOAD;
-+		mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_NONE;
-+		MIMEConfirmAction ();
- 	}
--
--	if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD)
-+	else if (mAction == CONTENT_ACTION_OPEN_TMP)
- 	{
- 		MIMEConfirmAction ();
- 	}
-Index: data/glade/prefs-dialog.glade
-===================================================================
---- data/glade/prefs-dialog.glade.orig	2008-03-05 19:59:29.000000000 +0100
-+++ data/glade/prefs-dialog.glade	2008-05-27 14:17:30.105154355 +0200
+--- epiphany-2.22.2.orig/data/glade/prefs-dialog.glade	2008-05-27 22:55:51.665652339 +0200
++++ epiphany-2.22.2/data/glade/prefs-dialog.glade	2008-05-27 22:55:53.697150685 +0200
 @@ -303,6 +303,25 @@
  			      <property name="spacing">6</property>
  
@@ -119,10 +54,51 @@
  			    </widget>
  			  </child>
  			</widget>
-Index: src/prefs-dialog.c
+Index: epiphany-2.22.2/embed/mozilla/ContentHandler.cpp
 ===================================================================
---- src/prefs-dialog.c.orig	2008-03-05 19:59:21.000000000 +0100
-+++ src/prefs-dialog.c	2008-05-27 14:17:30.105154355 +0200
+--- epiphany-2.22.2.orig/embed/mozilla/ContentHandler.cpp	2008-05-27 22:55:51.697653543 +0200
++++ epiphany-2.22.2/embed/mozilla/ContentHandler.cpp	2008-05-27 23:28:41.941154532 +0200
+@@ -365,6 +365,7 @@ NS_METHOD GContentHandler::MIMEConfirmAc
+ NS_METHOD GContentHandler::MIMEInitiateAction (void)
+ {
+ 	gboolean auto_downloads;
++	gboolean confirm = FALSE;
+ 
+ 	if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_SAVE_TO_DISK)) return NS_OK;
+ 
+@@ -387,23 +388,18 @@ NS_METHOD GContentHandler::MIMEInitiateA
+ 		}
+ 	}
+ 
+-#ifndef HAVE_GECKO_1_9
+-	if (auto_downloads)
++	if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE)
+ 	{
+-		mAction = CONTENT_ACTION_OPEN;
++		mAction = auto_downloads ? CONTENT_ACTION_DOWNLOAD : CONTENT_ACTION_SAVEAS;
++		confirm = (auto_downloads && mPermission != EPHY_MIME_PERMISSION_SAFE);
+ 	}
+ 	else
+-#endif /* !HAVE_GECKO_1_9 */
+ 	{
+ 		mAction = CONTENT_ACTION_OPEN_TMP;
++		confirm = !auto_downloads;
+ 	}
+ 
+-	if (!mHelperApp || mPermission != EPHY_MIME_PERMISSION_SAFE)
+-	{
+-		mAction = CONTENT_ACTION_DOWNLOAD;
+-	}
+-
+-	if (!auto_downloads || mAction == CONTENT_ACTION_DOWNLOAD)
++	if (confirm)
+ 	{
+ 		MIMEConfirmAction ();
+ 	}
+Index: epiphany-2.22.2/src/prefs-dialog.c
+===================================================================
+--- epiphany-2.22.2.orig/src/prefs-dialog.c	2008-05-27 22:55:51.641650336 +0200
++++ epiphany-2.22.2/src/prefs-dialog.c	2008-05-27 22:55:53.701154196 +0200
 @@ -362,6 +362,13 @@ prefs_dialog_show_help (EphyDialog *dial
  }
  

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sun Jun  8 19:51:47 2008
@@ -7,7 +7,7 @@
 06_ssl_weak_ciphers.patch
 07_bookmarks.patch
 #08_load_on_new_tab.patch
-09_download_dialog.patch -p0
+09_download_dialog.patch
 10_url_double-click.patch
 11_useragent-weasel.patch
 12_safetypes_rss.patch

Modified: desktop/unstable/epiphany-browser/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/rules?rev=16209&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/rules (original)
+++ desktop/unstable/epiphany-browser/debian/rules Sun Jun  8 19:51:47 2008
@@ -3,7 +3,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE := epiphany

More information about the pkg-gnome-commits mailing list