diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/AppIndicatorPlugin.csproj keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/AppIndicatorPlugin.csproj --- keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/AppIndicatorPlugin.csproj 2014-12-20 04:23:13.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/AppIndicatorPlugin.csproj 2015-07-19 20:33:56.000000000 +0000 @@ -11,7 +11,7 @@ KeebuntuAppIndicator KeebuntuAppIndicator Plugin for KeePass 2.x that add support for Ubuntu Application Indicators - 0.4.6 + 0.4.7 False @@ -111,6 +111,9 @@ ImageMagick.dll.config PreserveNewest + + + @@ -126,4 +129,9 @@ ImageMagick + + + + + diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/AssemblyInfo.cs keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/AssemblyInfo.cs --- keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/AssemblyInfo.cs 2014-12-05 03:58:00.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/AssemblyInfo.cs 2015-07-19 20:34:23.000000000 +0000 @@ -17,8 +17,8 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("0.4.6.0")] -[assembly: AssemblyFileVersion("0.4.6.0")] +[assembly: AssemblyVersion("0.4.7.0")] +[assembly: AssemblyFileVersion("0.4.7.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/DBus.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/ImageMagick.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/ImageMagick.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeeAgent.plgx and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeeAgent.plgx differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeebuntuAppIndicator.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeebuntuAppIndicator.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeebuntuAppIndicator.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeebuntuAppIndicator.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeebuntuAppMenu.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeebuntuAppMenu.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeebuntuAppMenu.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeebuntuAppMenu.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeePass.config.xml keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeePass.config.xml --- keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeePass.config.xml 2014-12-20 04:22:18.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeePass.config.xml 2015-03-31 16:09:44.000000000 +0000 @@ -27,12 +27,12 @@ - 574 - 246 - 771 - 587 - 0.8313008 - 0.250327647 + 145 + 149 + 989 + 662 + 0.8330373 + 0.24974516 Default true @@ -41,24 +41,24 @@ Title - 106 + 138 UserName - 106 + 138 Password - 106 + 138 true Url - 106 + 138 Notes - 106 + 138 0 1 2 3 4 Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/bin/Debug/KeePass.exe and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/bin/Debug/KeePass.exe differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/obj/Debug/KeebuntuAppIndicator.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/obj/Debug/KeebuntuAppIndicator.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/obj/Debug/KeebuntuAppIndicator.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/obj/Debug/KeebuntuAppIndicator.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/Resources/icons/elementary/apps/24/keepass2-locked.svg keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/Resources/icons/elementary/apps/24/keepass2-locked.svg --- keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/Resources/icons/elementary/apps/24/keepass2-locked.svg 1970-01-01 00:00:00.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/Resources/icons/elementary/apps/24/keepass2-locked.svg 2015-07-19 19:57:29.000000000 +0000 @@ -0,0 +1,143 @@ + + + + + KeePass Lock (white) + + + + + + + + + + + + + + + + + image/svg+xml + + KeePass Lock (white) + + 2013-04-01 + + + David Lechner + + + https://en.wikipedia.org/wiki/File:KeePass_icon.svg + + + + + + + + + + + + + + + + Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/Resources/icons/hicolor/16x16/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/Resources/icons/hicolor/16x16/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/Resources/icons/hicolor/32x32/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/Resources/icons/hicolor/32x32/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationIndicator/Resources/icons/hicolor/48x48/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationIndicator/Resources/icons/hicolor/48x48/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/DBus.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/ImageMagick.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/ImageMagick.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/KeebuntuAppMenu.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/KeebuntuAppMenu.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/KeebuntuAppMenu.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/KeebuntuAppMenu.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/KeePass.config.xml keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/KeePass.config.xml --- keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/KeePass.config.xml 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/KeePass.config.xml 2015-03-31 16:54:35.000000000 +0000 @@ -1,21 +1,142 @@ - - - - - false - true - - - - - - - false - false - true - - - - false - - + + + + false + true + + + + + Obf + NoSave + + + 12 + + + + + false + false + + + + + + + + + + 145 + 149 + 989 + 662 + 0.8333333 + 0.24974516 + Default + + + + + + Title + 138 + + + UserName + 138 + + + Password + 138 + true + + + Url + 138 + + + Notes + 138 + + + 0 1 2 3 4 + + Ascending + + + + + + + Microsoft Sans Serif + 8.25 + Point + + false + + + Courier New + 8.25 + Point + + false + + WinVistaBlack + + Microsoft Sans Serif + 8.25 + Point + + false + + 0 + 0 + 0 + + + + 0 + 0 + + + + 0 + 0 + + + + + + CharSet + 20 + ULD_______ + + + CharSet + 20 + ULD_______ + + + + + 0 + + InvariantCultureIgnoreCase + + + + + 393281 + 0 + 393291 + 0 + + 1 + + + false + System + + + \ No newline at end of file Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/bin/Debug/KeePass.exe and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/bin/Debug/KeePass.exe differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/obj/Debug/KeebuntuAppMenu.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/obj/Debug/KeebuntuAppMenu.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ApplicationMenu/obj/Debug/KeebuntuAppMenu.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ApplicationMenu/obj/Debug/KeebuntuAppMenu.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/DBus.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/ImageMagick.dll differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/ImageMagick.dll.config keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/ImageMagick.dll.config --- keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/ImageMagick.dll.config 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/ImageMagick.dll.config 2015-07-19 19:57:29.000000000 +0000 @@ -1,4 +1,4 @@ - + Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/ImageMagick.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/MagickWand/MagickWand.cs keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/MagickWand/MagickWand.cs --- keepass2-plugin-ubuntu-0.5.6.1/DBus/bin/Debug/MagickWand/MagickWand.cs 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/DBus/bin/Debug/MagickWand/MagickWand.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Collections; -using System.IO; -using ImageMagick.MagickCore; - -namespace ImageMagick.MagickWand -{ - public class MagickWand : ICloneable - { - // Inital impementation based on: - // http://www.toptensoftware.com/Articles/17/High-Quality-Image-Resampling-in-Mono-Linux - - protected IntPtr mWand = IntPtr.Zero; - - static MagickWand() - { - MagickWandGenesis(); - AppDomain.CurrentDomain.ProcessExit += (sender, e) => MagickWandTerminus(); - } - - protected MagickWand(IntPtr wand) - { - mWand = wand; - } - - public MagickWand() : this(NewMagickWand()) { } - - /// - /// Deallocates memory associated with an MagickWand - /// - ~MagickWand() - { - if (mWand != IntPtr.Zero) { - mWand = DestroyMagickWand(mWand); - } - } - - - #region Properties - - public ImageType ImageType - { - get { - return MagickGetImageType(mWand); - } - set { - if (!MagickSetImageType(mWand, value)) { - //TODO - implement exceptions - throw new Exception(); - } - } - } - - #endregion Properties - - - #region IClonable implementation - - /// - /// Makes an exact copy of the specified wand. - /// - public object Clone() - { - return new MagickWand(CloneMagickWand(mWand)); - } - - #endregion IClonable implementation - - - public bool EvaluateImage(MagickEvaluateOperator op, double value) - { - // TODO - implement exception checking - return MagickEvaluateImage(mWand, op, value); - } - - public byte[] GetImageBlob() - { - // Get the blob - IntPtr len; - IntPtr buf=MagickGetImageBlob(mWand, out len); - - // Copy it - var dest=new byte[len.ToInt32()]; - Marshal.Copy(buf, dest, 0, len.ToInt32()); - - // Relinquish - MagickRelinquishMemory(buf); - - return dest; - } - - public bool ReadImageBlob(byte[] blob) - { - GCHandle pinnedArray = GCHandle.Alloc(blob, GCHandleType.Pinned); - IntPtr pointer = pinnedArray.AddrOfPinnedObject(); - - bool result = MagickReadImageBlob(mWand, pointer, (IntPtr)blob.Length); - - pinnedArray.Free(); - // TODO - implement exception checking - return result; - } - - public bool ResizeImage(int width, int heigth, FilterType filter, double blur) - { - // TODO - implement exception checking - return MagickResizeImage(mWand, (IntPtr)width, (IntPtr)heigth, filter, blur); - } - - #region Magic Wand Methods - from magick-wand.c - - [DllImport("libMagickWand", EntryPoint = "ClearMagickWand")] - private static extern void ClearMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "CloneMagickWand")] - private static extern IntPtr CloneMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "DestroyMagickWand")] - private static extern IntPtr DestroyMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "IsMagickWand")] - private static extern bool IsMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickClearException")] - private static extern bool MagickClearException(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetException")] - private static extern IntPtr MagickGetException(IntPtr wand, - ExceptionType severity); - - [DllImport("libMagickWand", EntryPoint = "MagickGetExceptionType")] - private static extern ExceptionType MagickGetExceptionType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetIteratorIndex")] - private static extern UIntPtr MagickGetIteratorIndex(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOption")] - private static extern IntPtr MagickQueryConfigureOption(string option); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOptions")] - private static extern IntPtr MagickQueryConfigureOptions(string pattern, - [Out] out UIntPtr number_options); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFontMetrics")] - private static extern IntPtr MagickQueryFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryMultilineFontMetrics")] - private static extern IntPtr MagickQueryMultilineFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFonts")] - private static extern IntPtr MagickQueryFonts(string pattern, - [Out] out UIntPtr number_fonts); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFormats")] - private static extern IntPtr MagickQueryFormats(string pattern, - [Out] out UIntPtr number_formats); - - [DllImport("libMagickWand", EntryPoint = "MagickRelinquishMemory")] - private static extern IntPtr MagickRelinquishMemory(IntPtr resource); - - [DllImport("libMagickWand", EntryPoint = "MagickSetFirstIterator")] - private static extern void MagickSetFirstIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResetIterator")] - private static extern void MagickResetIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickSetIteratorIndex")] - private static extern bool MagickSetIteratorIndex(IntPtr wand, IntPtr index); - - [DllImport("libMagickWand", EntryPoint = "MagickSetLastIterator")] - private static extern void MagickSetLastIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickWandGenesis")] - private static extern void MagickWandGenesis(); - - [DllImport("libMagickWand", EntryPoint = "MagickWandTerminus")] - private static extern void MagickWandTerminus(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWand")] - private static extern IntPtr NewMagickWand(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWandFromImage")] - private static extern IntPtr NewMagickWandFromImage(IntPtr image); - - #endregion Magic Wand Methods - from magick-wand.c - - - [DllImport("libMagickWand", EntryPoint = "MagickEvaluateImage")] - private static extern bool MagickEvaluateImage(IntPtr wand, - MagickEvaluateOperator op, - double value); - - [DllImport("libMagickWand", EntryPoint = "MagickFunctionImage")] - private static extern bool MagickFunctionImage(IntPtr wand, - MagickFunction function, - UIntPtr number_arguments, - double[] arguments); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageBlob")] - private static extern IntPtr MagickGetImageBlob(IntPtr wand, - [Out] out IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageHeight")] - private static extern IntPtr MagickGetImageHeight(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageType")] - private static extern ImageType MagickGetImageType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageWidth")] - private static extern IntPtr MagickGetImageWidth(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResizeImage")] - private static extern bool MagickResizeImage(IntPtr mgck_wand, - IntPtr columns, - IntPtr rows, - FilterType filter_type, - double blur); - - [DllImport("libMagickWand", EntryPoint = "MagickReadImageBlob")] - private static extern bool MagickReadImageBlob(IntPtr wand, - IntPtr blob, - IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageOpacity")] - private static extern bool MagickSetImageOpacity(IntPtr wand, - double alpha); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageType")] - private static extern bool MagickSetImageType(IntPtr wand, - ImageType image_type); - - } -} Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/obj/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/obj/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/DBus/obj/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/DBus/obj/Debug/DBus.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/debian/changelog keepass2-plugin-ubuntu-0.5.7/debian/changelog --- keepass2-plugin-ubuntu-0.5.6.1/debian/changelog 2015-04-12 19:31:18.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/debian/changelog 2015-07-19 20:45:19.000000000 +0000 @@ -1,3 +1,9 @@ +keepass2-plugin-ubuntu (0.5.7) vivid; urgency=medium + + * Add more icon sizes for tray icons. + + -- David Lechner Sun, 19 Jul 2015 15:44:45 -0500 + keepass2-plugin-ubuntu (0.5.6.1) vivid; urgency=medium * Fix dependency in debian/control for new version of libmagickwand. diff -Nru keepass2-plugin-ubuntu-0.5.6.1/debian/keepass2-plugin-libdbusmenu.install keepass2-plugin-ubuntu-0.5.7/debian/keepass2-plugin-libdbusmenu.install --- keepass2-plugin-ubuntu-0.5.6.1/debian/keepass2-plugin-libdbusmenu.install 2014-12-20 04:23:13.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/debian/keepass2-plugin-libdbusmenu.install 2015-07-19 19:57:29.000000000 +0000 @@ -1 +1 @@ -libunity-sharp/libunity-sharp.dll* usr/lib/keepass2/plugins/keebuntu +libunity-sharp/libdbusmenu-glib-sharp.dll* usr/lib/keepass2/plugins/keebuntu diff -Nru keepass2-plugin-ubuntu-0.5.6.1/debian/keepass2-plugin-libunity.install keepass2-plugin-ubuntu-0.5.7/debian/keepass2-plugin-libunity.install --- keepass2-plugin-ubuntu-0.5.6.1/debian/keepass2-plugin-libunity.install 2014-12-20 04:23:13.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/debian/keepass2-plugin-libunity.install 2015-07-19 19:57:29.000000000 +0000 @@ -1 +1 @@ -libunity-sharp/libdbusmenu-glib-sharp.dll* usr/lib/keepass2/plugins/keebuntu +libunity-sharp/libunity-sharp.dll* usr/lib/keepass2/plugins/keebuntu diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/AssemblyInfo.cs keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/AssemblyInfo.cs --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/AssemblyInfo.cs 2014-12-20 04:23:13.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/AssemblyInfo.cs 2015-07-19 20:35:56.000000000 +0000 @@ -17,8 +17,8 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] +[assembly: AssemblyVersion("0.1.1.0")] +[assembly: AssemblyFileVersion("0.1.1.0")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/DBus.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/GtkStatusIcon.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/GtkStatusIcon.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/GtkStatusIcon.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/GtkStatusIcon.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/ImageMagick.dll differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/ImageMagick.dll.config keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/ImageMagick.dll.config --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/ImageMagick.dll.config 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/ImageMagick.dll.config 2015-07-19 19:57:29.000000000 +0000 @@ -1,4 +1,4 @@ - + Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/ImageMagick.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/KeePass.config.xml keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/KeePass.config.xml --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/KeePass.config.xml 2014-12-21 03:33:22.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/KeePass.config.xml 2015-07-19 20:34:35.000000000 +0000 @@ -27,12 +27,13 @@ - 574 - 246 - 771 - 587 - 0.8313008 - 0.250327647 + -16381 + -16381 + -16381 + -16381 + true + 0.83333333333333337 + 0.25 Default true @@ -41,24 +42,24 @@ Title - 106 + 138 UserName - 106 + 138 Password - 106 + 138 true Url - 106 + 138 Notes - 106 + 138 0 1 2 3 4 @@ -138,6 +139,7 @@ false System + Auto \ No newline at end of file Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/KeePass.exe and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/KeePass.exe differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/MagickWand/MagickWand.cs keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/MagickWand/MagickWand.cs --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/bin/Debug/MagickWand/MagickWand.cs 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/bin/Debug/MagickWand/MagickWand.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Collections; -using System.IO; -using ImageMagick.MagickCore; - -namespace ImageMagick.MagickWand -{ - public class MagickWand : ICloneable - { - // Inital impementation based on: - // http://www.toptensoftware.com/Articles/17/High-Quality-Image-Resampling-in-Mono-Linux - - protected IntPtr mWand = IntPtr.Zero; - - static MagickWand() - { - MagickWandGenesis(); - AppDomain.CurrentDomain.ProcessExit += (sender, e) => MagickWandTerminus(); - } - - protected MagickWand(IntPtr wand) - { - mWand = wand; - } - - public MagickWand() : this(NewMagickWand()) { } - - /// - /// Deallocates memory associated with an MagickWand - /// - ~MagickWand() - { - if (mWand != IntPtr.Zero) { - mWand = DestroyMagickWand(mWand); - } - } - - - #region Properties - - public ImageType ImageType - { - get { - return MagickGetImageType(mWand); - } - set { - if (!MagickSetImageType(mWand, value)) { - //TODO - implement exceptions - throw new Exception(); - } - } - } - - #endregion Properties - - - #region IClonable implementation - - /// - /// Makes an exact copy of the specified wand. - /// - public object Clone() - { - return new MagickWand(CloneMagickWand(mWand)); - } - - #endregion IClonable implementation - - - public bool EvaluateImage(MagickEvaluateOperator op, double value) - { - // TODO - implement exception checking - return MagickEvaluateImage(mWand, op, value); - } - - public byte[] GetImageBlob() - { - // Get the blob - IntPtr len; - IntPtr buf=MagickGetImageBlob(mWand, out len); - - // Copy it - var dest=new byte[len.ToInt32()]; - Marshal.Copy(buf, dest, 0, len.ToInt32()); - - // Relinquish - MagickRelinquishMemory(buf); - - return dest; - } - - public bool ReadImageBlob(byte[] blob) - { - GCHandle pinnedArray = GCHandle.Alloc(blob, GCHandleType.Pinned); - IntPtr pointer = pinnedArray.AddrOfPinnedObject(); - - bool result = MagickReadImageBlob(mWand, pointer, (IntPtr)blob.Length); - - pinnedArray.Free(); - // TODO - implement exception checking - return result; - } - - public bool ResizeImage(int width, int heigth, FilterType filter, double blur) - { - // TODO - implement exception checking - return MagickResizeImage(mWand, (IntPtr)width, (IntPtr)heigth, filter, blur); - } - - #region Magic Wand Methods - from magick-wand.c - - [DllImport("libMagickWand", EntryPoint = "ClearMagickWand")] - private static extern void ClearMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "CloneMagickWand")] - private static extern IntPtr CloneMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "DestroyMagickWand")] - private static extern IntPtr DestroyMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "IsMagickWand")] - private static extern bool IsMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickClearException")] - private static extern bool MagickClearException(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetException")] - private static extern IntPtr MagickGetException(IntPtr wand, - ExceptionType severity); - - [DllImport("libMagickWand", EntryPoint = "MagickGetExceptionType")] - private static extern ExceptionType MagickGetExceptionType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetIteratorIndex")] - private static extern UIntPtr MagickGetIteratorIndex(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOption")] - private static extern IntPtr MagickQueryConfigureOption(string option); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOptions")] - private static extern IntPtr MagickQueryConfigureOptions(string pattern, - [Out] out UIntPtr number_options); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFontMetrics")] - private static extern IntPtr MagickQueryFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryMultilineFontMetrics")] - private static extern IntPtr MagickQueryMultilineFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFonts")] - private static extern IntPtr MagickQueryFonts(string pattern, - [Out] out UIntPtr number_fonts); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFormats")] - private static extern IntPtr MagickQueryFormats(string pattern, - [Out] out UIntPtr number_formats); - - [DllImport("libMagickWand", EntryPoint = "MagickRelinquishMemory")] - private static extern IntPtr MagickRelinquishMemory(IntPtr resource); - - [DllImport("libMagickWand", EntryPoint = "MagickSetFirstIterator")] - private static extern void MagickSetFirstIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResetIterator")] - private static extern void MagickResetIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickSetIteratorIndex")] - private static extern bool MagickSetIteratorIndex(IntPtr wand, IntPtr index); - - [DllImport("libMagickWand", EntryPoint = "MagickSetLastIterator")] - private static extern void MagickSetLastIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickWandGenesis")] - private static extern void MagickWandGenesis(); - - [DllImport("libMagickWand", EntryPoint = "MagickWandTerminus")] - private static extern void MagickWandTerminus(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWand")] - private static extern IntPtr NewMagickWand(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWandFromImage")] - private static extern IntPtr NewMagickWandFromImage(IntPtr image); - - #endregion Magic Wand Methods - from magick-wand.c - - - [DllImport("libMagickWand", EntryPoint = "MagickEvaluateImage")] - private static extern bool MagickEvaluateImage(IntPtr wand, - MagickEvaluateOperator op, - double value); - - [DllImport("libMagickWand", EntryPoint = "MagickFunctionImage")] - private static extern bool MagickFunctionImage(IntPtr wand, - MagickFunction function, - UIntPtr number_arguments, - double[] arguments); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageBlob")] - private static extern IntPtr MagickGetImageBlob(IntPtr wand, - [Out] out IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageHeight")] - private static extern IntPtr MagickGetImageHeight(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageType")] - private static extern ImageType MagickGetImageType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageWidth")] - private static extern IntPtr MagickGetImageWidth(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResizeImage")] - private static extern bool MagickResizeImage(IntPtr mgck_wand, - IntPtr columns, - IntPtr rows, - FilterType filter_type, - double blur); - - [DllImport("libMagickWand", EntryPoint = "MagickReadImageBlob")] - private static extern bool MagickReadImageBlob(IntPtr wand, - IntPtr blob, - IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageOpacity")] - private static extern bool MagickSetImageOpacity(IntPtr wand, - double alpha); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageType")] - private static extern bool MagickSetImageType(IntPtr wand, - ImageType image_type); - - } -} diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/GtkStatusIconPlugin.csproj keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/GtkStatusIconPlugin.csproj --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/GtkStatusIconPlugin.csproj 2014-12-20 04:48:37.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/GtkStatusIconPlugin.csproj 2015-07-19 20:36:03.000000000 +0000 @@ -11,7 +11,7 @@ GtkStatusIcon GtkStatusIcon Plugin for KeePass 2.x that add support for GTK status icons - 0.1.0 + 0.1.1 False @@ -106,6 +106,9 @@ ImageMagick.dll.config PreserveNewest + + + diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/KeebuntuGtkStatusIconExt.cs keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/KeebuntuGtkStatusIconExt.cs --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/KeebuntuGtkStatusIconExt.cs 2014-12-21 06:26:56.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/KeebuntuGtkStatusIconExt.cs 2015-07-19 20:28:43.000000000 +0000 @@ -126,12 +126,12 @@ /// private void GtkDBusInit() { - /* setup ApplicationIndicator */ + /* setup StatusIcon */ statusIcon = new Gtk.StatusIcon(); statusIcon.IconName = "keepass2-locked"; #if DEBUG - statusIcon.File = Path.GetFullPath("Resources/icons/hicolor/256x256/apps/keepass2-locked.png"); + statusIcon.File = Path.GetFullPath("Resources/icons/hicolor/16x16/apps/keepass2-locked.png"); #endif statusIcon.Tooltip = PwDefs.ProductName; Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/obj/Debug/GtkStatusIconPlugin.csproj.FilesWrittenAbsolute.txt keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/obj/Debug/GtkStatusIconPlugin.csproj.FilesWrittenAbsolute.txt --- keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/obj/Debug/GtkStatusIconPlugin.csproj.FilesWrittenAbsolute.txt 2014-12-21 03:32:22.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/obj/Debug/GtkStatusIconPlugin.csproj.FilesWrittenAbsolute.txt 2015-07-19 20:34:24.000000000 +0000 @@ -1,9 +1,4 @@ /home/david/work/Keebuntu/GtkStatusIcon/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttribute.cs -/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/KeePass.exe -/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/DBus.dll -/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/DBus.dll.mdb -/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/ImageMagick.dll -/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/ImageMagick.dll.mdb /home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/KeePass.config.xml /home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/KeePass.exe.config /home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/ImageMagick.dll.config @@ -11,3 +6,8 @@ /home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/GtkStatusIcon.dll /home/david/work/Keebuntu/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll /home/david/work/Keebuntu/GtkStatusIcon/obj/Debug/GtkStatusIcon.dll.mdb +/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/KeePass.exe +/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/DBus.dll +/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/DBus.dll.mdb +/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/ImageMagick.dll +/home/david/work/Keebuntu/GtkStatusIcon/bin/Debug/ImageMagick.dll.mdb Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/Resources/icons/hicolor/16x16/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/Resources/icons/hicolor/16x16/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/Resources/icons/hicolor/32x32/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/Resources/icons/hicolor/32x32/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/GtkStatusIcon/Resources/icons/hicolor/48x48/apps/keepass2-locked.png and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/GtkStatusIcon/Resources/icons/hicolor/48x48/apps/keepass2-locked.png differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/ImageMagick.dll differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/ImageMagick.dll.config keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/ImageMagick.dll.config --- keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/ImageMagick.dll.config 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/ImageMagick.dll.config 2015-07-19 19:57:29.000000000 +0000 @@ -1,4 +1,4 @@ - + Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/ImageMagick.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/MagickWand/MagickWand.cs keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/MagickWand/MagickWand.cs --- keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/bin/Debug/MagickWand/MagickWand.cs 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/ImageMagick/bin/Debug/MagickWand/MagickWand.cs 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -using System; -using System.Runtime.InteropServices; -using System.Collections; -using System.IO; -using ImageMagick.MagickCore; - -namespace ImageMagick.MagickWand -{ - public class MagickWand : ICloneable - { - // Inital impementation based on: - // http://www.toptensoftware.com/Articles/17/High-Quality-Image-Resampling-in-Mono-Linux - - protected IntPtr mWand = IntPtr.Zero; - - static MagickWand() - { - MagickWandGenesis(); - AppDomain.CurrentDomain.ProcessExit += (sender, e) => MagickWandTerminus(); - } - - protected MagickWand(IntPtr wand) - { - mWand = wand; - } - - public MagickWand() : this(NewMagickWand()) { } - - /// - /// Deallocates memory associated with an MagickWand - /// - ~MagickWand() - { - if (mWand != IntPtr.Zero) { - mWand = DestroyMagickWand(mWand); - } - } - - - #region Properties - - public ImageType ImageType - { - get { - return MagickGetImageType(mWand); - } - set { - if (!MagickSetImageType(mWand, value)) { - //TODO - implement exceptions - throw new Exception(); - } - } - } - - #endregion Properties - - - #region IClonable implementation - - /// - /// Makes an exact copy of the specified wand. - /// - public object Clone() - { - return new MagickWand(CloneMagickWand(mWand)); - } - - #endregion IClonable implementation - - - public bool EvaluateImage(MagickEvaluateOperator op, double value) - { - // TODO - implement exception checking - return MagickEvaluateImage(mWand, op, value); - } - - public byte[] GetImageBlob() - { - // Get the blob - IntPtr len; - IntPtr buf=MagickGetImageBlob(mWand, out len); - - // Copy it - var dest=new byte[len.ToInt32()]; - Marshal.Copy(buf, dest, 0, len.ToInt32()); - - // Relinquish - MagickRelinquishMemory(buf); - - return dest; - } - - public bool ReadImageBlob(byte[] blob) - { - GCHandle pinnedArray = GCHandle.Alloc(blob, GCHandleType.Pinned); - IntPtr pointer = pinnedArray.AddrOfPinnedObject(); - - bool result = MagickReadImageBlob(mWand, pointer, (IntPtr)blob.Length); - - pinnedArray.Free(); - // TODO - implement exception checking - return result; - } - - public bool ResizeImage(int width, int heigth, FilterType filter, double blur) - { - // TODO - implement exception checking - return MagickResizeImage(mWand, (IntPtr)width, (IntPtr)heigth, filter, blur); - } - - #region Magic Wand Methods - from magick-wand.c - - [DllImport("libMagickWand", EntryPoint = "ClearMagickWand")] - private static extern void ClearMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "CloneMagickWand")] - private static extern IntPtr CloneMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "DestroyMagickWand")] - private static extern IntPtr DestroyMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "IsMagickWand")] - private static extern bool IsMagickWand(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickClearException")] - private static extern bool MagickClearException(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetException")] - private static extern IntPtr MagickGetException(IntPtr wand, - ExceptionType severity); - - [DllImport("libMagickWand", EntryPoint = "MagickGetExceptionType")] - private static extern ExceptionType MagickGetExceptionType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetIteratorIndex")] - private static extern UIntPtr MagickGetIteratorIndex(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOption")] - private static extern IntPtr MagickQueryConfigureOption(string option); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryConfigureOptions")] - private static extern IntPtr MagickQueryConfigureOptions(string pattern, - [Out] out UIntPtr number_options); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFontMetrics")] - private static extern IntPtr MagickQueryFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryMultilineFontMetrics")] - private static extern IntPtr MagickQueryMultilineFontMetrics(IntPtr wand, - IntPtr drawing_wand, - string text); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFonts")] - private static extern IntPtr MagickQueryFonts(string pattern, - [Out] out UIntPtr number_fonts); - - [DllImport("libMagickWand", EntryPoint = "MagickQueryFormats")] - private static extern IntPtr MagickQueryFormats(string pattern, - [Out] out UIntPtr number_formats); - - [DllImport("libMagickWand", EntryPoint = "MagickRelinquishMemory")] - private static extern IntPtr MagickRelinquishMemory(IntPtr resource); - - [DllImport("libMagickWand", EntryPoint = "MagickSetFirstIterator")] - private static extern void MagickSetFirstIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResetIterator")] - private static extern void MagickResetIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickSetIteratorIndex")] - private static extern bool MagickSetIteratorIndex(IntPtr wand, IntPtr index); - - [DllImport("libMagickWand", EntryPoint = "MagickSetLastIterator")] - private static extern void MagickSetLastIterator(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickWandGenesis")] - private static extern void MagickWandGenesis(); - - [DllImport("libMagickWand", EntryPoint = "MagickWandTerminus")] - private static extern void MagickWandTerminus(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWand")] - private static extern IntPtr NewMagickWand(); - - [DllImport("libMagickWand", EntryPoint = "NewMagickWandFromImage")] - private static extern IntPtr NewMagickWandFromImage(IntPtr image); - - #endregion Magic Wand Methods - from magick-wand.c - - - [DllImport("libMagickWand", EntryPoint = "MagickEvaluateImage")] - private static extern bool MagickEvaluateImage(IntPtr wand, - MagickEvaluateOperator op, - double value); - - [DllImport("libMagickWand", EntryPoint = "MagickFunctionImage")] - private static extern bool MagickFunctionImage(IntPtr wand, - MagickFunction function, - UIntPtr number_arguments, - double[] arguments); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageBlob")] - private static extern IntPtr MagickGetImageBlob(IntPtr wand, - [Out] out IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageHeight")] - private static extern IntPtr MagickGetImageHeight(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageType")] - private static extern ImageType MagickGetImageType(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickGetImageWidth")] - private static extern IntPtr MagickGetImageWidth(IntPtr wand); - - [DllImport("libMagickWand", EntryPoint = "MagickResizeImage")] - private static extern bool MagickResizeImage(IntPtr mgck_wand, - IntPtr columns, - IntPtr rows, - FilterType filter_type, - double blur); - - [DllImport("libMagickWand", EntryPoint = "MagickReadImageBlob")] - private static extern bool MagickReadImageBlob(IntPtr wand, - IntPtr blob, - IntPtr length); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageOpacity")] - private static extern bool MagickSetImageOpacity(IntPtr wand, - double alpha); - - [DllImport("libMagickWand", EntryPoint = "MagickSetImageType")] - private static extern bool MagickSetImageType(IntPtr wand, - ImageType image_type); - - } -} Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/obj/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ImageMagick/obj/Debug/ImageMagick.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/ImageMagick/obj/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/ImageMagick/obj/Debug/ImageMagick.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/Keebuntu.sln keepass2-plugin-ubuntu-0.5.7/Keebuntu.sln --- keepass2-plugin-ubuntu-0.5.6.1/Keebuntu.sln 2015-04-12 19:23:08.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/Keebuntu.sln 2015-07-19 20:36:11.000000000 +0000 @@ -255,6 +255,6 @@ $38.IncludeInstanceMembers = True $38.IncludeStaticEntities = True description = Ubuntu Unity integration for KeePass 2.x - version = 0.5.6 + version = 0.5.7 EndGlobalSection EndGlobal diff -Nru keepass2-plugin-ubuntu-0.5.6.1/Keebuntu.userprefs keepass2-plugin-ubuntu-0.5.7/Keebuntu.userprefs --- keepass2-plugin-ubuntu-0.5.6.1/Keebuntu.userprefs 2014-12-21 03:35:10.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/Keebuntu.userprefs 2015-07-19 20:36:11.000000000 +0000 @@ -1,16 +1,23 @@  - + + + + + + - + - + + + \ No newline at end of file diff -Nru keepass2-plugin-ubuntu-0.5.6.1/libunity-sharp/obj/Release/libunity-sharp.csproj.FilesWrittenAbsolute.txt keepass2-plugin-ubuntu-0.5.7/libunity-sharp/obj/Release/libunity-sharp.csproj.FilesWrittenAbsolute.txt --- keepass2-plugin-ubuntu-0.5.6.1/libunity-sharp/obj/Release/libunity-sharp.csproj.FilesWrittenAbsolute.txt 1970-01-01 00:00:00.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/libunity-sharp/obj/Release/libunity-sharp.csproj.FilesWrittenAbsolute.txt 2014-08-20 00:16:55.000000000 +0000 @@ -0,0 +1 @@ +/home/david/work/Keebuntu/libunity-sharp/obj/Release/.NETFramework,Version=v4.0.AssemblyAttribute.cs diff -Nru keepass2-plugin-ubuntu-0.5.6.1/README.md keepass2-plugin-ubuntu-0.5.7/README.md --- keepass2-plugin-ubuntu-0.5.6.1/README.md 2015-03-31 16:58:21.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/README.md 2015-07-19 19:57:29.000000000 +0000 @@ -63,6 +63,7 @@ Tested with the following desktops: * Cinnamon * GNOME Shell (requires [appindicator plugin](https://extensions.gnome.org/extension/615/appindicator-support/)) +* KDE * Unity * Xfce Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/DBus.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/DBus.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/DBus.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/DBus.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/ImageMagick.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/ImageMagick.dll differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.config keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.config --- keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.config 2014-07-31 20:57:06.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.config 2015-07-19 19:57:29.000000000 +0000 @@ -1,4 +1,4 @@ - + Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/ImageMagick.dll.mdb differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/KeebuntuUnityLauncher.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/KeebuntuUnityLauncher.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/KeebuntuUnityLauncher.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/KeebuntuUnityLauncher.dll.mdb differ diff -Nru keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/KeePass.config.xml keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/KeePass.config.xml --- keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/KeePass.config.xml 2014-12-20 04:23:13.000000000 +0000 +++ keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/KeePass.config.xml 2015-07-19 20:05:13.000000000 +0000 @@ -1,21 +1,144 @@ - - - - - false - true - - - - - - - false - false - true - - - - false - - + + + + false + true + + + + + Obf + NoSave + + + 12 + + + + + false + false + + + + + + + + + + -16381 + -16381 + -16381 + -16381 + true + 0.83333333333333337 + 0.25 + Default + + + + + + Title + 138 + + + UserName + 138 + + + Password + 138 + true + + + Url + 138 + + + Notes + 138 + + + 0 1 2 3 4 + + Ascending + + + + + + + Microsoft Sans Serif + 8.25 + Point + + false + + + Courier New + 8.25 + Point + + false + + WinVistaBlack + + Microsoft Sans Serif + 8.25 + Point + + false + + 0 + 0 + 0 + + + + 0 + 0 + + + + 0 + 0 + + + + + + CharSet + 20 + ULD_______ + + + CharSet + 20 + ULD_______ + + + + + 2 + + InvariantCultureIgnoreCase + + + + + 0 + 0 + 0 + 0 + + 1 + + + false + System + Auto + + + \ No newline at end of file Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/KeePass.exe and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/KeePass.exe differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/libdbusmenu-glib-sharp.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/libdbusmenu-glib-sharp.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/bin/Debug/libunity-sharp.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/bin/Debug/libunity-sharp.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/obj/Debug/KeebuntuUnityLauncher.dll and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/obj/Debug/KeebuntuUnityLauncher.dll differ Binary files /tmp/64TVRQruAd/keepass2-plugin-ubuntu-0.5.6.1/UnityLauncherPlugin/obj/Debug/KeebuntuUnityLauncher.dll.mdb and /tmp/2yps_6qvvg/keepass2-plugin-ubuntu-0.5.7/UnityLauncherPlugin/obj/Debug/KeebuntuUnityLauncher.dll.mdb differ