r27084 - in /packages/unstable/epiphany-extensions-more: debian/ docs/ misc/ tabs/ ui/

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Mar 24 23:38:24 UTC 2011


Author: pochu
Date: Thu Mar 24 23:38:22 2011
New Revision: 27084

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27084
Log:
import nmus

Added:
    packages/unstable/epiphany-extensions-more/debian/install
    packages/unstable/epiphany-extensions-more/docs/README.bookmark-shortcuts
    packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.js
    packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.js
    packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.js
Removed:
    packages/unstable/epiphany-extensions-more/docs/README.bookmarkshortcuts
    packages/unstable/epiphany-extensions-more/docs/README.close_other_tabs
    packages/unstable/epiphany-extensions-more/docs/README.tablinks
    packages/unstable/epiphany-extensions-more/docs/README.video-downloader
    packages/unstable/epiphany-extensions-more/misc/autofindasyoutype.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/autofindasyoutype.py
    packages/unstable/epiphany-extensions-more/misc/autofindlinksasyoutype.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/autofindlinksasyoutype.py
    packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.py
    packages/unstable/epiphany-extensions-more/misc/session-manager.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/session-manager.py
    packages/unstable/epiphany-extensions-more/misc/tablinks.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/tablinks.py
    packages/unstable/epiphany-extensions-more/misc/universal-edit-button.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/universal-edit-button.py
    packages/unstable/epiphany-extensions-more/misc/video-downloader.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/video-downloader.py
    packages/unstable/epiphany-extensions-more/misc/view-source.ephy-extension
    packages/unstable/epiphany-extensions-more/misc/view-source.py
    packages/unstable/epiphany-extensions-more/tabs/close_other_tabs.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/close_other_tabs.py
    packages/unstable/epiphany-extensions-more/tabs/colour-tabs.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/colour-tabs.py
    packages/unstable/epiphany-extensions-more/tabs/middle-click-closes-tab.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/middle-click-closes-tab.py
    packages/unstable/epiphany-extensions-more/tabs/onlyoneclosebutton.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/onlyoneclosebutton.py
    packages/unstable/epiphany-extensions-more/tabs/restore-tab.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/restore-tab.py
    packages/unstable/epiphany-extensions-more/tabs/tabforeground.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/tabforeground.py
    packages/unstable/epiphany-extensions-more/tabs/tabkeytabnavigate.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/tabkeytabnavigate.py
    packages/unstable/epiphany-extensions-more/tabs/tablabelborder.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/tablabelborder.py
    packages/unstable/epiphany-extensions-more/tabs/widetabs.ephy-extension
    packages/unstable/epiphany-extensions-more/tabs/widetabs.py
    packages/unstable/epiphany-extensions-more/ui/confirmwindowclose.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/confirmwindowclose.py
    packages/unstable/epiphany-extensions-more/ui/hidden-menu.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/hidden-menu.py
    packages/unstable/epiphany-extensions-more/ui/menuandtoolbar.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/menuandtoolbar.py
    packages/unstable/epiphany-extensions-more/ui/quitmenuitem.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/quitmenuitem.py
    packages/unstable/epiphany-extensions-more/ui/tabs_on_treeview.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/tabs_on_treeview.py
    packages/unstable/epiphany-extensions-more/ui/throbber-remover.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/throbber-remover.py
    packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.ephy-extension
    packages/unstable/epiphany-extensions-more/ui/urgentcontentnotify.py
Modified:
    packages/unstable/epiphany-extensions-more/debian/README.Debian
    packages/unstable/epiphany-extensions-more/debian/changelog
    packages/unstable/epiphany-extensions-more/debian/control
    packages/unstable/epiphany-extensions-more/debian/control.in
    packages/unstable/epiphany-extensions-more/debian/copyright
    packages/unstable/epiphany-extensions-more/debian/rules
    packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.ephy-extension

Modified: packages/unstable/epiphany-extensions-more/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/README.Debian?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/README.Debian [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/README.Debian [utf-8] Thu Mar 24 23:38:22 2011
@@ -4,43 +4,3 @@
 This is a collection of extensions from various sources. The quality and
 stability of the extensions are just as various.
 
-Here are the modifications that were made in the Debian package:
-
- colour-tabs
- -----------
-Minor porting work to 2.24.
-
- confirmwindowclose
- ------------------
-A title was added to the confirmation dialog.
-
- quitmenuitem
- ------------
-The stock item is used instead of an untranslated one.
-We close cleanly the window, avoiding the session recovery message.
-
- restore-tab
- -----------
-Minor porting work to 2.24.
-
- sessionmanager
- --------------
-Minor porting work to 2.24.
-Stock icons were added.
-
- tabs_on_treeview
- ----------------
-Major modifications to port the extension to epiphany 2.24.
-An important bug remains: the epiphany process will not exit if the
-extension has been loaded.
-
- video-downloader
- ----------------
-Middle-click on the icon is now supported, it opens the video inline in
-a new tab.
-Proxy fixes.
-
- view-source
- -----------
-The specific menu entry was removed, instead we override the existing
-menu entry with an identical-looking one.

Modified: packages/unstable/epiphany-extensions-more/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/changelog?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/changelog [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/changelog [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,3 +1,21 @@
+epiphany-extensions-more (2.30.0+nmu1) unstable; urgency=low
+
+  * NMU with maintainers approval
+  * Bump GNOME version to 2.30 (Closes: #578478)
+  * Update URL in copyright file
+
+ -- Guido Günther <agx at sigxcpu.org>  Mon, 19 Apr 2010 23:35:29 +0200
+
+epiphany-extensions-more (2.29.90+nmu1) unstable; urgency=low
+
+  * NMU with maintainers approval
+  * Switch from python extensions to JavaScript based ones.
+  * Add JavaScript extensions from
+    http://live.gnome.org/Epiphany/ThirdPartyExtensions/Epiphany228AndLater
+    Closes: #552365
+
+ -- Guido Günther <agx at sigxcpu.org>  Sat, 27 Feb 2010 15:20:13 +0100
+
 epiphany-extensions-more (2.26.1) unstable; urgency=low
 
   * Remove singlemenu, it’s very badly broken. Closes: #526321.

Modified: packages/unstable/epiphany-extensions-more/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/control?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/control [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/control [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: epiphany-extensions-more
 Section: gnome
 Priority: optional
@@ -5,56 +10,28 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5),
                cdbs,
-               gnome-pkg-tools (>= 0.6),
-               python-support (>= 0.7)
+               gnome-pkg-tools (>= 0.6)
 Standards-Version: 3.8.1
-Homepage: http://live.gnome.org/Epiphany/ThirdPartyExtensions
+Homepage: http://live.gnome.org/Epiphany/ThirdPartyExtensions/Epiphany228AndLater
 
 Package: epiphany-extensions-more
 Architecture: all
 Depends: epiphany-extensions (>= ${gnome:Version}),
          epiphany-extensions (<< ${gnome:NextVersion}),
-         ${python:Depends},
-         ${misc:Depends},
-         python-gtk2,
-         python-gobject,
-         python-gnome2,
-         python-notify,
-         clive (>= 2)
+         gir1.0-webkit-1.0,
+         gir1.0-soup-2.4,
+         ${misc:Depends}
 Description: Collection of third-party extensions for the Epiphany web browser
  This package contains various user-contributed extensions for 
  Epiphany, an intuitive web browser for the GNOME desktop.
  .
  Extensions bringing new features:
-  * Automatic Find As You Type - Start typing, and you will find text
-  * Automatic Find Links As You Type - The same, restricted to links
-  * Bookmark shortcuts - Use deskbar applet shortcuts in the URL bar
-  * Session Manager - Save session to a file and restore it later
-  * Tab Links - Copy the opened URIs to the clipboard
-  * Universal Edit Button - A single shortcut to bring the editor for 
-    sites with editable content (wikis)
-  * Video Downloader - Automatically download or open Flash videos from 
-    popular sites, without Flash support
-  * View Source - View page source inside the browser
+  * Bookmark shortcuts - Perform bookmark searches by typing a shortcut in the
+    address bar
  .
  Modifications of the user interface:
   * Confirm Window Close - Confirm closing when several tabs are open
-  * Hidden Menu - Hide and show the menu with a toolbar button
-  * Menubar and Toolbar beside each other
-  * Quit menu item
-  * Tabs on treeview - Replace tabs by a treeview in a sidebar
-  * Throbber remover - Removes the throbber from the toolbar
-  * Urgent Content Notify - Warn the Window Manager when a page 
-    changes in the background
  .
  Modifications of the tabs behaviour:
-  * Close Other Tabs - Close all tabs but the current one
-  * Colour tabs - Colorize tabs depending on the website
-  * Close tabs with middle-click
-  * Only One Close Button - Replace close buttons on the tabs by a 
-    single one in the toolbar
   * Restore Closed Tab
-  * Tab Foreground - Open new tabs in the foreground
-  * Tab Key Tab Navigate - Use control-tab to navigate between tabs
-  * Less Tab Label Border - Reduce the border around tab labels
-  * Wide tabs - Expand tabs to use all available space
+

Modified: packages/unstable/epiphany-extensions-more/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/control.in?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/control.in [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/control.in [utf-8] Thu Mar 24 23:38:22 2011
@@ -5,56 +5,28 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
                cdbs,
-               gnome-pkg-tools (>= 0.6),
-               python-support (>= 0.7)
+               gnome-pkg-tools (>= 0.6)
 Standards-Version: 3.8.1
-Homepage: http://live.gnome.org/Epiphany/ThirdPartyExtensions
+Homepage: http://live.gnome.org/Epiphany/ThirdPartyExtensions/Epiphany228AndLater
 
 Package: epiphany-extensions-more
 Architecture: all
 Depends: epiphany-extensions (>= ${gnome:Version}),
          epiphany-extensions (<< ${gnome:NextVersion}),
-         ${python:Depends},
-         ${misc:Depends},
-         python-gtk2,
-         python-gobject,
-         python-gnome2,
-         python-notify,
-         clive (>= 2)
+         gir1.0-webkit-1.0,
+         gir1.0-soup-2.4,
+         ${misc:Depends}
 Description: Collection of third-party extensions for the Epiphany web browser
  This package contains various user-contributed extensions for 
  Epiphany, an intuitive web browser for the GNOME desktop.
  .
  Extensions bringing new features:
-  * Automatic Find As You Type - Start typing, and you will find text
-  * Automatic Find Links As You Type - The same, restricted to links
-  * Bookmark shortcuts - Use deskbar applet shortcuts in the URL bar
-  * Session Manager - Save session to a file and restore it later
-  * Tab Links - Copy the opened URIs to the clipboard
-  * Universal Edit Button - A single shortcut to bring the editor for 
-    sites with editable content (wikis)
-  * Video Downloader - Automatically download or open Flash videos from 
-    popular sites, without Flash support
-  * View Source - View page source inside the browser
+  * Bookmark shortcuts - Perform bookmark searches by typing a shortcut in the
+    address bar
  .
  Modifications of the user interface:
   * Confirm Window Close - Confirm closing when several tabs are open
-  * Hidden Menu - Hide and show the menu with a toolbar button
-  * Menubar and Toolbar beside each other
-  * Quit menu item
-  * Tabs on treeview - Replace tabs by a treeview in a sidebar
-  * Throbber remover - Removes the throbber from the toolbar
-  * Urgent Content Notify - Warn the Window Manager when a page 
-    changes in the background
  .
  Modifications of the tabs behaviour:
-  * Close Other Tabs - Close all tabs but the current one
-  * Colour tabs - Colorize tabs depending on the website
-  * Close tabs with middle-click
-  * Only One Close Button - Replace close buttons on the tabs by a 
-    single one in the toolbar
   * Restore Closed Tab
-  * Tab Foreground - Open new tabs in the foreground
-  * Tab Key Tab Navigate - Use control-tab to navigate between tabs
-  * Less Tab Label Border - Reduce the border around tab labels
-  * Wide tabs - Expand tabs to use all available space
+

Modified: packages/unstable/epiphany-extensions-more/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/copyright?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/copyright [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/copyright [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,75 +1,34 @@
 This package was debianized by Josselin Mouette <joss at debian.org> on
 Thu, 08 Jan 2009 19:23:55 +0100.
 
-It was downloaded from http://live.gnome.org/Epiphany/ThirdPartyExtensions
+It was downloaded from http://live.gnome.org/Epiphany/ThirdPartyExtensions/Epiphany228AndLater
 
 Authors:
-    Stefan Stuhr <webmaster at sstuhr.dk> - autofindasyoutype, 
-        autofindlinksasyoutype, urgentcontentnotify, 
-        onlyoneclosebutton, tabkeytabnavigate, tablabelborder, 
-        confirmwindowclose, menuandtoolbar
-    Nigel Tao <nigeltao at gnome.org> - bookmarkshortcuts
-    Simon Ward <simon at bleah.co.uk> - session-manager
-    George Notaras <gnotar at gmail.com> - tablinks
-    Diego Escalante Urrelo <diegoe at gnome.org> - throbber-remover, 
-        view-source, widetabs, hidden-menu
-    Adam Schmalhofer <blauebirke at gmx.de> - video-downloader
-    Sean Fulmer <wsfulmer at gmail.com> - close_other_tabs
-    Siegfried Gevatter <rainct at ubuntu.com> - middle-click-closes-tab
-    Michael Opitz <opitz.michael at gmail.com> - restore-tab
-    Charles-Henri d’Adhémar <cdadhemar at free.fr> - tabforeground
-    Reinout van Schouwen <reinouts at gnome.org> - quitmenuitem
-    Kevin Michel <kmichel.info at gmail.com> - tabs_on_treeview
-    Thomas Thurman <tthurman at gnome.org> - colour-tabs
-    Johannes Berg <johannes at sipsolutions.net> - universal-edit-button
+    Nigel Tao <nigeltao at gnome.org>, bookmark-shortcuts
+    Iain Nicol <iainn at src.gnome.org>, bookmark-shortcuts
+    Tim Horton <hortont424 at gmail.com>, reopen-closed-tabs,
+                                       close-multiple-tabs
 
 Copyright:
-    Copyright © 2006-2007 Stefan Stuhr
-    Copyright © 2006 Nigel Tao
-    Copyright © 2007 Simon E. Ward
-    Copyright © 2007 George Notaras
-    Copyright © 2006, 2008 Diego Escalante Urrelo
-    Copyright © 2006 Jaime Frutos Morales
-    Copyright © 2008 Adam Schmalhofer
-    Copyright © 2008 Wouter Bolsterlee
-    Copyright © 2008 Sean Fulmer
-    Copyright © 2007 Thomas Thurman
-    Copyright © 2008 Siegfried Gevatter
-    Copyright © 2007 Michael Opitz
-    Copyright © 2007 Charles-Henri d’Adhémar
-    Copyright © 2008 Reinout van Schouwen
-    Copyright © Kevin Michel
-    Copyright © 2009 Josselin Mouette
-    Copyright © 2006 Jaime Frutos Morales
-    Copyright © 2008 Johannes Berg
+    Copyright © 2009 Iain Nicol <iainn at src.gnome.org>
+    Copyright © 2009 Tim Horton <hortont424 at gmail.com>
 
-License for the session-manager, tabforeground and tabs_on_treeview 
-extensions:
+License for the bookmark-shortcuts, reopen-closed-tabs:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of version 2 of the GNU General Public License
-   as published by the Free Software Foundation.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 2 of the License, or
+   (at your option) any later version.
 
-   This package is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
+On   Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-
-Note: the tabs_on_treeview extension did not include licensing 
-information, but the author sent the following statement by email:
-
-    I release "tabs on treeeview"  under the GPL 2 licence.
-
-
-License for the other extensions and the Debian changes:
+License for the Debian changes:
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

Added: packages/unstable/epiphany-extensions-more/debian/install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/install?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/install (added)
+++ packages/unstable/epiphany-extensions-more/debian/install [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,6 @@
+tabs/*.js             /usr/lib/epiphany-browser/2.29/extensions/
+tabs/*.ephy-extension /usr/lib/epiphany-browser/2.29/extensions/
+misc/*.js             /usr/lib/epiphany-browser/2.29/extensions/
+misc/*.ephy-extension /usr/lib/epiphany-browser/2.29/extensions/
+ui/*.js               /usr/lib/epiphany-browser/2.29/extensions/
+ui/*.ephy-extension   /usr/lib/epiphany-browser/2.29/extensions/

Modified: packages/unstable/epiphany-extensions-more/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/debian/rules?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/debian/rules [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/debian/rules [utf-8] Thu Mar 24 23:38:22 2011
@@ -4,21 +4,3 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
-webkit_exts = \
- bookmark-shortcuts session-manager tablinks close_other_tabs \
- middle-click-closes-tab restore-tab tabkeytabnavigate tablabelborder \
- widetabs confirmwindowclose hidden-menu quitmenuitem \
- tabs_on_treeview throbber-remover
-
-binary-post-install/epiphany-extensions-more::
-	dh_pysupport -p$(cdbs_curpkg) /usr/lib/epiphany-gecko/$(DEB_GNOME_VERSION)/extensions
-
-binary-install/epiphany-extensions-more::
-	mkdir -p debian/$(cdbs_curpkg)/usr/lib/epiphany-gecko/$(DEB_GNOME_VERSION)/extensions
-	install -m 644 misc/*.py tabs/*.py ui/*.py debian/$(cdbs_curpkg)/usr/lib/epiphany-gecko/$(DEB_GNOME_VERSION)/extensions/
-	install -m 644 misc/*.ephy-extension tabs/*.ephy-extension ui/*.ephy-extension debian/$(cdbs_curpkg)/usr/lib/epiphany-gecko/$(DEB_GNOME_VERSION)/extensions/
-	mkdir -p debian/$(cdbs_curpkg)/usr/lib/epiphany-webkit/$(DEB_GNOME_VERSION)/extensions
-	cd debian/$(cdbs_curpkg)/usr/lib/epiphany-webkit/$(DEB_GNOME_VERSION)/extensions && \
-		for i in $(webkit_exts); do \
-			ln -s ../../../epiphany-gecko/$(DEB_GNOME_VERSION)/extensions/$$i.* . ; \
-		done

Added: packages/unstable/epiphany-extensions-more/docs/README.bookmark-shortcuts
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/docs/README.bookmark-shortcuts?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/docs/README.bookmark-shortcuts (added)
+++ packages/unstable/epiphany-extensions-more/docs/README.bookmark-shortcuts [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,25 @@
+This Epiphany extension uses the Deskbar's shortcuts for the browser's
+``smart bookmarks'', or searches, so that, if you have the Wikipedia
+search bookmarked, and you have configured Deskbar properly, you can
+type ``wp foo'' in Epiphany's location bar to go to
+http://en.wikipedia.org/wiki/Special:Search?search=%foo
+
+To install, move the .js and .ephy-extension files into
+~/.gnome2/epiphany/extensions/ and then, from Epiphany's menu, go to
+Tools -> Extensions to enable it.
+
+You can configure the shortcuts from Epiphany's Edit -> Bookmark
+Shortcuts menu.  Alternatively, right-click on Deskbar's icon, choose
+Preferences and from the ``Web Searches (Epiphany)'' extension, click
+the ``More...''  button.  That, or just edit Deskbar's list of search
+shortcuts (it's a text file):
+~/.gnome2/deskbar-applet/search-bookmarks-shortcuts.txt
+
+Note that this is an Epiphany extension, not a Deskbar extension.
+Deskbar comes out-of-the-box with this behavior.
+
+This extension was originally written by Nigel Tao.  It was ported to be
+a ``Seed'' Javascript extension by Iain Nicol, to get it to work with
+versions of Epiphany greater than 2.28.  However, to avoid crashes when
+using this extension you should use Epiphany 2.29.3 or later, and Seed
+2.29.5 or later.

Modified: packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.ephy-extension
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.ephy-extension?rev=27084&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.ephy-extension [utf-8] (original)
+++ packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.ephy-extension [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,11 +1,10 @@
 [Epiphany Extension]
 Name=Bookmark shortcuts
-Description=Use deskbar applet shortcuts in the URL bar
-Authors=Nigel Tao
-Version=1
-URL=http://www.gnome.org/~nigeltao/epiphany_extensions/bookmark-shortcuts/
-
+Description=Perform bookmark searches by typing a shortcut in the address bar
+Authors=Iain Nicol\nNigel Tao
+Version=1.1.1
+URL=http://live.gnome.org/Epiphany/ThirdPartyExtensions
 
 [Loader]
-Type=python
+Type=seed
 Module=bookmark-shortcuts

Added: packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.js
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.js?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.js (added)
+++ packages/unstable/epiphany-extensions-more/misc/bookmark-shortcuts.js [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,221 @@
+// bookmark shortcuts v1.1.1
+// shortcuts for smart bookmark searches, shared with Deskbar Applet
+
+// Original extension for the Mozilla-based Epiphany:
+// (c) 2006-10-17 by Nigel Tao <nigeltao at gnome.org>, GPL licensed.
+// Port to Seed and GIO, and add an entry to the Edit menu:
+// Copyright © 2009 Iain Nicol <iainn at src.gnome.org>
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Gio = imports.gi.Gio;
+Gdk = imports.gi.Gdk;
+
+var shortcut_to_bookmark_map = {};
+var shortcuts_file_name = GLib.get_user_config_dir() +
+    "/deskbar-applet/search-bookmarks-shortcuts.txt";
+var shortcuts_file_monitor;
+
+var get_map_from_file = function (file) {
+    var map = {};
+
+    try {
+        var data_in_stream = new Gio.DataInputStream.c_new(file.read());
+
+        while ((line = data_in_stream.read_line(null)) !== null) {
+            line = line.trim();
+
+            var sep_location = line.search(/ |\t/);
+            if (sep_location > 0) {
+                var url = line.substring(0, sep_location);
+                var shortcut = line.substring(sep_location + 1).trim();
+
+                map[shortcut] = url;
+            }
+        }
+    } catch (e) {
+        // Maybe the file doesn't exist, etc.  Ignore.
+        printerr(e);
+    }
+
+    return map;
+};
+
+var shortcuts_changed_cb = function (file_monitor, file, other_file,
+                                     event_type, user_data) {
+    if (event_type === Gio.FileMonitorEvent.CHANGES_DONE_HINT) {
+        shortcut_to_bookmark_map = get_map_from_file(file);
+    }
+};
+
+var edit_bookmark_shortcuts_cb = function (action, window) {
+    // Comment out the code to spawn programs on the correct screen
+    // because as of the end of 2009, missing annotations in GDK will
+    // cause a crash.
+    //
+    var screen = null; // window.get_screen();
+    var deskbar_extn = Gio.file_new_for_path(
+        "/usr/lib/deskbar-applet/modules-2.20-compatible/epiphany.py");
+
+    if (deskbar_extn.query_exists()) {
+        // launch Deskbar's editor
+        var python_commands =
+            "import sys\n" +
+            "sys.path.insert(0," +
+            "    '/usr/lib/deskbar-applet/modules-2.20-compatible')\n" +
+            "import epiphany\n" +
+            "e = epiphany.EpiphanySearchHandler()\n" +
+            "e.initialize()\n" +
+            "e.show_config(None)\n";
+
+        // Gdk.spawn_on_screen(screen, null, ["python", "-c", python_commands],
+        //                     null, GLib.SpawnFlags.SEARCH_PATH, null, null,
+        //                     null);
+        GLib.spawn_async(null, ["python", "-c", python_commands],
+                        null, GLib.SpawnFlags.SEARCH_PATH, null, null,
+                        null);
+    } else {
+        var dialog = new Gtk.MessageDialog({
+            text: "The file format is a series of lines, each of the form:\n" +
+                "\n" +
+                "url shortcut\n" +
+                "\n" +
+                "Each “url” should contain “%s” in the position the search " +
+                "terms should go."});
+        dialog.add_button(Gtk.STOCK_CANCEL,
+                          Gtk.ResponseType.CANCEL);
+        dialog.add_button("Open Editor", Gtk.ResponseType.OK).grab_focus();
+
+        var response = dialog.run();
+        dialog.destroy();
+
+        if (response !== Gtk.ResponseType.OK) {
+            return;
+        }
+
+        var shortcuts_file = Gio.file_new_for_path(shortcuts_file_name);
+        try {
+            shortcuts_file.create();
+        } catch (e) {
+        }
+        Gtk.show_uri(screen, shortcuts_file.get_uri(), Gdk.CURRENT_TIME);
+    }
+};
+
+var resolve_address_cb = function (bookmarks, address, content) {
+    address = address.trim();
+    var n = address.indexOf(" ");
+    var shortcut;
+    var args;
+
+    if (n === -1) {
+        shortcut = address;
+        args = "";
+    } else {
+        shortcut = address.substring(0, n);
+        args = address.substring(n+1);
+    }
+
+    bookmark = shortcut_to_bookmark_map[shortcut];
+    if (bookmark === undefined) {
+        return null;
+    } else {
+        return bookmark.replace("%s", args);
+    }
+};
+
+var initialize_extension = function () {
+    bookmarks = Epiphany.EphyShell.get_default().get_bookmarks();
+    bookmarks._bookmark_shortcuts_signal = bookmarks.signal.
+        resolve_address.connect(resolve_address_cb);
+
+    var file = Gio.file_new_for_path(shortcuts_file_name);
+    try {
+        shortcuts_file_monitor = file.monitor();
+        shortcuts_file_monitor.signal.changed.connect(shortcuts_changed_cb);
+        shortcut_to_bookmark_map = get_map_from_file(file);
+    } catch (e) {
+    }
+};
+
+var finalize_extension = function () {
+    bookmarks = Epiphany.EphyShell.get_default().get_bookmarks();
+    bookmarks.signal.disconnect(bookmarks._bookmark_shortcuts_signal);
+    delete bookmarks._bookmark_shortcuts_signal;
+    shortcuts_file_monitor = null;
+};
+
+var attached_window_count = 0;
+
+var attach_window = function (window) {
+    // No race condition below because this extension is always called
+    // in the one GUI thread.  Hopefully.
+    if (attached_window_count === 0) {
+        initialize_extension();
+    }
+    attached_window_count++;
+
+    // Add Edit -> Bookmark Shortcuts to this window's menu.
+
+    // Object to hold onto the Edit menu entry, etc., for the window's
+    // lifetime.
+    window._bookmark_shortcuts = {};
+    var wbs = window._bookmark_shortcuts;
+
+    wbs.action = new Gtk.Action({
+        name: "EditBookmarkShortcuts",
+        label: "_Bookmark Shortcuts",
+        tooltip: "Configure shortcuts for your bookmark searches",
+        stock_id: null});
+    wbs.sig_id = wbs.action.signal.activate.connect(edit_bookmark_shortcuts_cb,
+                                                    window);
+    wbs.action_group = new Gtk.ActionGroup({
+        name: "EditBookmarkShortcutsActionGroup"});
+    wbs.action_group.add_action(wbs.action);
+
+    // Unfortunately the following line can trigger:
+    //     Gtk-CRITICAL **: gtk_container_foreach: assertion
+    //     `GTK_IS_CONTAINER (container)' failed
+    //  when we close the window.  This isn't our fault, though.
+    wbs.manager = window.get_ui_manager();
+
+    wbs.manager.insert_action_group(wbs.action_group, 0);
+    wbs.merge_id = wbs.manager.new_merge_id();
+    wbs.manager.add_ui(wbs.merge_id, "/menubar/EditMenu/EditPrefsMenu",
+                       "EditBookmarkShortcutsMenu", "EditBookmarkShortcuts",
+                       Gtk.UIManagerItemType.MENUITEM, true);
+};
+
+var detach_window = function (window) {
+    // Remove our Edit menu entry.
+    // Is this necessary?  Well, it doesn't hurt /too/ much, at least.
+    var wbs = window._bookmark_shortcuts;
+
+    wbs.manager.remove_ui(wbs.merge_id);
+    wbs.manager.remove_action_group(wbs.action_group);
+    wbs.action_group.remove_action(wbs.action);
+    wbs.action.signal.disconnect(wbs.sig_id);
+    delete window._bookmark_shortcuts;
+
+    // Cleanup the rest of the extension if necessary.
+    attached_window_count--;
+    if (attached_window_count === 0) {
+        finalize_extension();
+    }
+};
+
+extension = {
+    attach_window: attach_window,
+    detach_window: detach_window
+};

Added: packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.ephy-extension
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.ephy-extension?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.ephy-extension (added)
+++ packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.ephy-extension [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,10 @@
+[Epiphany Extension]
+Name=Reopen Closed Tabs Queue
+Description=Use Ctrl-Shift-T to reopen, one by one, the tabs you recently closed.
+Authors=Tim Horton
+Version=1
+URL=
+
+[Loader]
+Type=seed
+Module=reopen-closed-tabs

Added: packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.js
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.js?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.js (added)
+++ packages/unstable/epiphany-extensions-more/tabs/reopen-closed-tabs.js [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,73 @@
+/*
+ * Copyright © 2009 Tim Horton <hortont424 at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+Gtk = imports.gi.Gtk;
+Gdk = imports.gi.Gdk;
+WebKit = imports.gi.WebKit;
+Epiphany = imports.gi.Epiphany;
+
+var last_closed_urls = [ ];
+
+var key_pressed = function (window, event)
+{
+	if(event.key.state & Gdk.ModifierType.CONTROL_MASK &&
+	   event.key.state & Gdk.ModifierType.SHIFT_MASK)
+	{
+		if(event.key.keyval == Gdk.T)
+		{
+			var embed = window.get_active_child();
+			var shell = Epiphany.EphyShell.get_default();
+			var new_url = last_closed_urls.pop();
+			
+			if(new_url != null)
+				var new_tab = new Epiphany.EphyShell.tab(shell, window, embed,
+								new_url,
+								Epiphany.EphyNewTabFlags.OPEN_PAGE |
+								Epiphany.EphyNewTabFlags.IN_EXISTING_WINDOW |
+								Epiphany.EphyNewTabFlags.JUMP);
+		}
+	}
+	
+	return false;
+}
+
+extension = {
+	attach_tab: function(window, tab)
+	{
+	
+	},
+	detach_tab: function(window, tab)
+	{
+		var embed;
+		
+		if(tab.get_embed != null)
+			embed = tab.get_embed();
+		else
+			embed = tab;
+		
+		last_closed_urls.push(embed.get_web_view().get_location());
+	},
+	attach_window: function(window)
+	{
+		window.signal.key_press_event.connect(key_pressed);
+	},
+	detach_window: function(window)
+	{
+
+	}
+}

Added: packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.ephy-extension
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.ephy-extension?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.ephy-extension (added)
+++ packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.ephy-extension [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,10 @@
+[Epiphany Extension]
+Name=Don't Close Multiple Tabs
+Description=Warn before closing a window containing multiple open tabs.
+Authors=Tim Horton
+Version=1
+URL=
+
+[Loader]
+Type=seed
+Module=close-multiple-tabs

Added: packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.js
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.js?rev=27084&op=file
==============================================================================
--- packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.js (added)
+++ packages/unstable/epiphany-extensions-more/ui/close-multiple-tabs.js [utf-8] Thu Mar 24 23:38:22 2011
@@ -1,0 +1,27 @@
+var delete_event = function (window, event)
+{
+	var n = window.get_notebook();
+	if(n.get_n_pages() <= 1)
+		return false;
+	
+	var dialog = new Gtk.MessageDialog({text:"You are about to close a window with " + n.get_n_pages() + " open tabs.", message_type:Gtk.MessageType.WARNING });
+	dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL).grab_focus();
+	dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK);
+	dialog.set_default_response(Gtk.ResponseType.CANCEL);
+	
+	var result = dialog.run();
+	dialog.hide();
+	dialog.destroy();
+	
+	if(result == Gtk.ResponseType.OK)
+		return false;
+	else
+		return true;
+}
+
+extension = {
+    attach_window: function(window)
+	{
+		signal = window.signal.delete_event.connect(delete_event);
+	}
+}




More information about the pkg-gnome-commits mailing list