r24982 - in /desktop/unstable/epiphany-browser/debian: changelog patches/14_download_nautilus.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Aug 16 18:47:45 2010
New Revision: 24982

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24982
Log:
14_download_nautilus.patch: don’t open nautilus every time a file is 
saved. This is simply annoying.

Added:
    desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=24982&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Mon Aug 16 18:47:45 2010
@@ -1,3 +1,10 @@
+epiphany-browser (2.30.2-5) UNRELEASED; urgency=low
+
+  * 14_download_nautilus.patch: don’t open nautilus every time a file is 
+    saved. This is simply annoying.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 16 Aug 2010 19:43:05 +0200
+
 epiphany-browser (2.30.2-4) unstable; urgency=low
 
   * debian/rules:

Added: desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch?rev=24982&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/14_download_nautilus.patch [utf-8] Mon Aug 16 18:47:45 2010
@@ -1,0 +1,59 @@
+Index: epiphany-2.30.2/src/popup-commands.c
+===================================================================
+--- epiphany-2.30.2.orig/src/popup-commands.c	2010-08-16 20:11:16.593871452 +0200
++++ epiphany-2.30.2/src/popup-commands.c	2010-08-16 20:11:18.353863367 +0200
+@@ -180,31 +180,6 @@ popup_cmd_copy_link_address (GtkAction *
+ }
+ 
+ static void
+-save_property_url_completed_cb (EphyEmbedPersist *persist)
+-{
+-	if (!(ephy_embed_persist_get_flags (persist) & 
+-				EPHY_EMBED_PERSIST_ASK_DESTINATION))
+-	{
+-		const char *dest;
+-		GFile *dest_file;
+-		guint32 user_time;
+-
+-		user_time = ephy_embed_persist_get_user_time (persist);
+-		dest = ephy_embed_persist_get_dest (persist);
+-
+-		g_return_if_fail (dest != NULL);
+-
+-		dest_file = g_file_new_for_path (dest);
+-		
+-		g_return_if_fail (dest_file != NULL);
+-		/* If save location is the desktop, nautilus will not open */
+-		ephy_file_browse_to (dest_file, user_time);
+-		
+-		g_object_unref (dest_file);
+-	}
+-}
+-
+-static void
+ save_property_url (GtkAction *action,
+ 		   const char *title,
+ 		   EphyWindow *window,
+@@ -238,9 +213,6 @@ save_property_url (GtkAction *action,
+ 		(persist, CONF_STATE_SAVE_DIR);
+ 	ephy_embed_persist_set_source (persist, location);
+ 
+-	g_signal_connect (persist, "completed",
+-			  G_CALLBACK (save_property_url_completed_cb), NULL);
+-
+ 	ephy_embed_persist_save (persist);
+ 
+ 	g_object_unref (G_OBJECT (persist));
+Index: epiphany-2.30.2/embed/ephy-embed.c
+===================================================================
+--- epiphany-2.30.2.orig/embed/ephy-embed.c	2010-08-16 20:11:32.589863260 +0200
++++ epiphany-2.30.2/embed/ephy-embed.c	2010-08-16 20:15:31.334363409 +0200
+@@ -637,7 +637,7 @@ confirm_action_response_cb (GtkWidget *d
+     case DOWNLOAD_ACTION_DOWNLOAD:
+     case DOWNLOAD_ACTION_OPEN_LOCATION:
+       g_object_set_data (G_OBJECT (download), "download-action",
+-                         GINT_TO_POINTER (DOWNLOAD_ACTION_OPEN_LOCATION));
++                         GINT_TO_POINTER (DOWNLOAD_ACTION_DOWNLOAD));
+       break;
+     }
+ 

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=24982&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Mon Aug 16 18:47:45 2010
@@ -6,5 +6,6 @@
 10_smart_bookmarks.patch
 12_safetypes.patch
 13_accept-languages.patch
+14_download_nautilus.patch
 99_autoreconf.patch
 99_ltmain_as-needed.patch