r16962 - in /desktop/unstable/epiphany-browser/debian: changelog control control.in patches/18_gnome-vfs-for-helper-display.patch patches/99_autoreconf.patch patches/series
samm-guest at users.alioth.debian.org
samm-guest at users.alioth.debian.org
Sun Sep 14 23:24:32 UTC 2008
Author: samm-guest
Date: Sun Sep 14 23:24:31 2008
New Revision: 16962
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16962
Log:
* 18_gnome-vfs-for-helper-display.patch: Use gnome-vfs to display which
helper application a downloaded file will be opened with (closes:
#498913).
* Build-depend on gnome-vfs for the above patch.
* 99_autoreconf.patch: refresh.
Added:
desktop/unstable/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch
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/99_autoreconf.patch
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=16962&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog (original)
+++ desktop/unstable/epiphany-browser/debian/changelog Sun Sep 14 23:24:31 2008
@@ -1,3 +1,13 @@
+epiphany-browser (2.22.3-4) UNRELEASED; urgency=low
+
+ * 18_gnome-vfs-for-helper-display.patch: Use gnome-vfs to display which
+ helper application a downloaded file will be opened with (closes:
+ #498913).
+ * Build-depend on gnome-vfs for the above patch.
+ * 99_autoreconf.patch: refresh.
+
+ -- Sam Morris <sam at robots.org.uk> Sun, 14 Sep 2008 15:55:56 +0100
+
epiphany-browser (2.22.3-3) unstable; urgency=low
* Use not+linux-gnu instead of not+linux for non-Linux targets.
Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=16962&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control (original)
+++ desktop/unstable/epiphany-browser/debian/control Sun Sep 14 23:24:31 2008
@@ -12,6 +12,7 @@
libglade2-dev (>= 2.3.1),
libgnome2-dev (>= 2.14.0),
libgnomeui-dev (>= 2.16.0-2),
+ libgnomevfs2-dev (>= 2.9.2),
libgconf2-dev,
libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
Modified: desktop/unstable/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control.in?rev=16962&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control.in (original)
+++ desktop/unstable/epiphany-browser/debian/control.in Sun Sep 14 23:24:31 2008
@@ -12,6 +12,7 @@
libglade2-dev (>= 2.3.1),
libgnome2-dev (>= 2.14.0),
libgnomeui-dev (>= 2.16.0-2),
+ libgnomevfs2-dev (>= 2.9.2),
libgconf2-dev,
libgnome-desktop-dev (>= 2.9.91),
libstartup-notification0-dev (>= 0.5),
Added: desktop/unstable/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch?rev=16962&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/18_gnome-vfs-for-helper-display.patch Sun Sep 14 23:24:31 2008
@@ -1,0 +1,132 @@
+Index: epiphany-2.22.3/configure.ac
+===================================================================
+--- epiphany-2.22.3.orig/configure.ac 2008-09-14 15:47:15.000000000 +0100
++++ epiphany-2.22.3/configure.ac 2008-09-14 15:48:06.000000000 +0100
+@@ -109,6 +109,7 @@
+ LIBXML_REQUIRED=2.6.12
+ LIBXSLT_REQUIRED=1.1.7
+ LIBGLADE_REQUIRED=2.3.1
++LIBGNOMEVFS_REQUIRED=2.9.2
+ LIBGNOME_REQUIRED=2.14.0
+ LIBGNOMEUI_REQUIRED=2.14.0
+ GNOME_DESKTOP_REQUIRED=2.9.91
+@@ -135,6 +136,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+Index: epiphany-2.22.3/embed/mozilla/ContentHandler.cpp
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.cpp 2008-09-14 15:48:25.000000000 +0100
++++ epiphany-2.22.3/embed/mozilla/ContentHandler.cpp 2008-09-14 15:51:47.000000000 +0100
+@@ -25,13 +25,14 @@
+ #include "config.h"
+
+ #include <glib/gi18n.h>
+-#include <gio/gio.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkdialog.h>
+ #include <gtk/gtkimage.h>
+ #include <gtk/gtkmain.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <gtk/gtkstock.h>
++#include <libgnomevfs/gnome-vfs-mime.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+
+ #include <nsStringAPI.h>
+
+@@ -258,7 +259,7 @@
+ {
+ GtkWidget *dialog, *button, *image;
+ const char *action_label;
+- char *mime_description;
++ const char *mime_description;
+ nsCString file_name;
+
+ nsCOMPtr<nsIDOMWindow> parentDOMWindow = do_GetInterface (mContext);
+@@ -268,12 +269,12 @@
+ (mAction == CONTENT_ACTION_OPEN_TMP) ?
+ GTK_STOCK_OPEN : STOCK_DOWNLOAD;
+
+- mime_description = g_content_type_get_description (mMimeType.get());
++ mime_description = gnome_vfs_mime_get_description (mMimeType.get());
+ if (mime_description == NULL)
+ {
+ /* Translators: The text before the "|" is context to help you decide on
+ * the correct translation. You MUST OMIT it in the translated string. */
+- mime_description = g_strdup (Q_("File Type:|Unknown"));
++ mime_description = Q_("File Type:|Unknown");
+ }
+
+ /* We have one tiny, minor issue, the filename can be empty (""),
+@@ -313,7 +314,7 @@
+ Second %s is the file name,
+ Third %s is the application used to open the file */
+ _("File Type: â%sâ.\n\nYou can open â%sâ using â%sâ or save it."),
+- mime_description, file_name.get(), g_app_info_get_name (mHelperApp));
++ mime_description, file_name.get(), mHelperApp->name);
+ }
+ else
+ {
+@@ -331,8 +332,6 @@
+ mime_description, file_name.get());
+ }
+
+- g_free (mime_description);
+-
+ 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);
+@@ -373,7 +372,7 @@
+
+ auto_downloads = eel_gconf_get_boolean (CONF_AUTO_DOWNLOADS);
+
+- mHelperApp = g_app_info_get_default_for_type (mMimeType.get(), FALSE);
++ mHelperApp = gnome_vfs_mime_get_default_application (mMimeType.get());
+ mPermission = ephy_file_check_mime (mMimeType.get());
+
+ /* HACK! Check that this 'helper application' isn't Epiphany itself,
+@@ -381,7 +380,7 @@
+ */
+ if (mHelperApp)
+ {
+- const char *id = g_app_info_get_id (mHelperApp);
++ const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
+
+ /* FIXME! menu editing can make this check fail!!!! */
+ if (id && strcmp (id, "epiphany.desktop") == 0)
+@@ -435,7 +434,7 @@
+ g_return_val_if_fail (mHelperApp, NS_ERROR_FAILURE);
+
+ const char *id;
+- id = g_app_info_get_id (mHelperApp);
++ id = gnome_vfs_mime_application_get_desktop_id (mHelperApp);
+
+ /* The current time is fine here as the user has just clicked
+ * a button (it is used as the time for the application opening)
+Index: epiphany-2.22.3/embed/mozilla/ContentHandler.h
+===================================================================
+--- epiphany-2.22.3.orig/embed/mozilla/ContentHandler.h 2008-09-14 15:48:25.000000000 +0100
++++ epiphany-2.22.3/embed/mozilla/ContentHandler.h 2008-09-14 15:51:16.000000000 +0100
+@@ -22,7 +22,7 @@
+ #ifndef CONTENT_HANDLER_H
+ #define CONTENT_HANDLER_H
+
+-#include <gio/gio.h>
++#include <libgnomevfs/gnome-vfs-mime-handlers.h>
+
+ #include <nsCOMPtr.h>
+ #include <nsIFile.h>
+@@ -70,7 +70,7 @@
+ nsCOMPtr<nsIHelperAppLauncher> mLauncher;
+ nsCOMPtr<nsISupports> mContext;
+
+- GAppInfo *mHelperApp;
++ GnomeVFSMimeApplication *mHelperApp;
+ EphyMimePermission mPermission;
+
+ nsCString mUrl;
Modified: desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch?rev=16962&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch (original)
+++ desktop/unstable/epiphany-browser/debian/patches/99_autoreconf.patch Sun Sep 14 23:24:31 2008
@@ -4,8 +4,8 @@
autoconf
Index: epiphany-2.22.3/aclocal.m4
===================================================================
---- epiphany-2.22.3.orig/aclocal.m4 2008-06-30 20:02:16.000000000 +0200
-+++ epiphany-2.22.3/aclocal.m4 2008-07-02 10:47:15.935097663 +0200
+--- epiphany-2.22.3.orig/aclocal.m4 2008-06-30 19:02:16.000000000 +0100
++++ epiphany-2.22.3/aclocal.m4 2008-09-14 15:54:04.000000000 +0100
@@ -59,322 +59,755 @@
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
])
@@ -1473,8 +1473,8 @@
m4_include([m4/gtk-doc.m4])
Index: epiphany-2.22.3/configure
===================================================================
---- epiphany-2.22.3.orig/configure 2008-06-30 20:02:21.000000000 +0200
-+++ epiphany-2.22.3/configure 2008-07-02 10:47:22.771107686 +0200
+--- epiphany-2.22.3.orig/configure 2008-06-30 19:02:21.000000000 +0100
++++ epiphany-2.22.3/configure 2008-09-14 15:54:18.000000000 +0100
@@ -727,7 +727,7 @@
# Identity of this package.
@@ -1502,10 +1502,108 @@
VERSION='2.22.3'
+@@ -23413,6 +23413,7 @@
+ LIBXML_REQUIRED=2.6.12
+ LIBXSLT_REQUIRED=1.1.7
+ LIBGLADE_REQUIRED=2.3.1
++LIBGNOMEVFS_REQUIRED=2.9.2
+ LIBGNOME_REQUIRED=2.14.0
+ LIBGNOMEUI_REQUIRED=2.14.0
+ GNOME_DESKTOP_REQUIRED=2.9.91
+@@ -23462,6 +23463,8 @@
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= \$LIBGLADE_REQUIRED \\
++ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23478,6 +23481,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23497,6 +23502,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23525,6 +23532,8 @@
+ libgnome-2.0 >= \$LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= \$LIBGLADE_REQUIRED \\
++ gnome-vfs-2.0 >= \$LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= \$GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= \$LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23541,6 +23550,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23560,6 +23571,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23594,6 +23607,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23611,6 +23626,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23631,6 +23648,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
+@@ -23657,6 +23676,8 @@
+ libgnome-2.0 >= $LIBGNOME_REQUIRED
+ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED
+ libglade-2.0 >= $LIBGLADE_REQUIRED \
++ gnome-vfs-2.0 >= $LIBGNOMEVFS_REQUIRED
++ gnome-vfs-module-2.0
+ gconf-2.0
+ gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED
+ libstartup-notification-1.0 >= $LIBSTARTUP_NOTIFICATION_REQUIRED
Index: epiphany-2.22.3/embed/mozilla/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/embed/mozilla/Makefile.in 2008-06-30 20:02:25.000000000 +0200
-+++ epiphany-2.22.3/embed/mozilla/Makefile.in 2008-07-02 10:47:20.147092623 +0200
+--- epiphany-2.22.3.orig/embed/mozilla/Makefile.in 2008-06-30 19:02:25.000000000 +0100
++++ epiphany-2.22.3/embed/mozilla/Makefile.in 2008-09-14 15:54:12.000000000 +0100
@@ -515,7 +515,7 @@
-I$(top_srcdir)/embed -I$(top_srcdir) $(addprefix \
-I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
@@ -1517,8 +1615,8 @@
-DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
Index: epiphany-2.22.3/lib/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/lib/Makefile.in 2008-06-30 20:02:26.000000000 +0200
-+++ epiphany-2.22.3/lib/Makefile.in 2008-07-02 10:47:20.588092456 +0200
+--- epiphany-2.22.3.orig/lib/Makefile.in 2008-06-30 19:02:26.000000000 +0100
++++ epiphany-2.22.3/lib/Makefile.in 2008-09-14 15:54:13.000000000 +0100
@@ -435,7 +435,7 @@
-I$(top_builddir)/lib/egg \
-I$(top_srcdir)/lib/egg \
@@ -1530,8 +1628,8 @@
libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
Index: epiphany-2.22.3/ltmain.sh
===================================================================
---- epiphany-2.22.3.orig/ltmain.sh 2008-02-08 01:54:46.000000000 +0100
-+++ epiphany-2.22.3/ltmain.sh 2008-04-29 22:21:21.000000000 +0200
+--- epiphany-2.22.3.orig/ltmain.sh 2008-02-08 00:54:46.000000000 +0000
++++ epiphany-2.22.3/ltmain.sh 2008-04-29 22:33:55.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
@@ -1543,8 +1641,8 @@
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
Index: epiphany-2.22.3/plugins/desktop-file/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.in 2008-06-30 20:02:27.000000000 +0200
-+++ epiphany-2.22.3/plugins/desktop-file/Makefile.in 2008-07-02 10:47:21.020123273 +0200
+--- epiphany-2.22.3.orig/plugins/desktop-file/Makefile.in 2008-06-30 19:02:27.000000000 +0100
++++ epiphany-2.22.3/plugins/desktop-file/Makefile.in 2008-09-14 15:54:15.000000000 +0100
@@ -315,7 +315,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -1556,8 +1654,8 @@
plugin.cpp
Index: epiphany-2.22.3/src/Makefile.in
===================================================================
---- epiphany-2.22.3.orig/src/Makefile.in 2008-06-30 20:02:28.000000000 +0200
-+++ epiphany-2.22.3/src/Makefile.in 2008-07-02 10:47:21.399109429 +0200
+--- epiphany-2.22.3.orig/src/Makefile.in 2008-06-30 19:02:28.000000000 +0100
++++ epiphany-2.22.3/src/Makefile.in 2008-09-14 15:54:15.000000000 +0100
@@ -554,8 +554,8 @@
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=16962&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series Sun Sep 14 23:24:31 2008
@@ -15,4 +15,5 @@
15_certificates_oldapi.patch
16_fix-notify-uninit-crash.patch
17_print-scaling.patch
+18_gnome-vfs-for-helper-display.patch
99_autoreconf.patch
More information about the pkg-gnome-commits
mailing list