packages feed

bustle 0.7.5 → 0.8.0

raw patch · 33 files changed

+1602/−1931 lines, 33 filesdep +transformersdep −dbusdep −pcapsetup-changed

Dependencies added: transformers

Dependencies removed: dbus, pcap

Files

+ Bustle/GDBusMessage.hs view
@@ -0,0 +1,298 @@+{-+Bustle.GDBusMessage: bindings for GDBusMessage+Copyright © 2020 Will Thompson++This library is free software; you can redistribute it and/or+modify it under the terms of the GNU Lesser General Public+License as published by the Free Software Foundation; either+version 2.1 of the License, or (at your option) any later version.++This library 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+Lesser General Public License for more details.++You should have received a copy of the GNU Lesser General Public+License along with this library; if not, write to the Free Software+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+-}+{-# LANGUAGE ForeignFunctionInterface #-}+module Bustle.GDBusMessage+  (+-- * Types+    GDBusMessage+  , MessageType(..)+  , Serial++  , BusName+  , formatBusName+  , busName_++  , ObjectPath+  , formatObjectPath+  , objectPath_++  , InterfaceName+  , formatInterfaceName+  , interfaceName_++  , MemberName+  , formatMemberName+  , memberName_++-- * Constructors+  , makeNewGDBusMessage+  , wrapNewGDBusMessage+  , messageNewSignal++-- * Methods+  , messageType+  , messageSerial+  , messageReplySerial+  , messageSender+  , messageDestination+  , messageErrorName+  , messagePath+  , messageInterface+  , messageMember++  , messagePrintBody+  , messageGetBodyString+  )+where++import Data.Word+import Data.String++import Foreign.ForeignPtr+import Foreign.Ptr+import Foreign.C+import Foreign.Marshal.Alloc++import System.Glib.GObject+import System.Glib.UTFString++import Control.Monad.Trans (liftIO)+import Control.Monad.Trans.Maybe++import Bustle.GVariant++data MessageType = MessageTypeInvalid+                 | MessageTypeMethodCall+                 | MessageTypeMethodReturn+                 | MessageTypeError+                 | MessageTypeSignal+  deriving+    (Show, Ord, Eq, Enum)++-- 0 is unused in the wire protocol so indicates "no serial"+type Serial = Word32++newtype BusName = BusName String+    deriving (Eq, Ord, Show)++instance IsString BusName where+    fromString = busName_++newtype ObjectPath = ObjectPath String+    deriving (Eq, Ord, Show)++instance IsString ObjectPath where+    fromString = objectPath_++newtype InterfaceName = InterfaceName String+    deriving (Eq, Ord, Show)++newtype MemberName = MemberName String+    deriving (Eq, Ord, Show)++instance IsString MemberName where+    fromString = memberName_++-- TODO: validate+busName_ :: String+         -> BusName+busName_ = BusName++formatBusName :: BusName+              -> String+formatBusName (BusName n) = n++objectPath_ :: String+            -> ObjectPath+objectPath_ = ObjectPath++formatObjectPath :: ObjectPath+                 -> String+formatObjectPath (ObjectPath n) = n++interfaceName_ :: String+               -> InterfaceName+interfaceName_ = InterfaceName++formatInterfaceName :: InterfaceName+                    -> String+formatInterfaceName (InterfaceName n) = n++memberName_ :: String+            -> MemberName+memberName_ = MemberName++formatMemberName :: MemberName+                 -> String+formatMemberName (MemberName n) = n++newtype GDBusMessage = GDBusMessage { unGDBusMessage :: ForeignPtr GDBusMessage }+    deriving (Eq, Ord, Show)++mkGDBusMessage :: (ForeignPtr GDBusMessage -> GDBusMessage, FinalizerPtr a)+mkGDBusMessage = (GDBusMessage, objectUnref)++instance GObjectClass GDBusMessage where+    toGObject = GObject . castForeignPtr . unGDBusMessage+    unsafeCastGObject = GDBusMessage . castForeignPtr . unGObject+++makeNewGDBusMessage :: IO (Ptr GDBusMessage)+                    -> IO GDBusMessage+makeNewGDBusMessage = makeNewGObject mkGDBusMessage++wrapNewGDBusMessage :: IO (Ptr GDBusMessage)+                    -> IO GDBusMessage+wrapNewGDBusMessage = wrapNewGObject mkGDBusMessage++-- Foreign imports+foreign import ccall unsafe "g_dbus_message_new_signal"+    g_dbus_message_new_signal :: CString+                              -> CString+                              -> CString+                              -> IO (Ptr GDBusMessage)++foreign import ccall unsafe "g_dbus_message_get_message_type"+    g_dbus_message_get_message_type :: Ptr GDBusMessage+                                    -> IO Int++foreign import ccall unsafe "g_dbus_message_get_serial"+    g_dbus_message_get_serial :: Ptr GDBusMessage+                              -> IO Word32++foreign import ccall unsafe "g_dbus_message_get_reply_serial"+    g_dbus_message_get_reply_serial :: Ptr GDBusMessage+                                    -> IO Word32++foreign import ccall unsafe "g_dbus_message_get_sender"+    g_dbus_message_get_sender :: Ptr GDBusMessage+                              -> IO CString++foreign import ccall unsafe "g_dbus_message_get_destination"+    g_dbus_message_get_destination :: Ptr GDBusMessage+                                   -> IO CString++foreign import ccall unsafe "g_dbus_message_get_error_name"+    g_dbus_message_get_error_name :: Ptr GDBusMessage+                                  -> IO CString++foreign import ccall unsafe "g_dbus_message_get_path"+    g_dbus_message_get_path :: Ptr GDBusMessage+                                  -> IO CString++foreign import ccall unsafe "g_dbus_message_get_interface"+    g_dbus_message_get_interface :: Ptr GDBusMessage+                                  -> IO CString++foreign import ccall unsafe "g_dbus_message_get_member"+    g_dbus_message_get_member :: Ptr GDBusMessage+                                  -> IO CString++foreign import ccall unsafe "g_dbus_message_get_body"+    g_dbus_message_get_body :: Ptr GDBusMessage+                            -> IO (Ptr GVariant)++-- Bindings++messageNewSignal :: ObjectPath+                              -> InterfaceName+                              -> MemberName+                              -> IO GDBusMessage+messageNewSignal (ObjectPath o) (InterfaceName i) (MemberName m) =+    withCString o $ \o_ptr ->+    withCString i $ \i_ptr ->+    withCString m $ \m_ptr ->+        wrapNewGDBusMessage $ g_dbus_message_new_signal o_ptr i_ptr m_ptr++messageType :: GDBusMessage+            -> IO MessageType+messageType message =+    withForeignPtr (unGDBusMessage message) $ \c_message ->+    toEnum <$> g_dbus_message_get_message_type c_message++messageSerial :: GDBusMessage+              -> IO Serial+messageSerial message =+    withForeignPtr (unGDBusMessage message) $ \c_message ->+    g_dbus_message_get_serial c_message++messageReplySerial :: GDBusMessage+                   -> IO Serial+messageReplySerial message =+    withForeignPtr (unGDBusMessage message) $ \c_message ->+    g_dbus_message_get_reply_serial c_message++messageStr :: (String -> a)+           -> (Ptr GDBusMessage -> IO CString)+           -> GDBusMessage+           -> IO (Maybe a)+messageStr ctor f message =+    withForeignPtr (unGDBusMessage message) $ \c_message -> do+    c_str <- f c_message+    if c_str == nullPtr+        then return Nothing+        else Just . ctor <$> peekUTFString c_str++messageSender :: GDBusMessage+              -> IO (Maybe BusName)+messageSender = messageStr BusName g_dbus_message_get_sender++messageDestination :: GDBusMessage+                   -> IO (Maybe BusName)+messageDestination = messageStr BusName g_dbus_message_get_destination++messageErrorName :: GDBusMessage+                 -> IO (Maybe String)+messageErrorName = messageStr id g_dbus_message_get_error_name++messagePath :: GDBusMessage+            -> IO (Maybe ObjectPath)+messagePath = messageStr ObjectPath g_dbus_message_get_path++messageInterface :: GDBusMessage+                 -> IO (Maybe InterfaceName)+messageInterface = messageStr InterfaceName g_dbus_message_get_interface++messageMember :: GDBusMessage+              -> IO (Maybe MemberName)+messageMember = messageStr MemberName g_dbus_message_get_member++messageGetBody :: GDBusMessage+               -> IO (Maybe GVariant)+messageGetBody message = do+    body <- liftIO $ withForeignPtr (unGDBusMessage message) g_dbus_message_get_body+    if body == nullPtr+        then return Nothing+        else Just <$> makeNewGVariant (return body)++messagePrintBody :: GDBusMessage+                 -> IO String+messagePrintBody message = do+    body <- messageGetBody message+    case body of+        Nothing -> return ""+        Just b  -> variantPrint b WithAnnotations++messageGetBodyString :: GDBusMessage+                     -> Word+                     -> IO (Maybe String)+messageGetBodyString message i = runMaybeT $ do+    body <- MaybeT $ messageGetBody message+    child <- MaybeT $ variantGetChild body i+    MaybeT $ variantGetString child
+ Bustle/GVariant.hs view
@@ -0,0 +1,126 @@+{-+Bustle.GVariant: bindings for GVariant+Copyright © 2020 Will Thompson++This library is free software; you can redistribute it and/or+modify it under the terms of the GNU Lesser General Public+License as published by the Free Software Foundation; either+version 2.1 of the License, or (at your option) any later version.++This library 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+Lesser General Public License for more details.++You should have received a copy of the GNU Lesser General Public+License along with this library; if not, write to the Free Software+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+-}+{-# LANGUAGE ForeignFunctionInterface #-}+module Bustle.GVariant+  (+-- * Types+    GVariant+  , TypeAnnotate(..)++-- * Constructors+  , makeNewGVariant+  , wrapNewGVariant++-- * Methods+  , variantGetChild+  , variantGetString+  , variantPrint++  )+where++import Foreign.ForeignPtr+import Foreign.Ptr+import Foreign.C++import System.Glib.UTFString++import Control.Monad (guard)+import Control.Monad.Trans (liftIO)+import Control.Monad.Trans.Maybe++data TypeAnnotate = NoAnnotations+                  | WithAnnotations+  deriving+    (Show, Ord, Eq, Enum)++newtype GVariant = GVariant { unGVariant :: ForeignPtr GVariant }+    deriving (Eq, Ord, Show)++makeNewGVariant :: IO (Ptr GVariant)+                -> IO GVariant+makeNewGVariant act = wrapNewGVariant (act >>= g_variant_ref)++wrapNewGVariant :: IO (Ptr GVariant)+                -> IO GVariant+wrapNewGVariant act = do+    vPtr <- act+    v <- newForeignPtr g_variant_unref vPtr+    return $ GVariant v++-- Foreign imports+foreign import ccall unsafe "g_variant_is_of_type"+    g_variant_is_of_type :: Ptr a+                         -> CString+                         -> IO CInt++foreign import ccall unsafe "g_variant_n_children"+    g_variant_n_children :: Ptr a+                             -> IO CSize++foreign import ccall unsafe "g_variant_get_child_value"+    g_variant_get_child_value :: Ptr a+                              -> CSize+                              -> IO (Ptr a)++foreign import ccall unsafe "g_variant_get_string"+    g_variant_get_string :: Ptr a+                         -> Ptr CSize+                         -> IO CString++foreign import ccall unsafe "g_variant_print"+    g_variant_print :: Ptr a+                    -> CInt+                    -> IO CString++foreign import ccall unsafe "g_variant_ref"+    g_variant_ref :: Ptr GVariant+                  -> IO (Ptr GVariant)++foreign import ccall unsafe "&g_variant_unref"+    g_variant_unref :: FunPtr (Ptr GVariant -> IO ())++-- Bindings+variantNChildren :: GVariant+                    -> IO Word+variantNChildren v = withForeignPtr (unGVariant v) $ \vPtr -> do+    fromIntegral <$> g_variant_n_children vPtr++variantGetChild :: GVariant+                -> Word+                -> IO (Maybe GVariant)+variantGetChild v i = withForeignPtr (unGVariant v) $ \vPtr -> runMaybeT $ do+    n <- liftIO $ variantNChildren v+    guard (i < n)+    liftIO $ wrapNewGVariant $ g_variant_get_child_value vPtr (fromIntegral i)++variantGetString :: GVariant+                 -> IO (Maybe String)+variantGetString v = withForeignPtr (unGVariant v) $ \vPtr -> runMaybeT $ do+    r <- liftIO $ withCString "s" $ g_variant_is_of_type vPtr+    guard (r /= 0)+    s <- liftIO $ g_variant_get_string vPtr nullPtr+    liftIO $ peekUTFString s++variantPrint :: GVariant+             -> TypeAnnotate+             -> IO String+variantPrint v annotate = withForeignPtr (unGVariant v) $ \vPtr -> do+    cstr <- g_variant_print vPtr (fromIntegral $ fromEnum annotate)+    readUTFString cstr
Bustle/Loader/Pcap.hs view
@@ -32,17 +32,13 @@ import Data.Map (Map) import Control.Exception (try) import Control.Monad.State-import System.IO.Error ( mkIOError-                       , userErrorType-                       )--import Network.Pcap--import DBus+import Control.Monad.Trans.Maybe -import qualified Data.ByteString as BS+import System.Glib (GError)  import qualified Bustle.Types as B+import Bustle.GDBusMessage+import Bustle.Reader  -- Conversions from dbus-core's types into Bustle's more stupid types. This -- whole section is pretty upsetting.@@ -63,23 +59,23 @@   where     fallback_ = busName_ fallback -convertMember :: (a -> ObjectPath)-              -> (a -> Maybe InterfaceName)-              -> (a -> MemberName)-              -> a-              -> B.Member-convertMember getObjectPath getInterfaceName getMemberName m =-    B.Member (getObjectPath m)-             (getInterfaceName m)-             (getMemberName m)+convertMember :: MonadIO m+              => GDBusMessage+              -> m B.Member+convertMember m = liftIO $ do+    p <- fromMaybe (objectPath_ "") <$> messagePath m+    i <- messageInterface m+    member <- fromMaybe (memberName_ "") <$> messageMember m+    return $ B.Member p i member + type PendingMessages = Map (Maybe BusName, Serial)-                           (MethodCall, B.Detailed B.Message)+                           (B.Detailed B.Message)  popMatchingCall :: (MonadState PendingMessages m)                 => Maybe BusName                 -> Serial-                -> m (Maybe (MethodCall, B.Detailed B.Message))+                -> m (Maybe (B.Detailed B.Message)) popMatchingCall name serial = do     ret <- tryPop (name, serial)     case (ret, name) of@@ -98,27 +94,30 @@ insertPending :: MonadState PendingMessages m               => Maybe BusName               -> Serial-              -> MethodCall               -> B.Detailed B.Message               -> m ()-insertPending n s rawCall b = modify $ Map.insert (n, s) (rawCall, b)+insertPending n s b = modify $ Map.insert (n, s) b -isNOC :: Maybe BusName -> Signal -> Maybe (BusName, Maybe BusName, Maybe BusName)-isNOC (Just sender) s | looksLikeNOC =-    case names of-        [Just n, old, new] -> Just (n, old, new)-        _                  -> Nothing+isNOC :: MonadIO m+      => Maybe BusName+      -> GDBusMessage+      -> m (Maybe (BusName, Maybe BusName, Maybe BusName))+isNOC maybeSender message = liftIO $ runMaybeT $ do+    sender <- MaybeT . return $ maybeSender+    guard (sender == B.dbusName)+    type_ <- liftIO $ messageType message+    guard (type_ == MessageTypeSignal)+    iface <- MaybeT $ messageInterface message+    guard (iface == B.dbusInterface)+    member <- MaybeT $ messageMember message+    guard (formatMemberName member == "NameOwnerChanged")+    n <- MaybeT $ messageGetBodyString message 0+    old <- MaybeT $ messageGetBodyString message 1+    new <- MaybeT $ messageGetBodyString message 2+    return (busName_ n, asBusName old, asBusName new)   where-    names :: [Maybe BusName]-    names = map fromVariant $ signalBody s--    looksLikeNOC =-      (sender == B.dbusName) &&-        (signalInterface s == B.dbusInterface) &&-          (formatMemberName (signalMember s) == "NameOwnerChanged")--isNOC _ _ = Nothing-+    asBusName "" = Nothing+    asBusName name = Just $ busName_ name  bustlifyNOC :: (BusName, Maybe BusName, Maybe BusName)             -> B.NOC@@ -138,130 +137,118 @@     uniquify = B.UniqueName     otherify = B.OtherName -tryBustlifyGetNameOwnerReply :: Maybe (MethodCall, a)-                             -> MethodReturn-                             -> Maybe B.NOC-tryBustlifyGetNameOwnerReply maybeCall mr = do+tryBustlifyGetNameOwnerReply :: MonadIO m+                             => Maybe (B.Detailed a)+                             -> GDBusMessage+                             -> m (Maybe B.NOC)+tryBustlifyGetNameOwnerReply maybeCall reply = liftIO $ runMaybeT $ do     -- FIXME: obviously this should be more robust:     --  • check that the service really is the bus daemon     --  • don't crash if the body of the call or reply doesn't contain one bus name.-    (rawCall, _) <- maybeCall-    guard (formatMemberName (methodCallMember rawCall) == "GetNameOwner")-    ownedName <- fromVariant (head (methodCallBody rawCall))-    return $ bustlifyNOC ( ownedName+    call <- MaybeT . return $ B.deReceivedMessage <$> maybeCall+    member <- MaybeT $ messageMember call+    guard (formatMemberName member == "GetNameOwner")+    ownedName <- MaybeT $ messageGetBodyString call 0+    owner <- MaybeT $ messageGetBodyString reply 0+    return $ bustlifyNOC ( busName_ ownedName                          , Nothing-                         , fromVariant (head (methodReturnBody mr))+                         , Just $ busName_ owner                          ) -bustlify :: MonadState PendingMessages m+bustlify :: (MonadIO m, MonadState PendingMessages m)          => B.Microseconds          -> Int-         -> ReceivedMessage+         -> GDBusMessage          -> m B.DetailedEvent bustlify µs bytes m = do-    bm <- buildBustledMessage-    return $ B.Detailed µs bm bytes m-  where-    sender = receivedMessageSender m+    sender <- liftIO $ messageSender m     -- FIXME: can we do away with the un-Maybe-ing and just push that Nothing     -- means 'the monitor' downwards? Or skip the message if sender is Nothing.-    wrappedSender = convertBusName "sen.der" sender+    let wrappedSender = convertBusName "sen.der" sender+    serial <- liftIO $ messageSerial m+    replySerial <- liftIO $ messageReplySerial m+    destination <- liftIO $ messageDestination m -    buildBustledMessage = case m of-        (ReceivedMethodCall serial mc) -> do+    let detailed x = B.Detailed µs x bytes m+    type_ <- liftIO $ messageType m+    detailed <$> case type_ of+        MessageTypeMethodCall -> do+            member <- convertMember m             let call = B.MethodCall-                             { B.serial = serialValue serial+                             { B.serial = serial                              , B.sender = wrappedSender-                             , B.destination = convertBusName "method.call.destination" $ methodCallDestination mc-                             , B.member = convertMember methodCallPath methodCallInterface methodCallMember mc+                             , B.destination = convertBusName "method.call.destination" destination+                             , B.member = member                              }-            -- FIXME: we shouldn't need to construct almost the same thing here-            -- and 10 lines above maybe?-            insertPending sender serial mc (B.Detailed µs call bytes m)+            insertPending sender serial (detailed call)             return $ B.MessageEvent call -        (ReceivedMethodReturn _serial mr) -> do-            call <- popMatchingCall (methodReturnDestination mr) (methodReturnSerial mr)--            return $ case tryBustlifyGetNameOwnerReply call mr of+        MessageTypeMethodReturn -> do+            call <- popMatchingCall destination replySerial+            noc_ <- tryBustlifyGetNameOwnerReply call m+            return $ case noc_ of                 Just noc -> B.NOCEvent noc                 Nothing  -> B.MessageEvent $ B.MethodReturn-                               { B.inReplyTo = fmap snd call+                               { B.inReplyTo = call                                , B.sender = wrappedSender-                               , B.destination = convertBusName "method.return.destination" $ methodReturnDestination mr+                               , B.destination = convertBusName "method.return.destination" destination                                } -        (ReceivedMethodError _serial e) -> do-            call <- popMatchingCall (methodErrorDestination e) (methodErrorSerial e)+        MessageTypeError -> do+            call <- popMatchingCall destination replySerial             return $ B.MessageEvent $ B.Error-                        { B.inReplyTo = fmap snd call+                        { B.inReplyTo = call                         , B.sender = wrappedSender-                        , B.destination = convertBusName "method.error.destination" $ methodErrorDestination e+                        , B.destination = convertBusName "method.error.destination" destination                         } -        (ReceivedSignal _serial sig)-            | Just names <- isNOC sender sig -> return $ B.NOCEvent $ bustlifyNOC names-            | otherwise                      -> return $ B.MessageEvent $-                B.Signal { B.sender = wrappedSender-                         , B.member = convertMember signalPath (Just . signalInterface) signalMember sig-                         , B.signalDestination = stupifyBusName <$> signalDestination sig-                         }+        MessageTypeSignal -> do+            names_ <- isNOC sender m+            member <- convertMember m+            return $ case names_ of+                Just names -> B.NOCEvent $ bustlifyNOC names+                Nothing    -> B.MessageEvent $+                    B.Signal { B.sender = wrappedSender+                             , B.member = member+                             , B.signalDestination = stupifyBusName <$> destination+                             }          _ -> error "woah there! someone added a new message type." -convert :: MonadState PendingMessages m+convert :: (MonadIO m, MonadState PendingMessages m)         => B.Microseconds-        -> BS.ByteString+        -> Int+        -> GDBusMessage         -> m (Either String B.DetailedEvent)-convert µs body =-    case unmarshal body of-        Left e  -> return $ Left $ unmarshalErrorMessage e-        Right m -> Right <$> bustlify µs (BS.length body) m--data Result e a =-    EOF-  | Packet (Either e a)-  deriving Show+convert µs bytes message = Right <$> bustlify µs bytes message  readOne :: (MonadState s m, MonadIO m)-        => PcapHandle-        -> (B.Microseconds -> BS.ByteString -> m (Either e a))-        -> m (Result e a)+        => Reader+        -> (B.Microseconds -> Int -> GDBusMessage -> m (Either e a))+        -> m (Maybe (Either e a)) readOne p f = do-    (hdr, body) <- liftIO $ nextBS p-    -- No really, nextBS just returns null packets when you hit the end of the-    -- file.-    ---    -- It occurs to me that we could stream by just polling this every second-    -- or something?-    if hdrCaptureLength hdr == 0-        then return EOF-        else Packet <$> f (fromIntegral (hdrTime hdr)) body+    ret <- liftIO $ readerReadOne p+    case ret of+        Nothing -> return Nothing+        Just (µsec, bytes, body) -> Just <$> f µsec bytes body  -- This shows up as the biggest thing on the heap profile. Which is kind of a -- surprise. It's supposedly the list. mapBodies :: (MonadState s m, MonadIO m)-          => PcapHandle-          -> (B.Microseconds -> BS.ByteString -> m (Either e a))+          => Reader+          -> (B.Microseconds -> Int -> GDBusMessage -> m (Either e a))           -> m [Either e a] mapBodies p f = do     ret <- readOne p f     case ret of-        EOF      -> return []-        Packet x -> do+        Nothing -> return []+        Just x  -> do             xs <- mapBodies p f             return $ x:xs  readPcap :: MonadIO m          => FilePath-         -> m (Either IOError ([String], [B.DetailedEvent]))+         -> m (Either GError ([String], [B.DetailedEvent])) readPcap path = liftIO $ try $ do-    p <- openOffline path-    dlt <- datalink p-    -- DLT_NULL for extremely old logs.-    -- DLT_DBUS is missing: https://github.com/bos/pcap/pull/8-    unless (dlt `elem` [DLT_NULL, DLT_UNKNOWN 231]) $ do-        let message = "Incorrect link type " ++ show dlt-        ioError $ mkIOError userErrorType message Nothing (Just path)-+    p <- readerOpen path     partitionEithers <$> evalStateT (mapBodies p convert) Map.empty
Bustle/Monitor.hs view
@@ -44,6 +44,7 @@ import System.Glib.GError import System.Glib.Signals +import Bustle.GDBusMessage import Bustle.Types (Microseconds)  -- Gtk2HS boilerplate@@ -98,19 +99,20 @@ monitorStop monitor =     withForeignPtr (unMonitor monitor) bustle_pcap_monitor_stop -messageLoggedHandler :: (Microseconds -> BS.ByteString -> IO ())+messageLoggedHandler :: (Microseconds -> Int -> GDBusMessage -> IO ())                      -> a                      -> CLong                      -> CLong                      -> Ptr CChar                      -> CUInt+                     -> Ptr GDBusMessage                      -> IO ()-messageLoggedHandler user _obj sec usec blob blobLength = do-    blobBS <- BS.packCStringLen (blob, fromIntegral blobLength)+messageLoggedHandler user _obj sec usec _blob blobLength messagePtr = do     let µsec = fromIntegral sec * (10 ^ (6 :: Int)) + fromIntegral usec-    failOnGError $ user µsec blobBS+    message <- makeNewGDBusMessage (return messagePtr)+    failOnGError $ user µsec (fromIntegral blobLength) message -monitorMessageLogged :: Signal Monitor (Microseconds -> BS.ByteString -> IO ())+monitorMessageLogged :: Signal Monitor (Microseconds -> Int -> GDBusMessage -> IO ()) monitorMessageLogged =     Signal $ \after_ obj user ->         connectGeneric "message-logged" after_ obj $ messageLoggedHandler user
+ Bustle/Reader.hs view
@@ -0,0 +1,119 @@+{-+Bustle.Reader: Haskell binding for pcap-reader.c+Copyright © 2020 Will Thompson++This library is free software; you can redistribute it and/or+modify it under the terms of the GNU Lesser General Public+License as published by the Free Software Foundation; either+version 2.1 of the License, or (at your option) any later version.++This library 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+Lesser General Public License for more details.++You should have received a copy of the GNU Lesser General Public+License along with this library; if not, write to the Free Software+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA+-}+{-# LANGUAGE ForeignFunctionInterface #-}+module Bustle.Reader+  (+-- * Types+    Reader++-- * Methods+  , readerOpen+  , readerReadOne+  , readerClose+  , withReader+  )+where++import Control.Exception (bracket)++import Foreign.C+import Foreign.ForeignPtr+import Foreign.Marshal.Alloc+import Foreign.Ptr+import Foreign.Storable++import System.Glib.GObject+import System.Glib.GError++import Bustle.GDBusMessage+import Bustle.Types (Microseconds)++-- Gtk2HS boilerplate+newtype Reader = Reader { unReader :: ForeignPtr Reader }+    deriving (Eq, Ord)++mkReader :: (ForeignPtr Reader -> Reader, FinalizerPtr a)+mkReader = (Reader, objectUnref)++instance GObjectClass Reader where+    toGObject = GObject . castForeignPtr . unReader+    unsafeCastGObject = Reader . castForeignPtr . unGObject++-- Foreign imports+foreign import ccall "bustle_pcap_reader_open"+    bustle_pcap_reader_open :: CString+                            -> Ptr (Ptr ())+                            -> IO (Ptr Reader)++-- Foreign imports+foreign import ccall "bustle_pcap_reader_read_one"+    bustle_pcap_reader_read_one :: Ptr Reader+                                -> Ptr CLong+                                -> Ptr CLong+                                -> Ptr (Ptr CChar)+                                -> Ptr CUInt+                                -> Ptr (Ptr GDBusMessage)+                                -> Ptr (Ptr ())+                                -> IO CInt++foreign import ccall "bustle_pcap_reader_close"+    bustle_pcap_reader_close :: Ptr Reader+                             -> IO ()++-- Throws a GError if the file can't be opened+readerOpen :: FilePath+           -> IO Reader+readerOpen filename =+    wrapNewGObject mkReader $+      propagateGError $ \gerrorPtr ->+        withCString filename $ \c_filename ->+          bustle_pcap_reader_open c_filename gerrorPtr++readerReadOne :: Reader+              -> IO (Maybe (Microseconds, Int, GDBusMessage))+readerReadOne reader =+    withForeignPtr (unReader reader) $ \c_reader ->+    alloca $ \secPtr ->+    alloca $ \usecPtr ->+    alloca $ \blobPtrPtr ->+    alloca $ \lengthPtr ->+    alloca $ \messagePtr -> do+        poke messagePtr nullPtr+        propagateGError $ bustle_pcap_reader_read_one c_reader secPtr usecPtr blobPtrPtr lengthPtr messagePtr+        blob <- peek blobPtrPtr+        if blob == nullPtr+            then return Nothing+            else do+                sec <- peek secPtr+                usec <- peek usecPtr+                blobLength <- peek lengthPtr+                let µsec = fromIntegral sec * (10 ^ (6 :: Int)) + fromIntegral usec+                message <- wrapNewGDBusMessage $ peek messagePtr+                return $ Just (µsec, fromIntegral blobLength, message)++readerClose :: Reader+            -> IO ()+readerClose reader =+    withForeignPtr (unReader reader) bustle_pcap_reader_close++withReader :: FilePath+           -> (Reader -> IO a)+           -> IO a+withReader filename f = do+    bracket (readerOpen filename) readerClose f
Bustle/Types.hs view
@@ -65,20 +65,12 @@   ) where -import Data.Word (Word32)-import DBus ( ObjectPath, formatObjectPath-            , InterfaceName, formatInterfaceName, interfaceName_-            , MemberName, formatMemberName-            , BusName, formatBusName, busName_-            , ReceivedMessage-            )+import Bustle.GDBusMessage import Data.Maybe (maybeToList) import Data.Either (partitionEithers) import Data.Set (Set) import qualified Data.Set as Set -type Serial = Word32- newtype UniqueName = UniqueName BusName   deriving (Ord, Show, Eq) newtype OtherName = OtherName BusName@@ -195,7 +187,7 @@     Detailed { deTimestamp :: Microseconds              , deEvent :: e              , deMessageSize :: MessageSize-             , deReceivedMessage :: ReceivedMessage+             , deReceivedMessage :: GDBusMessage              }   deriving (Show, Eq, Functor)
Bustle/UI.hs view
@@ -41,6 +41,7 @@ import Bustle.Renderer import Bustle.Types import Bustle.Diagram+import Bustle.GDBusMessage import qualified Bustle.Marquee as Marquee import Bustle.Monitor import Bustle.Util@@ -284,9 +285,10 @@     loaderStateRef <- newIORef Map.empty     pendingRef <- newIORef [] -    let updateLabel µs body = do+    let updateLabel :: Microseconds -> Int -> GDBusMessage -> IO ()+        updateLabel µs l msg = do             s <- readIORef loaderStateRef-            (m, s') <- runStateT (convert µs body) s+            (m, s') <- runStateT (convert µs l msg) s             s' `seq` writeIORef loaderStateRef s'              case m of@@ -433,41 +435,6 @@                             \\"%s\".") tempFilePath                 displayError wi title (Just secondary) --- | Show a confirmation dialog if the log is unsaved. Suitable for use as a---   'delete-event' handler.-promptToSave :: MonadIO io-             => WindowInfo-             -> io Bool -- ^ True if we showed a prompt; False if we're-                        --   happy to quit-promptToSave wi = io $ do-    mdetails <- readIORef (wiLogDetails wi)-    case mdetails of-        Just (RecordedLog tempFilePath) -> do-            let tempFileName = takeFileName tempFilePath-                title = printf (__ "Save log '%s' before closing?") tempFileName :: String-            prompt <- messageDialogNew (Just (wiWindow wi))-                                       [DialogModal]-                                       MessageWarning-                                       ButtonsNone-                                       title-            messageDialogSetSecondaryText prompt-                (__ "If you don't save, this log will be lost forever.")-            dialogAddButton prompt (__ "Close _Without Saving") ResponseClose-            dialogAddButton prompt stockCancel ResponseCancel-            dialogAddButton prompt stockSave ResponseYes--            widgetShowAll prompt-            prompt `after` response $ \resp -> do-                let closeUp = widgetDestroy (wiWindow wi)-                case resp of-                    ResponseYes -> showSaveDialog wi closeUp-                    ResponseClose -> closeUp-                    _ -> return ()-                widgetDestroy prompt--            return True-        _ -> return False- maybeQuit :: B () maybeQuit = do   n <- decWindows@@ -487,7 +454,8 @@   subtitle <- getW castToLabel "headerSubtitle"   spinner  <- getW castToSpinner "headerSpinner" -  [openItem, openTwoItem] <- mapM (getW castToMenuItem) ["open", "openTwo"]+  openItem <- getW castToMenuItem "open"+  openTwoItem <- getW castToMenuItem "openTwo"   recordSessionItem <- getW castToMenuItem "recordSession"   recordSystemItem <- getW castToMenuItem "recordSystem"   recordAddressItem <- getW castToMenuItem "recordAddress"@@ -575,7 +543,6 @@                               , wiLogDetails = logDetailsRef                               } -  io $ window `on` deleteEvent $ promptToSave windowInfo   incWindows   io $ widgetShow window   return windowInfo
Bustle/UI/AboutDialog.hs view
@@ -48,6 +48,7 @@                  , aboutDialogComments := __ "Someone's favourite D-Bus profiler"                  , aboutDialogWebsite := "https://gitlab.freedesktop.org/bustle/bustle#readme"                  , aboutDialogAuthors := authors+                 , aboutDialogArtists := artists                  , aboutDialogCopyright := "© 2008–2017 Will Thompson, Collabora Ltd. and contributors"                  , aboutDialogLicense := license                  , aboutDialogLogoIconName := Just "org.freedesktop.Bustle"@@ -70,4 +71,8 @@           , "Philip Withnall"           , "Jonny Lamb"           , "Daniel Firth"+          ]++artists :: [String]+artists = [ "Tobias Bernard"           ]
Bustle/UI/DetailsView.hs view
@@ -24,16 +24,14 @@   ) where -import Data.List (intercalate)-import Graphics.UI.Gtk hiding (Signal)+import Control.Monad.Trans (liftIO)+import Control.Monad.Trans.Maybe (MaybeT(..)) -import qualified DBus as D-import DBus.Internal.Message (MethodError(..))-import DBus.Internal.Types (ErrorName(..))+import Graphics.UI.Gtk hiding (Signal)  import Bustle.Types import Bustle.Marquee-import Bustle.VariantFormatter+import Bustle.GDBusMessage  type OptionalRow = (Label, Label) @@ -91,21 +89,20 @@     Signal { signalDestination = d } -> d     _                                -> Just (destination m) -getErrorName :: Detailed a -> Maybe String-getErrorName (Detailed _ _ _ rm) = case rm of-    D.ReceivedMethodError _ MethodError{ methodErrorName = ErrorName en} -> Just en-    _                                                                    -> Nothing+getErrorName :: Detailed a -> IO (Maybe String)+getErrorName (Detailed _ _ _ m) = messageErrorName m -formatMessage :: Detailed Message -> String-formatMessage (Detailed _ _ _ rm) =-    case (rm, D.fromVariant <$> body) of-        -- Special-case errors, which (are supposed to) have a single-        -- human-readable string argument-        (D.ReceivedMethodError _ _, [Just message]) -> message-        _                                           -> formatted+formatMessage :: Detailed Message -> IO String+formatMessage (Detailed _ _ _ m) = do+    errorMessage <- formatErrorMessage+    case errorMessage of+        Just message -> return message+        Nothing      -> messagePrintBody m   where-    body = D.receivedMessageBody rm-    formatted = intercalate "\n" $ map (format_Variant VariantStyleSignature) body+    formatErrorMessage :: IO (Maybe String)+    formatErrorMessage = runMaybeT $ do+        MessageTypeError <- liftIO $ messageType m+        MaybeT $ messageGetBodyString m 0  detailsViewGetTop :: DetailsView -> Widget detailsViewGetTop = toWidget . detailsGrid@@ -133,10 +130,10 @@     -- to/from well-known names and show both     labelSetText (detailsSender d) (unBusName . sender . deEvent $ m)     setOptionalRow (detailsDestination d) (unBusName <$> getDestination m)-    setOptionalRow (detailsErrorName d) (getErrorName m)+    setOptionalRow (detailsErrorName d) =<< getErrorName m -    labelSetText (detailsPath d) (maybe unknown (D.formatObjectPath . path) member_)+    labelSetText (detailsPath d) (maybe unknown (formatObjectPath . path) member_)     labelSetMarkup (detailsMember d) (maybe unknown getMemberMarkup member_)-    textBufferSetText buf (formatMessage m)+    textBufferSetText buf =<< formatMessage m   where     unknown = ""
− Bustle/VariantFormatter.hs 
@@ -1,150 +0,0 @@-{--Bustle.VariantFormatter: produces GVariant strings representing D-Bus values-Copyright © 2011 Will Thompson--This library is free software; you can redistribute it and/or-modify it under the terms of the GNU Lesser General Public-License as published by the Free Software Foundation; either-version 2.1 of the License, or (at your option) any later version.--This library 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-Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public-License along with this library; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA--}-module Bustle.VariantFormatter-  ( format_Variant-  , VariantStyle(..)-  )-where--import Data.Word-import Data.Int-import Data.List (intercalate)-import Data.Char (chr, isPrint)--- :'(-import Data.Maybe (fromJust)--import DBus--format_Bool :: Bool -> String-format_Bool = show--format_Word8 :: Word8 -> String-format_Word8 = show--format_ByteArray :: Array -> String-format_ByteArray ay =-    if all isPrintish chars-        then 'b':show chars-        else format_Array ay-  where-    bytes = map (fromJust . fromVariant) (arrayItems ay) :: [Word8]-    chars = map (chr . fromIntegral) bytes-    isPrintish '\0' = True-    isPrintish c    = isPrint c---format_Int16 :: Int16 -> String-format_Int16 = show-format_Int32 :: Int32 -> String-format_Int32 = show-format_Int64 :: Int64 -> String-format_Int64 = show--format_Word16 :: Word16 -> String-format_Word16 = show-format_Word32 :: Word32 -> String-format_Word32 = show-format_Word64 :: Word64 -> String-format_Word64 = show--format_Double :: Double -> String-format_Double = show--format_String :: String -> String-format_String = show--format_Signature :: Signature -> String-format_Signature = show . formatSignature--format_ObjectPath :: ObjectPath -> String-format_ObjectPath = show . formatObjectPath--format_Array :: Array -> String-format_Array a = "[" ++ intercalate ", " items ++ "]"-  where-    items = map (format_Variant VariantStyleBare) $ arrayItems a--format_Dictionary :: Dictionary -> String-format_Dictionary d = "{" ++ intercalate ", " items ++ "}"-  where-    items = map (\(k, v) -> format_Variant VariantStyleBare k ++ ": " ++ format_Variant VariantStyleBare v) $ dictionaryItems d---- FIXME…-format_Structure :: Structure -> String-format_Structure s = case structureItems s of-    []  -> "()"-    [v] -> "(" ++ format_Variant VariantStyleBare v ++ ",)"-    vs  -> "(" ++ intercalate ", " items ++ ")"-      where-        items = map (format_Variant VariantStyleBare) vs--data VariantStyle =-    VariantStyleBare-  | VariantStyleSignature-  | VariantStyleAngleBrackets---- why did you remove typeCode from the public API, John…-typeCode :: Type -> String-typeCode TypeBoolean    = "b"-typeCode TypeWord8      = "y"-typeCode TypeWord16     = "q"-typeCode TypeWord32     = "u"-typeCode TypeWord64     = "t"-typeCode TypeInt16      = "n"-typeCode TypeInt32      = "i"-typeCode TypeInt64      = "x"-typeCode TypeDouble     = "d"-typeCode TypeString     = "s"-typeCode TypeSignature  = "g"-typeCode TypeObjectPath = "o"-typeCode TypeUnixFd     = "h"-typeCode TypeVariant    = "v"-typeCode (TypeArray t)  = 'a':typeCode t-typeCode (TypeDictionary kt vt) = concat [ "a{", typeCode kt , typeCode vt, "}"]-typeCode (TypeStructure ts) = concat ["(", concatMap typeCode ts, ")"]--format_Variant :: VariantStyle -> Variant -> String-format_Variant style v =-    case style of-      VariantStyleBare -> formatted-      VariantStyleSignature -> typeSignature ++ " " ++ formatted-      VariantStyleAngleBrackets -> "<" ++ typeSignature ++ " " ++ formatted ++ ">"-  where-    ty = variantType v-    typeSignature = ('@':) . typeCode $ ty-    format = case ty of-        TypeBoolean -> format_Bool . fromJust . fromVariant-        TypeInt16 -> format_Int16 . fromJust . fromVariant-        TypeInt32 -> format_Int32 . fromJust . fromVariant-        TypeInt64 -> format_Int64 . fromJust . fromVariant-        TypeWord8 -> format_Word8 . fromJust . fromVariant-        TypeWord16 -> format_Word16 . fromJust . fromVariant-        TypeWord32 -> format_Word32 . fromJust . fromVariant-        TypeWord64 -> format_Word64 . fromJust . fromVariant-        TypeDouble -> format_Double . fromJust . fromVariant-        TypeString -> format_String . fromJust . fromVariant-        TypeSignature -> format_Signature . fromJust . fromVariant-        TypeObjectPath -> format_ObjectPath . fromJust . fromVariant-        TypeUnixFd -> const "<fd>"-        TypeVariant -> format_Variant VariantStyleAngleBrackets . fromJust . fromVariant-        TypeArray TypeWord8 -> format_ByteArray . fromJust . fromVariant-        TypeArray _ -> format_Array . fromJust . fromVariant-        TypeDictionary _ _ -> format_Dictionary . fromJust . fromVariant-        TypeStructure _ -> format_Structure . fromJust . fromVariant-    formatted = format v
LICENSE view
@@ -1,11 +1,7 @@ All code in this project is licensed under the GNU LGPL Version 2.1 or (at your option) any later version. -dbus-core, a Haskell reimplementation of the D-Bus wire protocol which Bustle-depends on, is covered by the GNU GPL version 3. Hence, Bustle binaries may be-distributed under the GNU GPL version 3.--The LGPL v2.1 and GPL v3 follow.+A copy of the LGPL v2.1 follows.  --- @@ -516,680 +512,3 @@   Ty Coon, President of Vice  That's all there is to it!-------                    GNU GENERAL PUBLIC LICENSE-                       Version 3, 29 June 2007-- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>- Everyone is permitted to copy and distribute verbatim copies- of this license document, but changing it is not allowed.--                            Preamble--  The GNU General Public License is a free, copyleft license for-software and other kinds of works.--  The licenses for most software and other practical works are designed-to take away your freedom to share and change the works.  By contrast,-the GNU General Public License is intended to guarantee your freedom to-share and change all versions of a program--to make sure it remains free-software for all its users.  We, the Free Software Foundation, use the-GNU General Public License for most of our software; it applies also to-any other work released this way by its authors.  You can apply it to-your programs, too.--  When we speak of free software, we are referring to freedom, not-price.  Our General Public Licenses are designed to make sure that you-have the freedom to distribute copies of free software (and charge for-them if you wish), that you receive source code or can get it if you-want it, that you can change the software or use pieces of it in new-free programs, and that you know you can do these things.--  To protect your rights, we need to prevent others from denying you-these rights or asking you to surrender the rights.  Therefore, you have-certain responsibilities if you distribute copies of the software, or if-you modify it: responsibilities to respect the freedom of others.--  For example, if you distribute copies of such a program, whether-gratis or for a fee, you must pass on to the recipients the same-freedoms that you received.  You must make sure that they, too, receive-or can get the source code.  And you must show them these terms so they-know their rights.--  Developers that use the GNU GPL protect your rights with two steps:-(1) assert copyright on the software, and (2) offer you this License-giving you legal permission to copy, distribute and/or modify it.--  For the developers' and authors' protection, the GPL clearly explains-that there is no warranty for this free software.  For both users' and-authors' sake, the GPL requires that modified versions be marked as-changed, so that their problems will not be attributed erroneously to-authors of previous versions.--  Some devices are designed to deny users access to install or run-modified versions of the software inside them, although the manufacturer-can do so.  This is fundamentally incompatible with the aim of-protecting users' freedom to change the software.  The systematic-pattern of such abuse occurs in the area of products for individuals to-use, which is precisely where it is most unacceptable.  Therefore, we-have designed this version of the GPL to prohibit the practice for those-products.  If such problems arise substantially in other domains, we-stand ready to extend this provision to those domains in future versions-of the GPL, as needed to protect the freedom of users.--  Finally, every program is threatened constantly by software patents.-States should not allow patents to restrict development and use of-software on general-purpose computers, but in those that do, we wish to-avoid the special danger that patents applied to a free program could-make it effectively proprietary.  To prevent this, the GPL assures that-patents cannot be used to render the program non-free.--  The precise terms and conditions for copying, distribution and-modification follow.--                       TERMS AND CONDITIONS--  0. Definitions.--  "This License" refers to version 3 of the GNU General Public License.--  "Copyright" also means copyright-like laws that apply to other kinds of-works, such as semiconductor masks.--  "The Program" refers to any copyrightable work licensed under this-License.  Each licensee is addressed as "you".  "Licensees" and-"recipients" may be individuals or organizations.--  To "modify" a work means to copy from or adapt all or part of the work-in a fashion requiring copyright permission, other than the making of an-exact copy.  The resulting work is called a "modified version" of the-earlier work or a work "based on" the earlier work.--  A "covered work" means either the unmodified Program or a work based-on the Program.--  To "propagate" a work means to do anything with it that, without-permission, would make you directly or secondarily liable for-infringement under applicable copyright law, except executing it on a-computer or modifying a private copy.  Propagation includes copying,-distribution (with or without modification), making available to the-public, and in some countries other activities as well.--  To "convey" a work means any kind of propagation that enables other-parties to make or receive copies.  Mere interaction with a user through-a computer network, with no transfer of a copy, is not conveying.--  An interactive user interface displays "Appropriate Legal Notices"-to the extent that it includes a convenient and prominently visible-feature that (1) displays an appropriate copyright notice, and (2)-tells the user that there is no warranty for the work (except to the-extent that warranties are provided), that licensees may convey the-work under this License, and how to view a copy of this License.  If-the interface presents a list of user commands or options, such as a-menu, a prominent item in the list meets this criterion.--  1. Source Code.--  The "source code" for a work means the preferred form of the work-for making modifications to it.  "Object code" means any non-source-form of a work.--  A "Standard Interface" means an interface that either is an official-standard defined by a recognized standards body, or, in the case of-interfaces specified for a particular programming language, one that-is widely used among developers working in that language.--  The "System Libraries" of an executable work include anything, other-than the work as a whole, that (a) is included in the normal form of-packaging a Major Component, but which is not part of that Major-Component, and (b) serves only to enable use of the work with that-Major Component, or to implement a Standard Interface for which an-implementation is available to the public in source code form.  A-"Major Component", in this context, means a major essential component-(kernel, window system, and so on) of the specific operating system-(if any) on which the executable work runs, or a compiler used to-produce the work, or an object code interpreter used to run it.--  The "Corresponding Source" for a work in object code form means all-the source code needed to generate, install, and (for an executable-work) run the object code and to modify the work, including scripts to-control those activities.  However, it does not include the work's-System Libraries, or general-purpose tools or generally available free-programs which are used unmodified in performing those activities but-which are not part of the work.  For example, Corresponding Source-includes interface definition files associated with source files for-the work, and the source code for shared libraries and dynamically-linked subprograms that the work is specifically designed to require,-such as by intimate data communication or control flow between those-subprograms and other parts of the work.--  The Corresponding Source need not include anything that users-can regenerate automatically from other parts of the Corresponding-Source.--  The Corresponding Source for a work in source code form is that-same work.--  2. Basic Permissions.--  All rights granted under this License are granted for the term of-copyright on the Program, and are irrevocable provided the stated-conditions are met.  This License explicitly affirms your unlimited-permission to run the unmodified Program.  The output from running a-covered work is covered by this License only if the output, given its-content, constitutes a covered work.  This License acknowledges your-rights of fair use or other equivalent, as provided by copyright law.--  You may make, run and propagate covered works that you do not-convey, without conditions so long as your license otherwise remains-in force.  You may convey covered works to others for the sole purpose-of having them make modifications exclusively for you, or provide you-with facilities for running those works, provided that you comply with-the terms of this License in conveying all material for which you do-not control copyright.  Those thus making or running the covered works-for you must do so exclusively on your behalf, under your direction-and control, on terms that prohibit them from making any copies of-your copyrighted material outside their relationship with you.--  Conveying under any other circumstances is permitted solely under-the conditions stated below.  Sublicensing is not allowed; section 10-makes it unnecessary.--  3. Protecting Users' Legal Rights From Anti-Circumvention Law.--  No covered work shall be deemed part of an effective technological-measure under any applicable law fulfilling obligations under article-11 of the WIPO copyright treaty adopted on 20 December 1996, or-similar laws prohibiting or restricting circumvention of such-measures.--  When you convey a covered work, you waive any legal power to forbid-circumvention of technological measures to the extent such circumvention-is effected by exercising rights under this License with respect to-the covered work, and you disclaim any intention to limit operation or-modification of the work as a means of enforcing, against the work's-users, your or third parties' legal rights to forbid circumvention of-technological measures.--  4. Conveying Verbatim Copies.--  You may convey verbatim copies of the Program's source code as you-receive it, in any medium, provided that you conspicuously and-appropriately publish on each copy an appropriate copyright notice;-keep intact all notices stating that this License and any-non-permissive terms added in accord with section 7 apply to the code;-keep intact all notices of the absence of any warranty; and give all-recipients a copy of this License along with the Program.--  You may charge any price or no price for each copy that you convey,-and you may offer support or warranty protection for a fee.--  5. Conveying Modified Source Versions.--  You may convey a work based on the Program, or the modifications to-produce it from the Program, in the form of source code under the-terms of section 4, provided that you also meet all of these conditions:--    a) The work must carry prominent notices stating that you modified-    it, and giving a relevant date.--    b) The work must carry prominent notices stating that it is-    released under this License and any conditions added under section-    7.  This requirement modifies the requirement in section 4 to-    "keep intact all notices".--    c) You must license the entire work, as a whole, under this-    License to anyone who comes into possession of a copy.  This-    License will therefore apply, along with any applicable section 7-    additional terms, to the whole of the work, and all its parts,-    regardless of how they are packaged.  This License gives no-    permission to license the work in any other way, but it does not-    invalidate such permission if you have separately received it.--    d) If the work has interactive user interfaces, each must display-    Appropriate Legal Notices; however, if the Program has interactive-    interfaces that do not display Appropriate Legal Notices, your-    work need not make them do so.--  A compilation of a covered work with other separate and independent-works, which are not by their nature extensions of the covered work,-and which are not combined with it such as to form a larger program,-in or on a volume of a storage or distribution medium, is called an-"aggregate" if the compilation and its resulting copyright are not-used to limit the access or legal rights of the compilation's users-beyond what the individual works permit.  Inclusion of a covered work-in an aggregate does not cause this License to apply to the other-parts of the aggregate.--  6. Conveying Non-Source Forms.--  You may convey a covered work in object code form under the terms-of sections 4 and 5, provided that you also convey the-machine-readable Corresponding Source under the terms of this License,-in one of these ways:--    a) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by the-    Corresponding Source fixed on a durable physical medium-    customarily used for software interchange.--    b) Convey the object code in, or embodied in, a physical product-    (including a physical distribution medium), accompanied by a-    written offer, valid for at least three years and valid for as-    long as you offer spare parts or customer support for that product-    model, to give anyone who possesses the object code either (1) a-    copy of the Corresponding Source for all the software in the-    product that is covered by this License, on a durable physical-    medium customarily used for software interchange, for a price no-    more than your reasonable cost of physically performing this-    conveying of source, or (2) access to copy the-    Corresponding Source from a network server at no charge.--    c) Convey individual copies of the object code with a copy of the-    written offer to provide the Corresponding Source.  This-    alternative is allowed only occasionally and noncommercially, and-    only if you received the object code with such an offer, in accord-    with subsection 6b.--    d) Convey the object code by offering access from a designated-    place (gratis or for a charge), and offer equivalent access to the-    Corresponding Source in the same way through the same place at no-    further charge.  You need not require recipients to copy the-    Corresponding Source along with the object code.  If the place to-    copy the object code is a network server, the Corresponding Source-    may be on a different server (operated by you or a third party)-    that supports equivalent copying facilities, provided you maintain-    clear directions next to the object code saying where to find the-    Corresponding Source.  Regardless of what server hosts the-    Corresponding Source, you remain obligated to ensure that it is-    available for as long as needed to satisfy these requirements.--    e) Convey the object code using peer-to-peer transmission, provided-    you inform other peers where the object code and Corresponding-    Source of the work are being offered to the general public at no-    charge under subsection 6d.--  A separable portion of the object code, whose source code is excluded-from the Corresponding Source as a System Library, need not be-included in conveying the object code work.--  A "User Product" is either (1) a "consumer product", which means any-tangible personal property which is normally used for personal, family,-or household purposes, or (2) anything designed or sold for incorporation-into a dwelling.  In determining whether a product is a consumer product,-doubtful cases shall be resolved in favor of coverage.  For a particular-product received by a particular user, "normally used" refers to a-typical or common use of that class of product, regardless of the status-of the particular user or of the way in which the particular user-actually uses, or expects or is expected to use, the product.  A product-is a consumer product regardless of whether the product has substantial-commercial, industrial or non-consumer uses, unless such uses represent-the only significant mode of use of the product.--  "Installation Information" for a User Product means any methods,-procedures, authorization keys, or other information required to install-and execute modified versions of a covered work in that User Product from-a modified version of its Corresponding Source.  The information must-suffice to ensure that the continued functioning of the modified object-code is in no case prevented or interfered with solely because-modification has been made.--  If you convey an object code work under this section in, or with, or-specifically for use in, a User Product, and the conveying occurs as-part of a transaction in which the right of possession and use of the-User Product is transferred to the recipient in perpetuity or for a-fixed term (regardless of how the transaction is characterized), the-Corresponding Source conveyed under this section must be accompanied-by the Installation Information.  But this requirement does not apply-if neither you nor any third party retains the ability to install-modified object code on the User Product (for example, the work has-been installed in ROM).--  The requirement to provide Installation Information does not include a-requirement to continue to provide support service, warranty, or updates-for a work that has been modified or installed by the recipient, or for-the User Product in which it has been modified or installed.  Access to a-network may be denied when the modification itself materially and-adversely affects the operation of the network or violates the rules and-protocols for communication across the network.--  Corresponding Source conveyed, and Installation Information provided,-in accord with this section must be in a format that is publicly-documented (and with an implementation available to the public in-source code form), and must require no special password or key for-unpacking, reading or copying.--  7. Additional Terms.--  "Additional permissions" are terms that supplement the terms of this-License by making exceptions from one or more of its conditions.-Additional permissions that are applicable to the entire Program shall-be treated as though they were included in this License, to the extent-that they are valid under applicable law.  If additional permissions-apply only to part of the Program, that part may be used separately-under those permissions, but the entire Program remains governed by-this License without regard to the additional permissions.--  When you convey a copy of a covered work, you may at your option-remove any additional permissions from that copy, or from any part of-it.  (Additional permissions may be written to require their own-removal in certain cases when you modify the work.)  You may place-additional permissions on material, added by you to a covered work,-for which you have or can give appropriate copyright permission.--  Notwithstanding any other provision of this License, for material you-add to a covered work, you may (if authorized by the copyright holders of-that material) supplement the terms of this License with terms:--    a) Disclaiming warranty or limiting liability differently from the-    terms of sections 15 and 16 of this License; or--    b) Requiring preservation of specified reasonable legal notices or-    author attributions in that material or in the Appropriate Legal-    Notices displayed by works containing it; or--    c) Prohibiting misrepresentation of the origin of that material, or-    requiring that modified versions of such material be marked in-    reasonable ways as different from the original version; or--    d) Limiting the use for publicity purposes of names of licensors or-    authors of the material; or--    e) Declining to grant rights under trademark law for use of some-    trade names, trademarks, or service marks; or--    f) Requiring indemnification of licensors and authors of that-    material by anyone who conveys the material (or modified versions of-    it) with contractual assumptions of liability to the recipient, for-    any liability that these contractual assumptions directly impose on-    those licensors and authors.--  All other non-permissive additional terms are considered "further-restrictions" within the meaning of section 10.  If the Program as you-received it, or any part of it, contains a notice stating that it is-governed by this License along with a term that is a further-restriction, you may remove that term.  If a license document contains-a further restriction but permits relicensing or conveying under this-License, you may add to a covered work material governed by the terms-of that license document, provided that the further restriction does-not survive such relicensing or conveying.--  If you add terms to a covered work in accord with this section, you-must place, in the relevant source files, a statement of the-additional terms that apply to those files, or a notice indicating-where to find the applicable terms.--  Additional terms, permissive or non-permissive, may be stated in the-form of a separately written license, or stated as exceptions;-the above requirements apply either way.--  8. Termination.--  You may not propagate or modify a covered work except as expressly-provided under this License.  Any attempt otherwise to propagate or-modify it is void, and will automatically terminate your rights under-this License (including any patent licenses granted under the third-paragraph of section 11).--  However, if you cease all violation of this License, then your-license from a particular copyright holder is reinstated (a)-provisionally, unless and until the copyright holder explicitly and-finally terminates your license, and (b) permanently, if the copyright-holder fails to notify you of the violation by some reasonable means-prior to 60 days after the cessation.--  Moreover, your license from a particular copyright holder is-reinstated permanently if the copyright holder notifies you of the-violation by some reasonable means, this is the first time you have-received notice of violation of this License (for any work) from that-copyright holder, and you cure the violation prior to 30 days after-your receipt of the notice.--  Termination of your rights under this section does not terminate the-licenses of parties who have received copies or rights from you under-this License.  If your rights have been terminated and not permanently-reinstated, you do not qualify to receive new licenses for the same-material under section 10.--  9. Acceptance Not Required for Having Copies.--  You are not required to accept this License in order to receive or-run a copy of the Program.  Ancillary propagation of a covered work-occurring solely as a consequence of using peer-to-peer transmission-to receive a copy likewise does not require acceptance.  However,-nothing other than this License grants you permission to propagate or-modify any covered work.  These actions infringe copyright if you do-not accept this License.  Therefore, by modifying or propagating a-covered work, you indicate your acceptance of this License to do so.--  10. Automatic Licensing of Downstream Recipients.--  Each time you convey a covered work, the recipient automatically-receives a license from the original licensors, to run, modify and-propagate that work, subject to this License.  You are not responsible-for enforcing compliance by third parties with this License.--  An "entity transaction" is a transaction transferring control of an-organization, or substantially all assets of one, or subdividing an-organization, or merging organizations.  If propagation of a covered-work results from an entity transaction, each party to that-transaction who receives a copy of the work also receives whatever-licenses to the work the party's predecessor in interest had or could-give under the previous paragraph, plus a right to possession of the-Corresponding Source of the work from the predecessor in interest, if-the predecessor has it or can get it with reasonable efforts.--  You may not impose any further restrictions on the exercise of the-rights granted or affirmed under this License.  For example, you may-not impose a license fee, royalty, or other charge for exercise of-rights granted under this License, and you may not initiate litigation-(including a cross-claim or counterclaim in a lawsuit) alleging that-any patent claim is infringed by making, using, selling, offering for-sale, or importing the Program or any portion of it.--  11. Patents.--  A "contributor" is a copyright holder who authorizes use under this-License of the Program or a work on which the Program is based.  The-work thus licensed is called the contributor's "contributor version".--  A contributor's "essential patent claims" are all patent claims-owned or controlled by the contributor, whether already acquired or-hereafter acquired, that would be infringed by some manner, permitted-by this License, of making, using, or selling its contributor version,-but do not include claims that would be infringed only as a-consequence of further modification of the contributor version.  For-purposes of this definition, "control" includes the right to grant-patent sublicenses in a manner consistent with the requirements of-this License.--  Each contributor grants you a non-exclusive, worldwide, royalty-free-patent license under the contributor's essential patent claims, to-make, use, sell, offer for sale, import and otherwise run, modify and-propagate the contents of its contributor version.--  In the following three paragraphs, a "patent license" is any express-agreement or commitment, however denominated, not to enforce a patent-(such as an express permission to practice a patent or covenant not to-sue for patent infringement).  To "grant" such a patent license to a-party means to make such an agreement or commitment not to enforce a-patent against the party.--  If you convey a covered work, knowingly relying on a patent license,-and the Corresponding Source of the work is not available for anyone-to copy, free of charge and under the terms of this License, through a-publicly available network server or other readily accessible means,-then you must either (1) cause the Corresponding Source to be so-available, or (2) arrange to deprive yourself of the benefit of the-patent license for this particular work, or (3) arrange, in a manner-consistent with the requirements of this License, to extend the patent-license to downstream recipients.  "Knowingly relying" means you have-actual knowledge that, but for the patent license, your conveying the-covered work in a country, or your recipient's use of the covered work-in a country, would infringe one or more identifiable patents in that-country that you have reason to believe are valid.--  If, pursuant to or in connection with a single transaction or-arrangement, you convey, or propagate by procuring conveyance of, a-covered work, and grant a patent license to some of the parties-receiving the covered work authorizing them to use, propagate, modify-or convey a specific copy of the covered work, then the patent license-you grant is automatically extended to all recipients of the covered-work and works based on it.--  A patent license is "discriminatory" if it does not include within-the scope of its coverage, prohibits the exercise of, or is-conditioned on the non-exercise of one or more of the rights that are-specifically granted under this License.  You may not convey a covered-work if you are a party to an arrangement with a third party that is-in the business of distributing software, under which you make payment-to the third party based on the extent of your activity of conveying-the work, and under which the third party grants, to any of the-parties who would receive the covered work from you, a discriminatory-patent license (a) in connection with copies of the covered work-conveyed by you (or copies made from those copies), or (b) primarily-for and in connection with specific products or compilations that-contain the covered work, unless you entered into that arrangement,-or that patent license was granted, prior to 28 March 2007.--  Nothing in this License shall be construed as excluding or limiting-any implied license or other defenses to infringement that may-otherwise be available to you under applicable patent law.--  12. No Surrender of Others' Freedom.--  If conditions are imposed on you (whether by court order, agreement or-otherwise) that contradict the conditions of this License, they do not-excuse you from the conditions of this License.  If you cannot convey a-covered work so as to satisfy simultaneously your obligations under this-License and any other pertinent obligations, then as a consequence you may-not convey it at all.  For example, if you agree to terms that obligate you-to collect a royalty for further conveying from those to whom you convey-the Program, the only way you could satisfy both those terms and this-License would be to refrain entirely from conveying the Program.--  13. Use with the GNU Affero General Public License.--  Notwithstanding any other provision of this License, you have-permission to link or combine any covered work with a work licensed-under version 3 of the GNU Affero General Public License into a single-combined work, and to convey the resulting work.  The terms of this-License will continue to apply to the part which is the covered work,-but the special requirements of the GNU Affero General Public License,-section 13, concerning interaction through a network will apply to the-combination as such.--  14. Revised Versions of this License.--  The Free Software Foundation may publish revised and/or new versions of-the GNU General Public License from time to time.  Such new versions will-be similar in spirit to the present version, but may differ in detail to-address new problems or concerns.--  Each version is given a distinguishing version number.  If the-Program specifies that a certain numbered version of the GNU General-Public License "or any later version" applies to it, you have the-option of following the terms and conditions either of that numbered-version or of any later version published by the Free Software-Foundation.  If the Program does not specify a version number of the-GNU General Public License, you may choose any version ever published-by the Free Software Foundation.--  If the Program specifies that a proxy can decide which future-versions of the GNU General Public License can be used, that proxy's-public statement of acceptance of a version permanently authorizes you-to choose that version for the Program.--  Later license versions may give you additional or different-permissions.  However, no additional obligations are imposed on any-author or copyright holder as a result of your choosing to follow a-later version.--  15. Disclaimer of Warranty.--  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.--  16. Limitation of Liability.--  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF-SUCH DAMAGES.--  17. Interpretation of Sections 15 and 16.--  If the disclaimer of warranty and limitation of liability provided-above cannot be given local legal effect according to their terms,-reviewing courts shall apply local law that most closely approximates-an absolute waiver of all civil liability in connection with the-Program, unless a warranty or assumption of liability accompanies a-copy of the Program in return for a fee.--                     END OF TERMS AND CONDITIONS--            How to Apply These Terms to Your New Programs--  If you develop a new program, and you want it to be of the greatest-possible use to the public, the best way to achieve this is to make it-free software which everyone can redistribute and change under these terms.--  To do so, attach the following notices to the program.  It is safest-to attach them to the start of each source file to most effectively-state the exclusion of warranty; and each file should have at least-the "copyright" line and a pointer to where the full notice is found.--    <one line to give the program's name and a brief idea of what it does.>-    Copyright (C) <year>  <name of author>--    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-    (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/>.--Also add information on how to contact you by electronic and paper mail.--  If the program does terminal interaction, make it output a short-notice like this when it starts in an interactive mode:--    <program>  Copyright (C) <year>  <name of author>-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.-    This is free software, and you are welcome to redistribute it-    under certain conditions; type `show c' for details.--The hypothetical commands `show w' and `show c' should show the appropriate-parts of the General Public License.  Of course, your program's commands-might be different; for a GUI interface, you would use an "about box".--  You should also get your employer (if you work as a programmer) or school,-if any, to sign a "copyright disclaimer" for the program, if necessary.-For more information on this, and how to apply and follow the GNU GPL, see-<http://www.gnu.org/licenses/>.--  The GNU General Public License does not permit incorporating your program-into proprietary programs.  If your program is a subroutine library, you-may consider it more useful to permit linking proprietary applications with-the library.  If this is what you want to do, use the GNU Lesser General-Public License instead of this License.  But first, please read-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Makefile view
@@ -1,7 +1,8 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1) GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0)-PCAP_FLAGS := $(shell pcap-config --cflags pcap-config --libs)+PCAP_CONFIG ?= pcap-config+PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs) DESTDIR = PREFIX = /usr/local BINDIR = $(DESTDIR)$(PREFIX)/bin@@ -15,20 +16,23 @@ MANPAGE = bustle-pcap.1 DESKTOP_FILE = org.freedesktop.Bustle.desktop APPDATA_FILE = org.freedesktop.Bustle.appdata.xml-ICON_SIZES = 16x16 22x22 32x32 48x48 256x256 SCALABLE_ICONS = \ 	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg \+	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg \ 	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg \ 	$(NULL)-ICONS = \-	$(SCALABLE_ICONS) \-	$(foreach size,$(ICON_SIZES),data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png) \ -all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(ICONS)+all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(SCALABLE_ICONS) -BUSTLE_PCAP_SOURCES = c-sources/pcap-monitor.c c-sources/bustle-pcap.c+BUSTLE_PCAP_SOURCES = \+	c-sources/pcap-reader.c \+	c-sources/pcap-monitor.c \+	c-sources/bustle-pcap.c BUSTLE_PCAP_GENERATED_HEADERS = dist/build/autogen/version.h-BUSTLE_PCAP_HEADERS = c-sources/pcap-monitor.h $(BUSTLE_PCAP_GENERATED_HEADERS)+BUSTLE_PCAP_HEADERS = \+	c-sources/pcap-reader.h \+	c-sources/pcap-monitor.h \+	$(BUSTLE_PCAP_GENERATED_HEADERS)  bustle-pcap.1: dist/build/bustle-pcap 	help2man --output=$@ --no-info --name='Generate D-Bus logs for bustle' $<@@ -42,10 +46,7 @@ # https://github.com/flathub/flathub/wiki/Review-Guidelines validate-metadata: org.freedesktop.Bustle.desktop org.freedesktop.Bustle.appdata.xml 	desktop-file-validate org.freedesktop.Bustle.desktop-	appstream-util validate-relax org.freedesktop.Bustle.appdata.xml-	# This is only a SHOULD. Screenshots currently violate it because they-	# are hidpi.-	appstream-util validate org.freedesktop.Bustle.appdata.xml || true+	appstream-util validate org.freedesktop.Bustle.appdata.xml  dist/build/bustle-pcap: $(BUSTLE_PCAP_SOURCES) $(BUSTLE_PCAP_HEADERS) 	@mkdir -p dist/build@@ -62,18 +63,12 @@ 	echo '#define BUSTLE_VERSION "'`cat $<`'"' > $@  install: all-	mkdir -p $(BINDIR)-	cp $(BINARIES) $(BINDIR)-	-mkdir -p $(MAN1DIR)-	-cp $(MANPAGE) $(MAN1DIR)-	mkdir -p $(DATADIR)/applications-	cp $(DESKTOP_FILE) $(DATADIR)/applications-	mkdir -p $(DATADIR)/appdata-	cp $(APPDATA_FILE) $(DATADIR)/appdata-	$(foreach size,$(ICON_SIZES),mkdir -p $(DATADIR)/icons/hicolor/$(size)/apps; )-	$(foreach size,$(ICON_SIZES),cp data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png $(DATADIR)/icons/hicolor/$(size)/apps; )-	mkdir -p $(DATADIR)/icons/hicolor/scalable/apps-	cp $(SCALABLE_ICONS) $(DATADIR)/icons/hicolor/scalable/apps+	install -D -t $(BINDIR) $(BINARIES)+	-install -Dt $(MAN1DIR) $(MANPAGE)+	-install -Dt $(MAN1DIR) $(MANPAGE)+	install -Dt $(DATADIR)/applications $(DESKTOP_FILE)+	install -Dt $(DATADIR)/appdata $(APPDATA_FILE)+	install -Dt $(DATADIR)/icons/hicolor/scalable/apps $(SCALABLE_ICONS) 	$(MAKE) update-icon-cache  uninstall:@@ -81,7 +76,8 @@ 	rm -f $(MAN1DIR)/$(MANPAGE) 	rm -f $(DATADIR)/applications/$(DESKTOP_FILE) 	rm -f $(DATADIR)/appdata/$(APPDATA_FILE)-	$(foreach size,$(ICON_SIZES),rm -f $(DATADIR)/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png)+	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg+	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg 	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg 	$(MAKE) update-icon-cache
NEWS.md view
@@ -1,3 +1,19 @@+Bustle 0.8.0 (2020-07-31)+-------------------------++Bustle has a new icon, kindly provided by Tobias Bernard.++Closing a window without saving a recorded log no longer prompts for+confirmation. Anecdotally, most users just want to record and read logs, not+save them.++Bustle now uses GLib's implementation of the D-Bus wire protocol throughout.+The only user-facing consequence is that message bodies are now pretty-printed+in the GVariant text format.++Since Bustle no longer depends on any GPL libraries, the project license has+been simplified to plain LGPL 2.1 or later.+ Bustle 0.7.5 (2019-03-08) -------------------------
Setup.hs view
@@ -1,4 +1,8 @@+{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -Wall #-}++#if defined(VERSION_hgettext)+ import System.FilePath ( (</>), (<.>) )  import Distribution.PackageDescription@@ -92,3 +96,12 @@     tar = GetText.targetDataDir lbi  -- Cargo-culted from hgettext++#else++import Distribution.Simple++main :: IO ()+main = defaultMain++#endif
Test/Renderer.hs view
@@ -13,10 +13,10 @@ import Data.Monoid import Data.List import System.Exit (exitFailure)-import DBus (objectPath_, busName_, ReceivedMessage(ReceivedMethodReturn), firstSerial, methodReturn)  import Bustle.Types import Bustle.Renderer+import Bustle.GDBusMessage  main :: IO () main = defaultMain tests@@ -39,9 +39,18 @@ -- disconnect from the bus before the end of the log. This is a regression test -- for a bug I almost introduced. activeService = UniqueName ":1.1"-dummyReceivedMessage = ReceivedMethodReturn firstSerial (methodReturn firstSerial)-swaddle messages timestamps = map (\(e, ts) -> Detailed ts e 0 dummyReceivedMessage)-                                  (zip messages timestamps)+dummyReceivedMessage :: IO GDBusMessage+dummyReceivedMessage = messageNewSignal o i m+  where+    o = objectPath_ "/"+    i = interfaceName_ "com.example"+    m = memberName_ "Signal"++swaddle :: [Event] -> [Microseconds] -> IO [DetailedEvent]+swaddle messages timestamps = forM (zip messages timestamps) $ \(e, ts) -> do+    m <- dummyReceivedMessage+    return $ Detailed ts e 0 m+ sessionLogWithoutDisconnect =     [ NOCEvent $ Connected activeService     , MessageEvent $ Signal (U activeService) Nothing $ Member (objectPath_ "/") Nothing "Hello"@@ -49,10 +58,12 @@ sessionLogWithDisconnect = sessionLogWithoutDisconnect ++ [ NOCEvent $ Disconnected activeService ] expectedParticipants = [ (activeService, Set.empty) ] -test_ l expected = expected @=? ps-  where-    rr = process (swaddle l [1..]) []-    ps = sessionParticipants (rrApplications rr)+-- test_ :: a -> b -> Assertion+test_ l expected = do+    events <- swaddle l [1..]+    let rr = process events []+    let ps = sessionParticipants (rrApplications rr)+    expected @=? ps  test_participants = test_ sessionLogWithoutDisconnect expectedParticipants test_participants_with_disconnect = test_ sessionLogWithDisconnect expectedParticipants@@ -73,7 +84,10 @@           ++ map (\o -> NOCEvent (NameChanged o (Claimed u2))) os ++           [ MessageEvent $ MethodCall 0 (U u1) (O (head os)) m ] +sessionLog :: IO [DetailedEvent] sessionLog = swaddle bareLog [1,3..]++systemLog :: IO [DetailedEvent] systemLog  = swaddle bareLog [2,4..]  test_incremental_simple :: (Show b, Eq b)@@ -100,13 +114,19 @@                     -> Assertion                     )                  -> Assertion-test_incremental f = f fullRR incrementalRR+test_incremental f = do+    events <- sessionLog+    let full = fullRR events+    let incremental = incrementalRR events+    f full incremental  -- TODO: it should be possible to make this work for side-by-side logs too. -- Currently it doesn't seem to...-fullRR, incrementalRR :: RendererResult Participants-fullRR = process sessionLog []-incrementalRR = mconcat rrs+fullRR, incrementalRR :: [DetailedEvent]+                      -> RendererResult Participants+fullRR events = process events []++incrementalRR events = mconcat rrs   where     processOne m = state $ processSome [m] []-    (rrs, _) = runState (mapM processOne sessionLog) rendererStateNew+    (rrs, _) = runState (mapM processOne events) rendererStateNew
Test/data/log-with-h.bustle view

binary file changed (39595 → 39595 bytes)

bustle.cabal view
@@ -1,11 +1,11 @@+Cabal-Version:  2.2 Name:           bustle Category:       Network, Desktop-Version:        0.7.5-Cabal-Version:  2.0+Version:        0.8.0 Tested-With:    GHC == 8.4.3 Synopsis:       Draw sequence diagrams of D-Bus traffic Description:    Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn't performing as well as you like.  It also provides statistics like signal frequencies and average method call times.-License:        OtherLicense+License:        LGPL-2.1-or-later License-file:   LICENSE Author:         Will Thompson <will@willthompson.co.uk> Maintainer:     Will Thompson <will@willthompson.co.uk>@@ -19,6 +19,7 @@ Extra-source-files:                   -- C bits                     c-sources/bustle-pcap.c,+                    c-sources/pcap-reader.h,                     c-sources/pcap-monitor.h,                     c-sources/config.h,                     Makefile,@@ -28,6 +29,7 @@                     NEWS.md,                     CONTRIBUTING.md,                     INSTALL.md,+                    bustle.doap,                     run-uninstalled.sh                   , Test/data/log-with-h.bustle @@ -43,12 +45,8 @@                   , data/org.freedesktop.Bustle.desktop.in                    -- icons-                  , data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png-                  , data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png-                  , data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png-                  , data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png-                  , data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png                   , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg+                  , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg                   , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg  x-gettext-po-files:     po/*.po@@ -68,7 +66,7 @@  Flag hgettext   Description:    Enable translations. Since there are no translations this is currently rather pointless.-  Default:        True+  Default:        False  Flag InteractiveTests   Description:    Build interactive test programs@@ -82,12 +80,15 @@   Main-is:       Bustle.hs   Other-modules: Bustle.Application.Monad                , Bustle.Diagram+               , Bustle.GDBusMessage+               , Bustle.GVariant                , Bustle.Loader                , Bustle.Loader.Pcap                , Bustle.Marquee                , Bustle.Missing                , Bustle.Monitor                , Bustle.Noninteractive+               , Bustle.Reader                , Bustle.Regions                , Bustle.Renderer                , Bustle.StatisticsPane@@ -103,7 +104,6 @@                , Bustle.UI.RecordAddressDialog                , Bustle.UI.Recorder                , Bustle.Util-               , Bustle.VariantFormatter                , Paths_bustle   autogen-modules: Paths_bustle   default-language: Haskell2010@@ -111,15 +111,16 @@                -fno-warn-unused-do-bind   if flag(threaded)     ghc-options: -threaded-  C-sources: c-sources/pcap-monitor.c+  C-sources: c-sources/pcap-reader.c+           , c-sources/pcap-monitor.c   cc-options: -fPIC -g+  extra-libraries: pcap   pkgconfig-depends: glib-2.0 >= 2.54,                      gio-unix-2.0   Build-Depends: base >= 4.11 && < 5                , bytestring                , cairo                , containers-               , dbus >= 0.10                , directory                , filepath                , glib@@ -127,10 +128,10 @@                , gtk3                , mtl >= 2.2.1                , pango-               , pcap                , process                , text                , time+               , transformers   if flag(hgettext)     Build-Depends: hgettext >= 0.1.5                  , setlocale@@ -153,10 +154,9 @@   Build-Depends: base                , bytestring                , containers-               , dbus >= 0.10                , mtl-               , pcap                , text+               , transformers    if flag(hgettext)       Build-Depends: hgettext >= 0.1.5@@ -172,17 +172,24 @@ Test-suite test-pcap-crash     type: exitcode-stdio-1.0     main-is: Test/PcapCrash.hs-    other-modules: Bustle.Loader.Pcap+    other-modules: Bustle.GDBusMessage+                 , Bustle.GVariant+                 , Bustle.Loader.Pcap+                 , Bustle.Reader                  , Bustle.Translation                  , Bustle.Types     default-language: Haskell2010     Build-Depends: base                  , bytestring                  , containers-                 , dbus >= 0.10+                 , glib                  , mtl-                 , pcap                  , text+                 , transformers+    C-sources: c-sources/pcap-reader.c+    pkgconfig-depends: glib-2.0 >= 2.54,+                       gio-unix-2.0+    extra-libraries: pcap     if flag(hgettext)         Build-Depends: hgettext >= 0.1.5                      , setlocale@@ -206,6 +213,8 @@     type: exitcode-stdio-1.0     main-is: Test/Renderer.hs     other-modules: Bustle.Diagram+                 , Bustle.GDBusMessage+                 , Bustle.GVariant                  , Bustle.Marquee                  , Bustle.Regions                  , Bustle.Renderer@@ -213,21 +222,20 @@                  , Bustle.Types                  , Bustle.Util --     default-language: Haskell2010     Build-Depends: base                  , cairo                  , containers-                 , dbus >= 0.10                  , directory                  , filepath+                 , glib                  , gtk3                  , mtl                  , text                  , pango                  , test-framework                  , test-framework-hunit+                 , transformers                  , HUnit     if flag(hgettext)         Build-Depends: hgettext >= 0.1.5
+ bustle.doap view
@@ -0,0 +1,23 @@+<?xml version="1.0"?>+<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:foaf="http://xmlns.com/foaf/0.1/" xmlns:gnome="http://api.gnome.org/doap-extensions#" xmlns="http://usefulinc.com/ns/doap#">+  <name xml:lang="en">Bustle</name>+  <shortdesc xml:lang="en">Draw sequence diagrams of D-Bus activity</shortdesc>+  <description xml:lang="en">Bustle draws sequence diagrams of D-Bus activity.+    It shows signal emissions, method calls and their corresponding returns, with+    time stamps for each individual event and the duration of each method call.+    This can help you check for unwanted D-Bus traffic, and pinpoint why your+    D-Bus-based application is not performing as well as you like. It also+    provides statistics like signal frequencies and average method call+    times.</description>+  <download-page rdf:resource="https://www.freedesktop.org/software/bustle/"/>+  <bug-database rdf:resource="https://gitlab.freedesktop.org/bustle/bustle/issues"/>+  <category rdf:resource="http://api.gnome.org/doap-extensions#development"/>+  <programming-language>Haskell</programming-language>+  <maintainer>+    <foaf:Person>+      <foaf:name>Will Thompson</foaf:name>+      <foaf:mbox rdf:resource="mailto:will@willthompson.co.uk"/>+      <gnome:userid>wjt</gnome:userid>+    </foaf:Person>+  </maintainer>+</Project>
c-sources/bustle-pcap.c view
@@ -181,20 +181,14 @@     glong usec,     guint8 *data,     guint len,+    GDBusMessage *message,     gpointer user_data) {-  g_autoptr(GError) error = NULL;-  g_autoptr(GDBusMessage) message = g_dbus_message_new_from_blob (-      data, len, G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING, &error);--  if (message == NULL)-    g_warning ("%s", error->message);-  else-    g_print ("%s -> %s: %d %s\n",-        g_dbus_message_get_sender (message),-        g_dbus_message_get_destination (message),-        g_dbus_message_get_message_type (message),-        g_dbus_message_get_member (message));+  g_print ("%s -> %s: %d %s\n",+      g_dbus_message_get_sender (message),+      g_dbus_message_get_destination (message),+      g_dbus_message_get_message_type (message),+      g_dbus_message_get_member (message)); }  static void
c-sources/config.h view
@@ -19,7 +19,7 @@ #ifndef BUSTLE_CONFIG_H #define BUSTLE_CONFIG_H -#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_54-#define GLIB_VERSION_MAX_ALLOWED  GLIB_VERSION_2_54+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56+#define GLIB_VERSION_MAX_ALLOWED  GLIB_VERSION_2_56  #endif /* BUSTLE_CONFIG_H */
c-sources/pcap-monitor.c view
@@ -31,13 +31,13 @@ #include <sys/stat.h> #include <sys/types.h> -#include <pcap/pcap.h>- #include <glib.h> #include <glib/gstdio.h> #include <gio/gunixinputstream.h> +#include "pcap-reader.h" + /* Prefix of name claimed by the connection that collects name owners. */ const char *BUSTLE_MONITOR_NAME_PREFIX = "org.freedesktop.Bustle.Monitor."; static gboolean RUNNING_IN_FLATPAK = FALSE;@@ -99,13 +99,12 @@     GSubprocess *dbus_monitor;     /* If >= 0, master side of controlling terminal for dbus_monitor */     int pt_master;-    GSource *dbus_monitor_source;-    pcap_t *pcap_in;+    GSubprocess *tee_proc;+    GSource *tee_source;+    BustlePcapReader *reader;      /* output */     gchar *filename;-    pcap_t *pcap_out;-    pcap_dumper_t *dumper;      /* errors */     GError *pcap_error;@@ -206,16 +205,6 @@ }  static void-close_dump (BustlePcapMonitor *self)-{-  if (self->dumper != NULL)-    pcap_dump_flush (self->dumper);--  g_clear_pointer (&self->dumper, pcap_dump_close);-  g_clear_pointer (&self->pcap_out, pcap_close);-}--static void bustle_pcap_monitor_dispose (GObject *object) {   BustlePcapMonitor *self = BUSTLE_PCAP_MONITOR (object);@@ -229,12 +218,11 @@     }    g_clear_object (&self->cancellable);-  g_clear_pointer (&self->dbus_monitor_source, g_source_destroy);-  g_clear_pointer (&self->pcap_in, pcap_close);+  g_clear_pointer (&self->tee_source, g_source_destroy);+  g_clear_object (&self->tee_proc);+  g_clear_object (&self->reader);   g_clear_object (&self->dbus_monitor); -  close_dump (self);-   if (parent_class->dispose != NULL)     parent_class->dispose (object); }@@ -300,15 +288,17 @@    *  #GValue.)    * @blob: an array of bytes containing the serialized message.    * @length: the size in bytes of @blob.+   * @message: @blob as a #GDBusMessage.    */   signals[SIG_MESSAGE_LOGGED] = g_signal_new ("message-logged",       BUSTLE_TYPE_PCAP_MONITOR, G_SIGNAL_RUN_FIRST,       0, NULL, NULL,-      NULL, G_TYPE_NONE, 4,+      NULL, G_TYPE_NONE, 5,       G_TYPE_LONG,       G_TYPE_LONG,       G_TYPE_POINTER,-      G_TYPE_UINT);+      G_TYPE_UINT,+      G_TYPE_DBUS_MESSAGE);    /**    * BustlePcapMonitor::stopped:@@ -405,7 +395,6 @@     }    self->state = STATE_STOPPED;-  close_dump (self);    g_debug ("%s: emitting ::stopped(%s, %d, %s)", G_STRFUNC,            g_quark_to_string (error->domain), error->code, error->message);@@ -652,9 +641,8 @@   GInputStream *stdout_pipe = NULL;   gint stdout_fd = -1;   FILE *dbus_monitor_filep = NULL;-  char errbuf[PCAP_ERRBUF_SIZE] = {0}; -  stdout_pipe = g_subprocess_get_stdout_pipe (self->dbus_monitor);+  stdout_pipe = g_subprocess_get_stdout_pipe (self->tee_proc);   g_return_val_if_fail (stdout_pipe != NULL, FALSE);    stdout_fd = g_unix_input_stream_get_fd (G_UNIX_INPUT_STREAM (stdout_pipe));@@ -674,24 +662,17 @@    * fread(). It's safe to do this on the main thread, since we know the pipe    * is readable. On short read, pcap_fopen_offline() fails immediately.    */-  self->pcap_in = pcap_fopen_offline (dbus_monitor_filep, errbuf);-  if (self->pcap_in == NULL)+  self->reader = bustle_pcap_reader_fopen (g_steal_pointer (&dbus_monitor_filep), error);+  if (self->reader == NULL)     {-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,-                   "Couldn't read messages from dbus-monitor: %s",-                   errbuf);--      /* Cause dbus-monitor to exit next time it tries to write a message */-      g_clear_pointer (&dbus_monitor_filep, fclose);+      g_prefix_error (error, "Couldn't read messages from dbus-monitor: "); -      /* And try to terminate it immediately. */+      /* Try to terminate dbus-monitor immediately. The reader closes the FILE * on error. */       send_sigint (self);        return FALSE;     } -  /* pcap_close() will call fclose() on the FILE * passed to-   * pcap_fopen_offline() */   dump_names_async (self);   self->state = STATE_RUNNING;   return TRUE;@@ -702,35 +683,28 @@     BustlePcapMonitor *self,     GError **error) {-  struct pcap_pkthdr *hdr;+  glong sec, usec;   const guchar *blob;-  int ret;+  guint length;+  g_autoptr(GDBusMessage) message = NULL; -  ret = pcap_next_ex (self->pcap_in, &hdr, &blob);-  switch (ret)+  if (!bustle_pcap_reader_read_one (self->reader, &sec, &usec, &blob, &length, &message, error))     {-      case 1:-        g_signal_emit (self, signals[SIG_MESSAGE_LOGGED], 0,-            hdr->ts.tv_sec, hdr->ts.tv_usec, blob, hdr->caplen);--        /* cast necessary because pcap_dump has a type matching the callback-         * argument to pcap_loop()-         * TODO don't block-         */-        pcap_dump ((u_char *) self->dumper, hdr, blob);-        return TRUE;--      case -2:-        /* EOF; shouldn't happen since we waited for the FD to be readable */-        g_set_error (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED,-            "EOF when reading from dbus-monitor");-        return FALSE;+      return FALSE;+    }+  else if (message == NULL)+    {+      /* EOF; shouldn't happen since we waited for the FD to be readable */+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED,+          "EOF when reading from dbus-monitor");+      return FALSE;+    }+  else+    {+      g_signal_emit (self, signals[SIG_MESSAGE_LOGGED], 0,+          sec, usec, blob, length, message); -      default:-        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,-            "Error %i reading dbus-monitor stream: %s",-            ret, pcap_geterr (self->pcap_in));-        return FALSE;+      return TRUE;     } } @@ -824,7 +798,7 @@   /* Closes the stream; should cause dbus-monitor to quit in due course when it    * tries to write to the other end of the pipe.    */-  g_clear_pointer (&self->pcap_in, pcap_close);+  bustle_pcap_reader_close (self->reader);    /* And try to terminate it immediately. */   send_sigint (self);@@ -931,6 +905,27 @@   return child; } +static GSubprocess *+spawn_tee (BustlePcapMonitor  *self,+           GError            **error)+{+  g_autoptr(GSubprocessLauncher) launcher =+    g_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE);+  GInputStream *stdout_pipe = NULL;+  gint stdout_fd = -1;++  stdout_pipe = g_subprocess_get_stdout_pipe (self->dbus_monitor);+  g_return_val_if_fail (stdout_pipe != NULL, FALSE);++  stdout_fd = g_unix_input_stream_get_fd (G_UNIX_INPUT_STREAM (stdout_pipe));+  g_return_val_if_fail (stdout_fd >= 0, FALSE);++  g_subprocess_launcher_take_stdin_fd (launcher, stdout_fd);++  return g_subprocess_launcher_spawn (launcher, error,+                                      "tee", self->filename, NULL);+}+ static gboolean initable_init (     GInitable *initable,@@ -957,36 +952,24 @@                            G_CALLBACK (cancellable_cancelled_cb),                            self, NULL); -  self->pcap_out = pcap_open_dead (DLT_DBUS, 1 << 27);-  if (self->pcap_out == NULL)-    {-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,-          "pcap_open_dead failed. wtf");-      return FALSE;-    }--  self->dumper = pcap_dump_open (self->pcap_out, self->filename);-  if (self->dumper == NULL)-    {-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,-          "Couldn't open target file %s", pcap_geterr (self->pcap_out));-      return FALSE;-    }-   self->dbus_monitor = spawn_monitor (self, (const char * const *) argv, error);   if (self->dbus_monitor == NULL)     return FALSE; -  stdout_pipe = g_subprocess_get_stdout_pipe (self->dbus_monitor);+  self->tee_proc = spawn_tee (self, error);+  if (self->tee_proc == NULL)+    return FALSE;++  stdout_pipe = g_subprocess_get_stdout_pipe (self->tee_proc);   g_return_val_if_fail (stdout_pipe != NULL, FALSE);   g_return_val_if_fail (G_IS_POLLABLE_INPUT_STREAM (stdout_pipe), FALSE);   g_return_val_if_fail (G_IS_UNIX_INPUT_STREAM (stdout_pipe), FALSE); -  self->dbus_monitor_source = g_pollable_input_stream_create_source (+  self->tee_source = g_pollable_input_stream_create_source (       G_POLLABLE_INPUT_STREAM (stdout_pipe), self->cancellable);-  g_source_set_callback (self->dbus_monitor_source,+  g_source_set_callback (self->tee_source,       (GSourceFunc) dbus_monitor_readable, self, NULL);-  g_source_attach (self->dbus_monitor_source, NULL);+  g_source_attach (self->tee_source, NULL);    g_subprocess_wait_check_async (       self->dbus_monitor,
+ c-sources/pcap-reader.c view
@@ -0,0 +1,307 @@+/*+ * pcap-reader.c - reads DBus messages from a pcap stream+ * Copyright © 2011–2012  Collabora Ltd.+ * Copyright © 2018–2020 Will Thompson+ *+ * This library is free software; you can redistribute it and/or+ * modify it under the terms of the GNU Lesser General Public+ * License as published by the Free Software Foundation; either+ * version 2.1 of the License, or (at your option) any later version.+ *+ * This library 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+ * Lesser General Public License for more details.+ *+ * You should have received a copy of the GNU Lesser General Public+ * License along with this library; if not, write to the Free Software+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA+ */++#define _GNU_SOURCE++#include "config.h"+#include "pcap-reader.h"++#include <errno.h>+#include <fcntl.h>+#include <signal.h>+#include <string.h>+#include <sys/ioctl.h>+#include <sys/stat.h>+#include <sys/types.h>++#include <pcap/pcap.h>++typedef struct _BustlePcapReader {+    GObject parent;++    gchar *filename;+    FILE *filep;++    pcap_t *pcap_in;+} BustlePcapReader;++typedef enum {+    PROP_FILENAME = 1,+    PROP_FILEP+} BustlePcapReaderProp;++static void initable_iface_init (+    gpointer g_class,+    gpointer unused);++G_DEFINE_TYPE_WITH_CODE (BustlePcapReader, bustle_pcap_reader, G_TYPE_OBJECT,+    G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init);+    )++/* A sad echo of the functions in libglnx. */+static inline void *+throw_errno (GError **error,+             const gchar *prefix)+{+  int errsv = errno;+  g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),+               "%s: %s", prefix, g_strerror (errsv));+  return NULL;+}++static void+bustle_pcap_reader_init (BustlePcapReader *self)+{+}++static void+bustle_pcap_reader_set_property (+    GObject *object,+    guint property_id,+    const GValue *value,+    GParamSpec *pspec)+{+  BustlePcapReader *self = BUSTLE_PCAP_READER (object);++  switch ((BustlePcapReaderProp) property_id)+    {+      case PROP_FILENAME:+        self->filename = g_value_dup_string (value);+        break;+      case PROP_FILEP:+        self->filep = g_value_get_pointer (value);+        break;+      default:+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);+    }+}++static void+bustle_pcap_reader_finalize (GObject *object)+{+  BustlePcapReader *self = BUSTLE_PCAP_READER (object);+  GObjectClass *parent_class = bustle_pcap_reader_parent_class;++  g_clear_pointer (&self->filename, g_free);+  g_clear_pointer (&self->filep, fclose);+  g_clear_pointer (&self->pcap_in, pcap_close);++  if (parent_class->finalize != NULL)+    parent_class->finalize (object);+}++static void+bustle_pcap_reader_class_init (BustlePcapReaderClass *klass)+{+  GObjectClass *object_class = G_OBJECT_CLASS (klass);+  GParamSpec *param_spec;++  object_class->set_property = bustle_pcap_reader_set_property;+  object_class->finalize = bustle_pcap_reader_finalize;++  param_spec = g_param_spec_string ("filename", "Filename",+                                    "Path to pcap file to read",+                                    NULL,+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);+  g_object_class_install_property (object_class, PROP_FILENAME, param_spec);++  param_spec = g_param_spec_pointer ("filep", "FILE *",+                                    "FILE * to read pcap stream from",+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS);+  g_object_class_install_property (object_class, PROP_FILEP, param_spec);+}++/**+ * bustle_pcap_reader_read_one:+ * @self:+ * @hdr: (out) (transfer none): location to store pcap header (or %NULL on EOF)+ * @blob: (out) (transfer none): location to store raw message (or %NULL on EOF)+ * @message: (out) (transfer full): location to store parsed message (or %NULL on EOF)+ * @error:+ *+ * Returns: %FALSE on error; %TRUE on success or end-of-file.+ */+gboolean+bustle_pcap_reader_read_one (BustlePcapReader  *self,+                             glong             *sec,+                             glong             *usec,+                             const guchar     **blob,+                             guint             *length,+                             GDBusMessage     **message,+                             GError           **error)+{+  struct pcap_pkthdr *hdr;+  int ret;++  g_return_val_if_fail (BUSTLE_IS_PCAP_READER (self), FALSE);+  g_return_val_if_fail (sec != NULL, FALSE);+  g_return_val_if_fail (usec != NULL, FALSE);+  g_return_val_if_fail (blob != NULL, FALSE);+  g_return_val_if_fail (length != NULL, FALSE);+  g_return_val_if_fail (message == NULL || *message == NULL, FALSE);+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);++  if (self->pcap_in == NULL)+    {+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED, "Already closed");+      return FALSE;+    }++  ret = pcap_next_ex (self->pcap_in, &hdr, blob);+  switch (ret)+    {+      case 1:+        if (message != NULL)+          {+            *message = g_dbus_message_new_from_blob ((guchar *) *blob, hdr->caplen, G_DBUS_CAPABILITY_FLAGS_UNIX_FD_PASSING, error);+            if (*message == NULL)+              {+                g_prefix_error (error, "Error while parsing message from dbus-monitor: ");+                return FALSE;+              }+          }++        *sec = hdr->ts.tv_sec;+        *usec = hdr->ts.tv_usec;+        *length = hdr->caplen;+        return TRUE;++      case -2:+        /* EOF */+        *sec = 0;+        *usec = 0;+        *blob = NULL;+        *length = 0;+        if (message != NULL)+          *message = NULL;+        return TRUE;++      default:+        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,+            "Error %i reading dbus-monitor stream: %s",+            ret, pcap_geterr (self->pcap_in));+        return FALSE;+    }+}+++/**+ * bustle_pcap_reader_close:+ * @self: a #BustlePcapReader+ *+ * Closes the underlying file or stream.+ *+ * If @self is reading from a pipe to `dbus-monitor`, this will cause+ * `dbus-monitor` to quit in due course when it next tries to write to the+ * pipe.+ */+void+bustle_pcap_reader_close (BustlePcapReader *self)+{+  g_return_if_fail (BUSTLE_IS_PCAP_READER (self));++  g_clear_pointer (&self->pcap_in, pcap_close);+  g_clear_pointer (&self->filep, fclose);+}++static gboolean+initable_init (+    GInitable *initable,+    GCancellable *cancellable,+    GError **error)+{+  BustlePcapReader *self = BUSTLE_PCAP_READER (initable);+  char errbuf[PCAP_ERRBUF_SIZE] = {0};++  g_return_val_if_fail ((self->filename == NULL) ^ (self->filep == NULL),+                        FALSE);++  if (self->filename != NULL)+    {+      self->pcap_in = pcap_open_offline (self->filename, errbuf);+    }+  else /* self->filep != NULL */+    {+      self->pcap_in = pcap_fopen_offline (self->filep, errbuf);+    }++  if (self->pcap_in == NULL)+    {+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, errbuf);+      return FALSE;+    }++  /* Now owned by pcap_in */+  self->filep = NULL;++  int dlt = pcap_datalink (self->pcap_in);+  if (dlt != DLT_DBUS)+    {+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,+                   "Unexpected link type %s",+                   pcap_datalink_val_to_name (dlt));+      bustle_pcap_reader_close (self);+      return FALSE;+    }++  return TRUE;+}++static void+initable_iface_init (+    gpointer g_class,+    gpointer unused)+{+  GInitableIface *iface = g_class;++  iface->init = initable_init;+}++BustlePcapReader *+bustle_pcap_reader_open (const gchar *filename,+                         GError **error)+{+  g_return_val_if_fail (filename != NULL, NULL);+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);++  return g_initable_new (+      BUSTLE_TYPE_PCAP_READER, NULL, error,+      "filename", filename,+      NULL);+}++/**+ * bustle_pcap_reader_fopen:+ * @filep: (transfer full):+ *+ * Returns: a reader, or %NULL on error+ */+BustlePcapReader *+bustle_pcap_reader_fopen (FILE *filep,+                          GError **error)+{+  g_return_val_if_fail (filep != NULL, NULL);+  g_return_val_if_fail (error == NULL || *error == NULL, NULL);++  return g_initable_new (+      BUSTLE_TYPE_PCAP_READER, NULL, error,+      "filep", filep,+      NULL);+}
+ c-sources/pcap-reader.h view
@@ -0,0 +1,43 @@+/*+ * pcap-reader.h - reads DBus messages from a pcap stream+ * Copyright © 2011–2012  Collabora Ltd.+ * Copyright © 2018–2020 Will Thompson+ *+ * This library is free software; you can redistribute it and/or+ * modify it under the terms of the GNU Lesser General Public+ * License as published by the Free Software Foundation; either+ * version 2.1 of the License, or (at your option) any later version.+ *+ * This library 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+ * Lesser General Public License for more details.+ *+ * You should have received a copy of the GNU Lesser General Public+ * License along with this library; if not, write to the Free Software+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA+ */++#pragma once++#include <glib/gstdio.h>+#include <glib-object.h>+#include <gio/gio.h>+#include <pcap/pcap.h>++#define BUSTLE_TYPE_PCAP_READER bustle_pcap_reader_get_type ()+G_DECLARE_FINAL_TYPE (BustlePcapReader, bustle_pcap_reader, BUSTLE, PCAP_READER, GObject)++BustlePcapReader *bustle_pcap_reader_open     (const gchar       *filename,+                                               GError           **error);+BustlePcapReader *bustle_pcap_reader_fopen    (FILE              *filep,+                                               GError           **error);+gboolean          bustle_pcap_reader_read_one (BustlePcapReader  *self,+                                               glong             *sec,+                                               glong             *usec,+                                               const guchar     **blob,+                                               guint             *length,+                                               GDBusMessage     **message,+                                               GError           **error);+void              bustle_pcap_reader_close    (BustlePcapReader  *self);+
− data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png

binary file changed (519 → absent bytes)

− data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png

binary file changed (716 → absent bytes)

− data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png

binary file changed (8774 → absent bytes)

− data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png

binary file changed (1049 → absent bytes)

− data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png

binary file changed (1669 → absent bytes)

data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg view
@@ -1,109 +1,16 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!-- Created with Inkscape (http://www.inkscape.org/) -->--<svg-   xmlns:dc="http://purl.org/dc/elements/1.1/"-   xmlns:cc="http://creativecommons.org/ns#"-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"-   xmlns:svg="http://www.w3.org/2000/svg"-   xmlns="http://www.w3.org/2000/svg"-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"-   width="256"-   height="256"-   id="svg2"-   version="1.1"-   inkscape:version="0.92.4 5da689c313, 2019-01-14"-   sodipodi:docname="org.freedesktop.Bustle-symbolic.svg">-  <defs-     id="defs4" />-  <sodipodi:namedview-     id="base"-     pagecolor="#ffffff"-     bordercolor="#666666"-     borderopacity="1.0"-     inkscape:pageopacity="0.0"-     inkscape:pageshadow="2"-     inkscape:zoom="9.6796875"-     inkscape:cx="128"-     inkscape:cy="93.172193"-     inkscape:document-units="px"-     inkscape:current-layer="layer1"-     showgrid="false"-     inkscape:window-width="3200"-     inkscape:window-height="1671"-     inkscape:window-x="0"-     inkscape:window-y="55"-     inkscape:window-maximized="1"-     fit-margin-top="0"-     fit-margin-left="0"-     fit-margin-right="0"-     fit-margin-bottom="0"-     showguides="true"-     inkscape:guide-bbox="true">-    <inkscape:grid-       type="xygrid"-       id="grid3834"-       empspacing="5"-       visible="true"-       enabled="true"-       snapvisiblegridlinesonly="true"-       originx="-228.94108"-       originy="-779.84559"-       spacingx="1"-       spacingy="1" />-  </sodipodi:namedview>-  <metadata-     id="metadata7">-    <rdf:RDF>-      <cc:Work-         rdf:about="">-        <dc:format>image/svg+xml</dc:format>-        <dc:type-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />-        <dc:title></dc:title>-      </cc:Work>-    </rdf:RDF>-  </metadata>-  <g-     inkscape:label="Layer 1"-     inkscape:groupmode="layer"-     id="layer1"-     transform="translate(-228.94108,-16.516576)">-    <g-       id="g1404"-       transform="matrix(0.42666667,0,0,0.42666667,204.64622,21.983358)">-      <path-         inkscape:connector-curvature="0"-         id="path4626"-         d="m 349.58008,-12.728516 c -19.78034,0.499891 -39.51808,2.890348 -58.82031,7.2539096 4.10872,18.8723954 8.21745,37.7447914 12.32617,56.6171874 33.74925,-7.665785 69.12626,-7.971229 103.02539,-1.0293 3.71633,-18.821141 8.65912,-38.435398 11.61328,-56.7636714 -22.39128,-4.5980686 -45.29405,-6.6135646 -68.14453,-6.0781256 z m 105.80078,78.716797 c 31.47813,14.008295 59.87299,34.867319 82.70703,60.664059 14.44727,-12.81901 28.89453,-25.63802 43.3418,-38.457028 C 553.05494,56.141376 517.74279,30.253699 478.60547,12.900391 470.86393,30.596354 463.1224,48.292318 455.38086,65.988281 Z M 227.18164,16.626953 C 189.51961,34.723972 155.71119,60.77538 128.625,92.591797 c 14.7487,12.470703 29.49739,24.941413 44.24609,37.412113 22.37137,-26.20404 50.37565,-47.593699 81.60157,-62.169926 -8.17123,-17.501302 -16.34245,-35.002604 -24.51368,-52.503906 -0.92578,0.432292 -1.85156,0.864583 -2.77734,1.296875 z M 568.0293,168.66016 c 16.99699,30.09909 27.33124,63.91871 30.12695,98.36914 19.23893,-1.70833 38.47787,-3.41667 57.7168,-5.125 -3.5014,-42.55686 -16.29754,-84.32012 -37.26568,-121.51953 -16.85936,9.42513 -33.71871,18.85026 -50.57807,28.27539 z M 89.939453,150.27539 c -18.701268,36.38678 -29.811885,76.6502 -32.357428,117.48438 19.276042,1.22135 38.552083,2.44271 57.828125,3.66406 2.15345,-34.4883 11.88032,-68.47463 28.29492,-98.88281 -17.08268,-9.01302 -34.16536,-18.02605 -51.248045,-27.03907 -0.839191,1.59115 -1.678381,3.18229 -2.517572,4.77344 z"-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:57.94400024;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:115.88800049, 57.94400024;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />-      <circle-         transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"-         cy="433.79074"-         cx="381.42856"-         id="path2985-7"-         style="fill:none;stroke:#bebebe;stroke-width:75.08624268;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"-         r="0" />-      <path-         sodipodi:nodetypes="cccccccc"-         inkscape:connector-curvature="0"-         id="path3757-7"-         transform="translate(56.941089,-12.819102)"-         d="m 430,220 30,55 h -85 v 50 h 85 l -30,55 170,-80 z"-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />-      <path-         sodipodi:nodetypes="cccccccc"-         inkscape:connector-curvature="0"-         id="path3761-7"-         transform="translate(56.941089,-12.819102)"-         d="M 170,220 0,300 170,380 140,325 h 85 v -50 h -85 z"-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />-      <path-         inkscape:connector-curvature="0"-         id="path4619"-         d="m 356.94141,187.18164 c -55.02475,0 -100.00001,44.97526 -100,100 -1e-5,55.02475 44.97525,100 100,100 55.02475,0 100,-44.97525 100,-100 0,-55.02475 -44.97525,-100 -100,-100 z m 0,34.39844 c 36.43357,0 65.59961,29.168 65.59961,65.60156 0,36.43356 -29.16604,65.59961 -65.59961,65.59961 -36.43357,0 -65.59961,-29.16605 -65.59961,-65.59961 0,-36.43356 29.16604,-65.60156 65.59961,-65.60156 z"-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:34.40008163;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:94.40000153;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />-    </g>-  </g>+<?xml version="1.0" encoding="UTF-8"?>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" viewBox="0 0 16 16" version="1.1">+<g id="surface92">+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 7 12.5 C 7 13.328125 6.328125 14 5.5 14 C 4.671875 14 4 13.328125 4 12.5 C 4 11.671875 4.671875 11 5.5 11 C 6.328125 11 7 11.671875 7 12.5 Z M 7 12.5 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 12 12.5 C 12 13.328125 11.328125 14 10.5 14 C 9.671875 14 9 13.328125 9 12.5 C 9 11.671875 9.671875 11 10.5 11 C 11.328125 11 12 11.671875 12 12.5 Z M 12 12.5 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 1 7 L 1 9 L 16 9 L 16 7 Z M 1 7 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 8 3 L 8 8 L 9 8 L 9 3 Z M 8 3 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 3 3 L 3 8 L 4 8 L 4 3 Z M 3 3 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 13 3 L 13 8 L 14 8 L 14 3 Z M 13 3 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 5 3.5 C 5 4.328125 4.328125 5 3.5 5 C 2.671875 5 2 4.328125 2 3.5 C 2 2.671875 2.671875 2 3.5 2 C 4.328125 2 5 2.671875 5 3.5 Z M 5 3.5 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 10 3.5 C 10 4.328125 9.328125 5 8.5 5 C 7.671875 5 7 4.328125 7 3.5 C 7 2.671875 7.671875 2 8.5 2 C 9.328125 2 10 2.671875 10 3.5 Z M 10 3.5 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 15 3.5 C 15 4.328125 14.328125 5 13.5 5 C 12.671875 5 12 4.328125 12 3.5 C 12 2.671875 12.671875 2 13.5 2 C 14.328125 2 15 2.671875 15 3.5 Z M 15 3.5 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 10 8 L 10 13 L 11 13 L 11 8 Z M 10 8 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 5 8 L 5 13 L 6 13 L 6 8 Z M 5 8 "/>+</g> </svg>
+ data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg view
@@ -0,0 +1,191 @@+<?xml version="1.0" encoding="UTF-8"?>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">+<defs>+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear11" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear12" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear13" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear14" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear15" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear16" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear17" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear18" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear19" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear20" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear21" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+</linearGradient>+<clipPath id="clip2">+  <rect x="0" y="0" width="128" height="128"/>+</clipPath>+<g id="surface78" clip-path="url(#clip2)">+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear11);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear12);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear13);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear14);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear15);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear16);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear17);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear18);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear19);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear20);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear21);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>+</g>+<clipPath id="clip1">+  <rect x="0" y="0" width="128" height="128"/>+</clipPath>+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>+</filter>+<g id="surface81" clip-path="url(#clip1)" filter="url(#alpha)">+<use xlink:href="#surface78"/>+</g>+<mask id="mask0">+<use xlink:href="#surface81"/>+</mask>+<mask id="mask1">+  <g filter="url(#alpha)">+<rect x="0" y="0" width="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>+  </g>+</mask>+<linearGradient id="linear22" gradientUnits="userSpaceOnUse" x1="300" y1="235" x2="428" y2="235" gradientTransform="matrix(0.000000000000000023,0.37,-0.98462,0.00000000000000006,295.38501,-30.360001)">+<stop offset="0" style="stop-color:rgb(97.647059%,94.117647%,41.960785%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(96.078432%,76.078433%,6.666667%);stop-opacity:1;"/>+</linearGradient>+<clipPath id="clip4">+  <rect x="0" y="0" width="128" height="128"/>+</clipPath>+<g id="surface75" clip-path="url(#clip4)">+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear22);" d="M 128 80.640625 L 128 128 L 0 128 L 0 80.640625 Z M 128 80.640625 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 13.308594 80.640625 L 60.664062 128 L 81.878906 128 L 34.519531 80.640625 Z M 55.730469 80.640625 L 103.09375 128 L 124.308594 128 L 76.945312 80.640625 Z M 98.160156 80.640625 L 128 110.480469 L 128 89.269531 L 119.371094 80.640625 Z M 0 88.546875 L 0 109.761719 L 18.238281 128 L 39.453125 128 Z M 0 88.546875 "/>+</g>+<clipPath id="clip3">+  <rect x="0" y="0" width="128" height="128"/>+</clipPath>+<g id="surface80" clip-path="url(#clip3)">+<use xlink:href="#surface75" mask="url(#mask1)"/>+</g>+</defs>+<g id="surface68">+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear3);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear5);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear7);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear8);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>+<use xlink:href="#surface80" mask="url(#mask0)"/>+</g>+</svg>
data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg view
@@ -1,252 +1,79 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!-- Created with Inkscape (http://www.inkscape.org/) -->--<svg-   xmlns:dc="http://purl.org/dc/elements/1.1/"-   xmlns:cc="http://creativecommons.org/ns#"-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"-   xmlns:svg="http://www.w3.org/2000/svg"-   xmlns="http://www.w3.org/2000/svg"-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"-   width="256"-   height="256"-   id="svg2"-   version="1.1"-   inkscape:version="0.92.4 5da689c313, 2019-01-14"-   sodipodi:docname="org.freedesktop.Bustle.svg">-  <defs-     id="defs4">-    <inkscape:path-effect-       is_visible="true"-       id="path-effect4126"-       effect="spiro" />-    <inkscape:path-effect-       is_visible="true"-       id="path-effect4123"-       effect="spiro" />-    <inkscape:path-effect-       is_visible="true"-       id="path-effect4120"-       effect="spiro" />-    <inkscape:path-effect-       is_visible="true"-       id="path-effect4117"-       effect="spiro" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3763"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3759"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-1"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-3"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3759-7"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3763-2"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-6"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-3-1"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-6-2"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3763-2-7"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3770-3-1-2"-       is_visible="true" />-    <inkscape:path-effect-       effect="spiro"-       id="path-effect3759-7-2"-       is_visible="true" />-    <filter-       id="filter4104"-       inkscape:label="Chalk and sponge"-       inkscape:menu="Distort"-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"-       width="1.6"-       height="2"-       y="-0.5"-       x="-0.30000001"-       style="color-interpolation-filters:sRGB">-      <feTurbulence-         id="feTurbulence4106"-         baseFrequency="0.4"-         type="fractalNoise"-         seed="0"-         numOctaves="5"-         result="result1" />-      <feOffset-         id="feOffset4108"-         dx="-5"-         dy="-5"-         result="result2" />-      <feDisplacementMap-         id="feDisplacementMap4110"-         in2="result1"-         xChannelSelector="R"-         yChannelSelector="G"-         scale="30"-         in="SourceGraphic" />-    </filter>-    <filter-       id="filter4183"-       inkscape:label="Chalk and sponge"-       inkscape:menu="Distort"-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"-       width="1.6"-       height="2"-       y="-0.5"-       x="-0.30000001"-       style="color-interpolation-filters:sRGB">-      <feTurbulence-         id="feTurbulence4185"-         baseFrequency="0.4"-         type="fractalNoise"-         seed="0"-         numOctaves="5"-         result="result1" />-      <feOffset-         id="feOffset4187"-         dx="-5"-         dy="-5"-         result="result2" />-      <feDisplacementMap-         id="feDisplacementMap4189"-         in2="result1"-         xChannelSelector="R"-         yChannelSelector="G"-         scale="30"-         in="SourceGraphic" />-    </filter>-    <inkscape:path-effect-       is_visible="true"-       id="path-effect4117-2"-       effect="spiro" />-  </defs>-  <sodipodi:namedview-     id="base"-     pagecolor="#ffffff"-     bordercolor="#666666"-     borderopacity="1.0"-     inkscape:pageopacity="0.0"-     inkscape:pageshadow="2"-     inkscape:zoom="9.2695312"-     inkscape:cx="128"-     inkscape:cy="71.987112"-     inkscape:document-units="px"-     inkscape:current-layer="layer1"-     showgrid="false"-     inkscape:window-width="3200"-     inkscape:window-height="1671"-     inkscape:window-x="0"-     inkscape:window-y="55"-     inkscape:window-maximized="1"-     fit-margin-top="1"-     fit-margin-left="0"-     fit-margin-right="0"-     fit-margin-bottom="0">-    <inkscape:grid-       type="xygrid"-       id="grid3834"-       empspacing="5"-       visible="true"-       enabled="true"-       snapvisiblegridlinesonly="true"-       originx="-232.64974"-       originy="-799.15823"-       spacingx="1"-       spacingy="1" />-  </sodipodi:namedview>-  <metadata-     id="metadata7">-    <rdf:RDF>-      <cc:Work-         rdf:about="">-        <dc:format>image/svg+xml</dc:format>-        <dc:type-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />-        <dc:title></dc:title>-      </cc:Work>-    </rdf:RDF>-  </metadata>-  <g-     inkscape:label="Layer 1"-     inkscape:groupmode="layer"-     id="layer1"-     transform="translate(-232.64974,2.7960645)">-    <g-       id="g1412"-       transform="matrix(0.41816393,0,0,0.41816393,209.83903,7.3082603)">-      <path-         inkscape:connector-curvature="0"-         id="path3802-8"-         d="m 70.761814,288.36996 c -0.01207,-1.2669 -0.02449,-2.53589 -0.02449,-3.80671 0,-159.41492 129.271656,-288.6461129 288.736206,-288.6461129 159.46457,0 288.73621,129.2311929 288.73621,288.6461129 v 0 0 c 0,1.27082 -0.009,2.53969 -0.0245,3.80671"-         style="fill:none;stroke:#74b674;stroke-width:27.59247017;stroke-miterlimit:4;stroke-dasharray:82.77741051, 27.59247017;stroke-dashoffset:27.59247017;stroke-opacity:1" />-      <ellipse-         transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"-         id="path2985-7"-         style="fill:none;stroke:#000000;stroke-width:34.42315674;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"-         cx="381.42856"-         cy="433.79074"-         rx="130"-         ry="118.57143" />-      <path-         inkscape:connector-curvature="0"-         inkscape:original-d="M 417.41556,287.80173 H 628.85727"-         inkscape:path-effect="#path-effect3759-7"-         id="path3757-7"-         d="M 417.41556,287.80173 H 628.85727"-         style="fill:none;stroke:#000000;stroke-width:18.45480156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />-      <path-         inkscape:connector-curvature="0"-         inkscape:original-d="m 294.08479,287.66116 -211.718251,0.2812"-         inkscape:path-effect="#path-effect3763-2"-         id="path3761-7"-         d="m 294.08479,287.66116 -211.718251,0.2812"-         style="fill:none;stroke:#000000;stroke-width:18.17925262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />-      <path-         sodipodi:nodetypes="ccc"-         inkscape:connector-curvature="0"-         inkscape:original-d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"-         inkscape:path-effect="#path-effect3770-6"-         id="path3768-2"-         d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"-         style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />-      <path-         sodipodi:nodetypes="ccc"-         inkscape:connector-curvature="0"-         inkscape:original-d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"-         inkscape:path-effect="#path-effect3770-3-1"-         id="path3768-9-7"-         d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"-         style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />-    </g>-  </g>+<?xml version="1.0" encoding="UTF-8"?>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">+<defs>+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>+</linearGradient>+<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>+</linearGradient>+</defs>+<g id="surface62">+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear3);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear5);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear7);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear8);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>+</g> </svg>
data/org.freedesktop.Bustle.appdata.xml.in view
@@ -2,73 +2,81 @@ <!-- Copyright 2014 Philip Withnall <philip@tecnocode.co.uk> --> <!-- Copyright 2016–2018 Will Thompson <will@willthompson.co.uk> --> <component type="desktop-application">-	<id>org.freedesktop.Bustle</id>-	<launchable type="desktop-id">org.freedesktop.Bustle.desktop</launchable>-	<content_rating type="oars-1.1" />-	<metadata_license>CC-BY-SA-3.0</metadata_license>-	<name>Bustle</name>-	<summary>Draw sequence diagrams of D-Bus activity</summary>-	<description>-		<!-- Translators: These are the application description paragraphs in the AppData file. -->-		<p>Bustle draws sequence diagrams of D-Bus activity.-		    It shows signal emissions, method calls and their-		    corresponding returns, with time stamps for each individual-		    event and the duration of each method call. This can help-		    you check for unwanted D-Bus traffic, and pinpoint why your-		    D-Bus-based application is not performing as well as you-		    like. It also provides statistics like signal frequencies-		    and average method call times.</p>-	</description>-	<project_license>LGPL-2.1+ AND GPL-3.0</project_license>-	<screenshots>-		<screenshot width="1548" height="848" type="default">-			<image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-diagram.png</image>-			<caption>Explore sequence diagrams of D-Bus activity</caption>-		</screenshot>-		<screenshot width="1548" height="848">-			<image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-statistics.png</image>-			<caption>See statistics summarizing the log</caption>-		</screenshot>-		<screenshot width="1548" height="848">-			<image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-welcome.png</image>-			<caption>Relax with this soothing greyscale welcome page</caption>-		</screenshot>-	</screenshots>-	<url type="homepage">https://gitlab.freedesktop.org/bustle/bustle#readme</url>-	<update_contact>will_at_willthompson.co.uk</update_contact>-	<translation type="gettext">bustle</translation>-	<provides>-		<id>bustle.desktop</id>-	</provides>-	<releases>-		<release date="2019-03-08" version="0.7.5">-			<description>-				<p>As well as being able to filter out messages involving certain services, you can now also filter messages to only show certain services.</p>-			</description>-		</release>-		<release date="2018-12-07" version="0.7.4">-			<description>-				<p>In the details for an error reply, the error name is now shown, and the error message is formatted more legibly.</p>-				<p>The default file extension for log files is now ‘.pcap’, reflecting what they actually are.</p>-			</description>-		</release>-		<release date="2018-11-15" version="0.7.3">-			<description>-				<p>Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in practice means that your file manager will offer to open pcap files with Bustle.</p>-			</description>-		</release>-		<release date="2018-07-24" version="0.7.2">-			<description>-				<p>You can now explore messages while they're being recorded. Filtering, statistics and exporting are still only available once you stop recording.</p>-				<p>The raw sender and destination for each message is now shown in the details pane.</p>-				<p>Bytestrings with embedded NULs which are otherwise ASCII are now shown as ASCII strings.</p>-			</description>-		</release>-		<release date="2018-06-15" version="0.7.1">-			<description>-				<p>It's now possible to monitor the system bus (from the user interface and with the bustle-pcap command-line tool), with no need to reconfigure the system bus. It's also possible to monitor an arbitrary bus by address.</p>-				<p>Bustle now requires that dbus-monitor (≥ 1.9.10) and pkexec are installed on your system.</p>-			</description>-		</release>-	</releases>+  <id>org.freedesktop.Bustle</id>+  <launchable type="desktop-id">org.freedesktop.Bustle.desktop</launchable>+  <content_rating type="oars-1.1" />+  <metadata_license>CC-BY-SA-3.0</metadata_license>+  <name>Bustle</name>+  <summary>Draw sequence diagrams of D-Bus activity</summary>+  <description>+    <!-- Translators: These are the application description paragraphs in the AppData file. -->+    <p>Bustle draws sequence diagrams of D-Bus activity.+        It shows signal emissions, method calls and their+        corresponding returns, with time stamps for each individual+        event and the duration of each method call. This can help+        you check for unwanted D-Bus traffic, and pinpoint why your+        D-Bus-based application is not performing as well as you+        like. It also provides statistics like signal frequencies+        and average method call times.</p>+  </description>+  <project_license>LGPL-2.1+</project_license>+  <screenshots>+    <screenshot width="1548" height="848" type="default">+      <image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-diagram.png</image>+      <caption>Explore sequence diagrams of D-Bus activity</caption>+    </screenshot>+    <screenshot width="1548" height="848">+      <image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-statistics.png</image>+      <caption>See statistics summarizing the log</caption>+    </screenshot>+    <screenshot width="1548" height="848">+      <image>https://gitlab.freedesktop.org/bustle/bustle/raw/master/data/appdata/bustle-welcome.png</image>+      <caption>Relax with this soothing greyscale welcome page</caption>+    </screenshot>+  </screenshots>+  <url type="homepage">https://gitlab.freedesktop.org/bustle/bustle#readme</url>+  <update_contact>will_at_willthompson.co.uk</update_contact>+  <translation type="gettext">bustle</translation>+  <provides>+    <id>bustle.desktop</id>+  </provides>+  <releases>+    <release date="2020-07-31" version="0.8.0">+      <description>+        <p>Bustle has a new icon, kindly provided by Tobias Bernard.</p>+        <p>Closing a window without saving a recorded log no longer prompts for confirmation. Anecdotally, most users just want to record and read logs, not save them.</p>+        <p>Bustle now uses GLib's implementation of the D-Bus wire protocol throughout. The only user-facing consequence is that message bodies are now pretty-printed in the GVariant text format.</p>+        <p>Since Bustle no longer depends on any GPL libraries, the project license has been simplified to plain LGPL 2.1 or later.</p>+      </description>+    </release>+    <release date="2019-03-08" version="0.7.5">+      <description>+        <p>As well as being able to filter out messages involving certain services, you can now also filter messages to only show certain services.</p>+      </description>+    </release>+    <release date="2018-12-07" version="0.7.4">+      <description>+        <p>In the details for an error reply, the error name is now shown, and the error message is formatted more legibly.</p>+        <p>The default file extension for log files is now ‘.pcap’, reflecting what they actually are.</p>+      </description>+    </release>+    <release date="2018-11-15" version="0.7.3">+      <description>+        <p>Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in practice means that your file manager will offer to open pcap files with Bustle.</p>+      </description>+    </release>+    <release date="2018-07-24" version="0.7.2">+      <description>+        <p>You can now explore messages while they're being recorded. Filtering, statistics and exporting are still only available once you stop recording.</p>+        <p>The raw sender and destination for each message is now shown in the details pane.</p>+        <p>Bytestrings with embedded NULs which are otherwise ASCII are now shown as ASCII strings.</p>+      </description>+    </release>+    <release date="2018-06-15" version="0.7.1">+      <description>+        <p>It's now possible to monitor the system bus (from the user interface and with the bustle-pcap command-line tool), with no need to reconfigure the system bus. It's also possible to monitor an arbitrary bus by address.</p>+        <p>Bustle now requires that dbus-monitor (≥ 1.9.10) and pkexec are installed on your system.</p>+      </description>+    </release>+  </releases> </component>
− po/en_GB.po 
@@ -1,327 +0,0 @@-# SOME DESCRIPTIVE TITLE.-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER-# This file is distributed under the same license as the PACKAGE package.-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.-# -# Translators:-# Will Thompson <wjt@endlessm.com>, 2018-# -#, fuzzy-msgid ""-msgstr ""-"Project-Id-Version: PACKAGE VERSION\n"-"Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2018-11-15 08:51+0000\n"-"PO-Revision-Date: 2018-11-15 09:57+0000\n"-"Last-Translator: Will Thompson <wjt@endlessm.com>, 2018\n"-"Language-Team: English (United Kingdom) (https://www.transifex.com/bustle/teams/6754/en_GB/)\n"-"MIME-Version: 1.0\n"-"Content-Type: text/plain; charset=UTF-8\n"-"Content-Transfer-Encoding: 8bit\n"-"Language: en_GB\n"-"Plural-Forms: nplurals=2; plural=(n != 1);\n"--#: Bustle/StatisticsPane.hs:189 Bustle/StatisticsPane.hs:192-msgid "%.1f ms"-msgstr ""--#: Bustle/Noninteractive.hs:55-msgid "(no interface)"-msgstr ""--#: Bustle/UI/AboutDialog.hs:46 data/bustle.ui:101-#: data/org.freedesktop.Bustle.desktop.in:3-#: data/org.freedesktop.Bustle.appdata.xml.in:6-msgid "Bustle"-msgstr ""--#: Bustle/StatisticsPane.hs:190-msgid "Calls"-msgstr ""--#: Bustle/UI.hs:456-msgid "Close _Without Saving"-msgstr ""--#: Bustle/UI.hs:226-msgid "Could not read '%s'"-msgstr "Could not read ‘%s’"--#: Bustle/UI.hs:763-msgid "Couldn't export log as PDF: "-msgstr "Couldn’t export log as PDF: OH NO"--#: Bustle/Noninteractive.hs:48-msgid "Couldn't parse '%s': %s"-msgstr "Couldn’t parse ‘%s’: %s"--#: Bustle/UI.hs:431-msgid "Couldn't save log: "-msgstr "Couldn’t save log: "--#: Bustle/StatisticsPane.hs:222 data/bustle.ui:787-msgid "Error"-msgstr ""--#: Bustle/StatisticsPane.hs:150-msgid "Frequency"-msgstr ""--#: Bustle/UI.hs:455-msgid "If you don't save, this log will be lost forever."-msgstr "If you don’t save, this log will be lost forever."--#: Bustle/StatisticsPane.hs:229-msgid "Largest"-msgstr ""--#: Bustle/UI.hs:239-msgid "Logged <b>%u</b> messages"-msgstr ""--#: Bustle/StatisticsPane.hs:191 Bustle/StatisticsPane.hs:228-msgid "Mean"-msgstr ""--#: Bustle/StatisticsPane.hs:135 Bustle/StatisticsPane.hs:213-#: data/bustle.ui:688-msgid "Member"-msgstr ""--#: Bustle/StatisticsPane.hs:142 Bustle/StatisticsPane.hs:179-msgid "Method"-msgstr ""--#: Bustle/StatisticsPane.hs:220 data/bustle.ui:762-msgid "Method call"-msgstr ""--#: Bustle/StatisticsPane.hs:221 data/bustle.ui:774-msgid "Method return"-msgstr ""--#: Bustle/UI.hs:348-msgid "Recording %s&#8230;"-msgstr ""--#: Bustle/UI.hs:448-msgid "Save log '%s' before closing?"-msgstr ""--#: Bustle/StatisticsPane.hs:143 Bustle/StatisticsPane.hs:223-#: data/bustle.ui:800-msgid "Signal"-msgstr ""--#: Bustle/StatisticsPane.hs:227-msgid "Smallest"-msgstr ""--#: Bustle/UI/AboutDialog.hs:48-msgid "Someone's favourite D-Bus profiler"-msgstr "Someone’s favourite D-Bus profiler"--#: Bustle/StatisticsPane.hs:188-msgid "Total"-msgstr ""--#: Bustle/UI/FilterDialog.hs:123-msgid ""-"Unticking a service hides its column in the diagram, and all messages it is "-"involved in. That is, all methods it calls or are called on it, the "-"corresponding returns, and all signals it emits will be hidden."-msgstr ""--#: Bustle/Util.hs:48-msgid "Warning: "-msgstr ""--#: Bustle/UI.hs:433-msgid ""-"You might want to manually recover the log from the temporary file at "-"\"%s\"."-msgstr ""--#: data/bustle.ui:14-msgid "_Filter Visible Services…"-msgstr ""--#: data/bustle.ui:24-msgid "_Statistics"-msgstr ""--#: data/bustle.ui:62-msgid ""-"Display two logs—one for the session bus, one for the system bus—side by "-"side."-msgstr ""--#: data/bustle.ui:63-msgid "O_pen a Pair of Logs…"-msgstr ""--#: data/bustle.ui:75-msgid "Record S_ession Bus"-msgstr ""--#: data/bustle.ui:84-msgid "Record S_ystem Bus"-msgstr ""--#: data/bustle.ui:93-msgid "Record _Address…"-msgstr ""--#: data/bustle.ui:138-msgid "Record a new log"-msgstr ""--#: data/bustle.ui:149-msgid "_Record"-msgstr ""--#: data/bustle.ui:182-msgid "_Stop"-msgstr ""--#: data/bustle.ui:200-msgid "Open an existing log"-msgstr ""--#: data/bustle.ui:310-msgid "Export as PDF"-msgstr ""--#: data/bustle.ui:334-msgid "Save"-msgstr ""--#: data/bustle.ui:493-msgid ""-"Start recording D-Bus activity with the <b>Record</b> button above\n"-" You can also run <i>dbus-monitor --pcap</i> from the command line"-msgstr ""--#: data/bustle.ui:512-msgid "Welcome to Bustle"-msgstr ""--#: data/bustle.ui:537-msgid "<big><b>Waiting for D-Bus traffic; please hold…</b></big>"-msgstr ""--#: data/bustle.ui:564-msgid "Frequencies"-msgstr ""--#: data/bustle.ui:578-msgid "Durations"-msgstr ""--#: data/bustle.ui:593-msgid "Sizes"-msgstr ""--#: data/bustle.ui:640-msgid "Type"-msgstr ""--#: data/bustle.ui:656-msgid "Path"-msgstr ""--#: data/bustle.ui:720-msgid "Arguments"-msgstr ""--#: data/bustle.ui:813-msgid "Directed signal"-msgstr ""--#: data/bustle.ui:832-msgid "Sender"-msgstr ""--#: data/bustle.ui:848-msgid "Destination"-msgstr ""--#: data/org.freedesktop.Bustle.desktop.in:4-#: data/org.freedesktop.Bustle.appdata.xml.in:7-msgid "Draw sequence diagrams of D-Bus activity"-msgstr ""--#: data/org.freedesktop.Bustle.desktop.in:6-msgid "org.freedesktop.Bustle"-msgstr ""--#: data/org.freedesktop.Bustle.desktop.in:11-msgid "debug;profile;d-bus;dbus;sequence;monitor;"-msgstr ""--#. Translators: These are the application description paragraphs in the-#. AppData file.-#: data/org.freedesktop.Bustle.appdata.xml.in:10-msgid ""-"Bustle draws sequence diagrams of D-Bus activity. It shows signal emissions,"-" method calls and their corresponding returns, with time stamps for each "-"individual event and the duration of each method call. This can help you "-"check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based "-"application is not performing as well as you like. It also provides "-"statistics like signal frequencies and average method call times."-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:23-msgid "Explore sequence diagrams of D-Bus activity"-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:27-msgid "See statistics summarizing the log"-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:31-msgid "Relax with this soothing greyscale welcome page"-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:43-msgid ""-"Bustle now handles the application/vnd.tcpdump.pcap MIME type, which in "-"practice means that your file manager will offer to open pcap files with "-"Bustle."-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:48-msgid ""-"You can now explore messages while they're being recorded. (Filtering, "-"statistics and exporting are still only available once you stop recording.)"-msgstr ""-"You can now explore messages while they’re being recorded. (Filtering, "-"statistics and exporting are still only available once you stop recording.)"--#: data/org.freedesktop.Bustle.appdata.xml.in:49-msgid ""-"The raw sender and destination for each message is now shown in the details "-"pane."-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:50-msgid ""-"Bytestrings with embedded NULs which are otherwise ASCII are now shown as "-"ASCII strings."-msgstr ""--#: data/org.freedesktop.Bustle.appdata.xml.in:55-msgid ""-"It's now possible to monitor the system bus (from the user interface and "-"with the bustle-pcap command-line tool), with no need to reconfigure the "-"system bus. It's also possible to monitor an arbitrary bus by address."-msgstr ""-"It’s now possible to monitor the system bus (from the user interface and "-"with the bustle-pcap command-line tool), with no need to reconfigure the "-"system bus. It’s also possible to monitor an arbitrary bus by address."--#: data/org.freedesktop.Bustle.appdata.xml.in:56-msgid ""-"Bustle now requires that dbus-monitor (≥ 1.9.10) and pkexec are installed on"-" your system."-msgstr ""