r18603 - in /desktop/experimental/epiphany-webkit/debian: changelog patches/09_download_dialog.patch

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Mar 3 14:20:19 UTC 2009


Author: kov
Date: Tue Mar  3 14:20:19 2009
New Revision: 18603

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18603
Log:
  * 09_download_dialog.patch:
  - refreshed, with gecko-only part removed; notice that this patch is not
    currently useful since Epiphany and WebKitGTK+ do not support
    downloading, and will need a revision after such functionality lands


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

Modified: desktop/experimental/epiphany-webkit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/changelog?rev=18603&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/changelog (original)
+++ desktop/experimental/epiphany-webkit/debian/changelog Tue Mar  3 14:20:19 2009
@@ -7,8 +7,12 @@
   - dropped; gecko-only, does not apply to trunk
   * 05_libexecdir.patch, debian/rules:
   - removed gecko-specific parts of the patch
-
- -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 11:08:24 -0300
+  * 09_download_dialog.patch:
+  - refreshed, with gecko-only part removed; notice that this patch is not
+    currently useful since Epiphany and WebKitGTK+ do not support
+    downloading, and will need a revision after such functionality lands
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 03 Mar 2009 11:19:57 -0300
 
 epiphany-browser (2.24.3-2) UNRELEASED; urgency=low
 

Modified: desktop/experimental/epiphany-webkit/debian/patches/09_download_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-webkit/debian/patches/09_download_dialog.patch?rev=18603&op=diff
==============================================================================
--- desktop/experimental/epiphany-webkit/debian/patches/09_download_dialog.patch (original)
+++ desktop/experimental/epiphany-webkit/debian/patches/09_download_dialog.patch Tue Mar  3 14:20:19 2009
@@ -1,7 +1,10 @@
-Index: epiphany-2.24.1/data/glade/prefs-dialog.glade
+FIXME: WebKitGTK+ and Epiphany do not support download yet, so we will need to
+review this patch after that functionality exists
+
+Index: epiphany-webkit-2.27.0~svn.8837/data/glade/prefs-dialog.glade
 ===================================================================
---- epiphany-2.24.1.orig/data/glade/prefs-dialog.glade	2008-09-22 20:38:32.000000000 +0200
-+++ epiphany-2.24.1/data/glade/prefs-dialog.glade	2008-11-14 00:30:49.210988479 +0100
+--- epiphany-webkit-2.27.0~svn.8837.orig/data/glade/prefs-dialog.glade	2009-02-02 22:18:56.000000000 -0200
++++ epiphany-webkit-2.27.0~svn.8837/data/glade/prefs-dialog.glade	2009-03-03 11:14:33.000000000 -0300
 @@ -303,6 +303,25 @@
  			      <property name="spacing">6</property>
  
@@ -54,52 +57,11 @@
  			    </widget>
  			  </child>
  			</widget>
-Index: epiphany-2.24.1/embed/mozilla/ContentHandler.cpp
+Index: epiphany-webkit-2.27.0~svn.8837/src/prefs-dialog.c
 ===================================================================
---- epiphany-2.24.1.orig/embed/mozilla/ContentHandler.cpp	2008-08-31 13:38:12.000000000 +0200
-+++ epiphany-2.24.1/embed/mozilla/ContentHandler.cpp	2008-11-14 00:30:49.210988479 +0100
-@@ -372,6 +372,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;
- 
-@@ -394,23 +395,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.24.1/src/prefs-dialog.c
-===================================================================
---- epiphany-2.24.1.orig/src/prefs-dialog.c	2008-08-03 14:23:09.000000000 +0200
-+++ epiphany-2.24.1/src/prefs-dialog.c	2008-11-14 00:30:49.210988479 +0100
-@@ -345,6 +345,13 @@ prefs_dialog_show_help (EphyDialog *dial
+--- epiphany-webkit-2.27.0~svn.8837.orig/src/prefs-dialog.c	2009-02-02 22:18:56.000000000 -0200
++++ epiphany-webkit-2.27.0~svn.8837/src/prefs-dialog.c	2009-03-03 11:17:02.000000000 -0300
+@@ -244,6 +244,13 @@
  }
  
  static void
@@ -110,27 +72,27 @@
 +}
 +
 +static void
- setup_font_combo (EphyDialog *dialog,
- 		  const char *type,
- 		  const char *code,
-@@ -1474,6 +1481,7 @@ prefs_dialog_init (PrefsDialog *pd)
+ css_checkbox_toggled (GtkToggleButton *button,
+ 		      GtkWidget *widget)
+ {
+@@ -1032,6 +1039,7 @@
  	EphyDialog *dialog = EPHY_DIALOG (pd);
  	EphyEncodings *encodings;
  	GtkWidget *window, *curr_button, *blank_button;
 +	GtkWidget *automatic_downloads_checkbutton, *download_button_hbox;
- 	GtkWidget *clear_cache_button, *font_prefs_button;
+ 	GtkWidget *clear_cache_button;
  	GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
  	gboolean sensitive;
-@@ -1494,6 +1502,8 @@ prefs_dialog_init (PrefsDialog *pd)
+@@ -1052,6 +1060,8 @@
  		 properties[WINDOW_PROP].id, &window,
  		 properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
  		 properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
 +		 properties[AUTO_OPEN_PROP].id, &automatic_downloads_checkbutton,
 +		 properties[DOWNLOAD_PATH_HBOX_PROP].id, &download_button_hbox,
- 		 properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
  		 properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
  		 properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
-@@ -1517,6 +1527,10 @@ prefs_dialog_init (PrefsDialog *pd)
+ 		 properties[CSS_EDIT_BUTTON_PROP].id, &css_edit_button,
+@@ -1074,6 +1084,10 @@
  	gtk_widget_set_sensitive (curr_button, sensitive);
  	gtk_widget_set_sensitive (blank_button, sensitive);
  
@@ -138,6 +100,6 @@
 +	g_signal_connect (automatic_downloads_checkbutton, "toggled",
 +			  G_CALLBACK (automatic_downloads_toggled), download_button_hbox);
 +
- 	g_signal_connect (font_prefs_button, "clicked",
- 			  G_CALLBACK (font_prefs_button_clicked_cb), dialog);
- 
+ 	css_checkbox_toggled (GTK_TOGGLE_BUTTON (css_checkbox), css_edit_box);
+ 	g_signal_connect (css_checkbox, "toggled",
+ 			  G_CALLBACK (css_checkbox_toggled), css_edit_box);




More information about the pkg-gnome-commits mailing list