manatee-browser 0.0.2 → 0.0.3

raw patch · 5 files changed

+38/−6 lines, 5 filesdep ~manatee-coresetup-changed

Dependency ranges changed: manatee-core

Files

• Main.hs +2/−1
• Manatee/Extension/Browser/BrowserBuffer.hs +2/−2
• Manatee/Extension/Browser/BrowserView.hs +1/−1
• Setup.hs +22/−0
• manatee-browser.cabal +11/−2

@@ -28,4 +28,5 @@ -- | Irc client render process. main :: IO () main = -    startupRender (\ pagePath client pageId -> PageBufferWrap <$> browserBufferNew pagePath client pageId)+    startupRender (\ pagePath options client pageId -> +                       PageBufferWrap <$> browserBufferNew pagePath options client pageId)

@@ -42,8 +42,8 @@                            deriving (Show, Eq, Ord)  -- | New browser buffer.-browserBufferNew :: String -> Client -> PageId -> IO BrowserBuffer-browserBufferNew uri client pageId = do+browserBufferNew :: String -> [String] -> Client -> PageId -> IO BrowserBuffer+browserBufferNew uri _ client pageId = do   -- New buffer.   buffer <-      BrowserBuffer <$> newTVarIO uri

@@ -162,7 +162,7 @@   webView `on` loadCommitted $ \ frame -> do     -- Intercept new uri.     webFrameGetUri frame >?>= \uri -> -      mkDaemonSignal (pageViewClient view) NewTab (NewTabArgs "PageBrowser" uri)+      mkDaemonSignal (pageViewClient view) NewTab (NewTabArgs "PageBrowser" uri [])     -- Stop loading.     webViewStopLoading webView 

@@ -1,3 +1,21 @@+-- Author:     Andy Stewart <lazycat.manatee@gmail.com>+-- Maintainer: Andy Stewart <lazycat.manatee@gmail.com>+-- +-- Copyright (C) 2010 Andy Stewart, all rights reserved.+-- +-- 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 3 of the License, or+-- 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/>.+ import Distribution.Simple import Manatee.Core.Config import Manatee.Core.Types@@ -31,4 +49,8 @@              -- Update Duplicate tab list.              (PageModeDuplicateList list) <- readConfig pageModeDuplicateList (PageModeDuplicateList [])              writeConfig pageModeDuplicateList (PageModeDuplicateList (insertUnique (pageModeName browserMode) list))+             -- Update ExtensionGloalKeymap.+             (ExtensionGloalKeymap keymap) <- readConfig extensionGlobalKeymapPath (ExtensionGloalKeymap M.empty)+             writeConfig extensionGlobalKeymapPath (ExtensionGloalKeymap+                                                    (M.insert "F5" ("PageBrowser", "http://www.google.com", []) keymap))        }

@@ -1,11 +1,20 @@ name:			manatee-browser-version:		0.0.2+version:		0.0.3 Cabal-Version:	>= 1.6 license:		GPL-3 license-file:	LICENSE copyright:		(c) 2009 ~ 2010 Andy Stewart synopsis:		Browser extension for Manatee. description:    manatee-browser is WebKit browser extension for Manatee (Haskell/Gtk+ Integrated Live Environment)+ .+ Manual look <http://haskell.org/haskellwiki/Manatee>+ .+ Screenshot at <http://goo.gl/MkVw>+ .+ IRC channel: + .+ irc.freenode.net 6667 <##manatee>+ . author:			Andy Stewart maintainer:		Andy Stewart <lazycat.manatee@gmail.com> stability:		provisional@@ -19,7 +28,7 @@   location:     http://patch-tag.com/r/AndyStewart/manatee-browser    Library-     build-depends: base >= 4 && < 5, manatee-core >= 0.0.2, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,+     build-depends: base >= 4 && < 5, manatee-core >= 0.0.3, dbus-client >= 0.3 && < 0.4, stm >= 2.1.2.0,                     containers >= 0.3.0.0, webkit >= 0.12.0, gtk-serialized-event >= 0.12.0, gtk >= 0.12.0,                     text >= 0.7.1.0, mtl >= 1.1.0.2, utf8-string      exposed-modules: