diff -Nru diodon-1.0.2/debian/bzr-builder.manifest diodon-1.0.3/debian/bzr-builder.manifest --- diodon-1.0.2/debian/bzr-builder.manifest 2013-05-03 19:05:39.000000000 +0000 +++ diodon-1.0.3/debian/bzr-builder.manifest 2013-07-13 14:25:17.000000000 +0000 @@ -1,3 +1,3 @@ # bzr-builder format 0.3 deb-version {debupstream}-0ubuntu0 -lp:diodon revid:os@esite.ch-20130503184311-sapg3etk0ylxzhdj -nest-part packaging lp:~diodon-team/diodon/ppa-packaging debian debian revid:os@esite.ch-20130221075822-4nvg3jw5k9iit95g +lp:diodon revid:os@esite.ch-20130713133452-h6cm4car7c8zzlmx +nest-part packaging lp:~diodon-team/diodon/ppa-packaging debian debian revid:os@esite.ch-20130713135131-8umbmsttqdd1lowq diff -Nru diodon-1.0.2/debian/changelog diodon-1.0.3/debian/changelog --- diodon-1.0.2/debian/changelog 2013-05-03 19:05:39.000000000 +0000 +++ diodon-1.0.3/debian/changelog 2013-07-13 14:25:17.000000000 +0000 @@ -1,8 +1,19 @@ -diodon (1.0.2-0ubuntu0~raring1) raring; urgency=low +diodon (1.0.3-0ubuntu0~raring1) raring; urgency=low * Auto build. - -- Oliver Sauder Fri, 03 May 2013 19:05:39 +0000 + -- Oliver Sauder Sat, 13 Jul 2013 14:25:17 +0000 + +diodon (1.0.3) unstable; urgency=low + + * Updated translations + * Improving plugin APIU + * Aded missing libgee-dev dependency to diodon-dev (LP: #1131073) + * Fixed regression key combination not working with locked keys (LP: #1154247) + * .intlcache not included in dist anymore (LP: #1154548) + * Using valac dependency instead of valac-0.16 + + -- Oliver Sauder Sat, 13 Jul 2013 16:42:44 +0300 diodon (1.0.2) unstable; urgency=low diff -Nru diodon-1.0.2/debian/control diodon-1.0.3/debian/control --- diodon-1.0.2/debian/control 2013-05-03 19:05:38.000000000 +0000 +++ diodon-1.0.3/debian/control 2013-07-13 14:25:16.000000000 +0000 @@ -19,7 +19,7 @@ libxtst-dev (>= 1.2.0), libzeitgeist-dev (>= 0.3.12), python, - valac-0.16 (>=0.16.0) + valac (>=0.16.0) Standards-Version: 3.9.4 Homepage: https://launchpad.net/diodon Vcs-Bzr: lp:diodon diff -Nru diodon-1.0.2/libdiodon/clipboard-model.vala diodon-1.0.3/libdiodon/clipboard-model.vala --- diodon-1.0.2/libdiodon/clipboard-model.vala 2013-05-03 19:05:36.000000000 +0000 +++ diodon-1.0.3/libdiodon/clipboard-model.vala 2013-07-13 14:25:15.000000000 +0000 @@ -152,14 +152,22 @@ * Select clipboard item. * * @param item item to be selected + * @param use_clipboard whether item gets selected for clipboard + * @param use_primary whether item gets selected for primary selection */ - public void select_item(IClipboardItem item) + public void select_item(IClipboardItem item, bool use_clipboard, bool use_primary) { // selected item is always at the end of history storage.remove_item(item); storage.add_item(item); - current_items.set(item.get_clipboard_type(), item); + // verify that current items are selected correctly + if(use_clipboard) { + current_items.set(ClipboardType.CLIPBOARD, item); + } + if(use_primary) { + current_items.set(ClipboardType.PRIMARY, item); + } } /** diff -Nru diodon-1.0.2/libdiodon/controller.vala diodon-1.0.3/libdiodon/controller.vala --- diodon-1.0.2/libdiodon/controller.vala 2013-05-03 19:05:36.000000000 +0000 +++ diodon-1.0.3/libdiodon/controller.vala 2013-07-13 14:25:15.000000000 +0000 @@ -196,7 +196,8 @@ */ public void select_item(IClipboardItem item) { - clipboard_model.select_item(item); + clipboard_model.select_item(item, configuration_model.use_clipboard, + configuration_model.use_primary); on_select_item(item); diff -Nru diodon-1.0.2/libdiodon/keybinding-manager.vala diodon-1.0.3/libdiodon/keybinding-manager.vala --- diodon-1.0.2/libdiodon/keybinding-manager.vala 2013-05-03 19:05:36.000000000 +0000 +++ diodon-1.0.3/libdiodon/keybinding-manager.vala 2013-07-13 14:25:15.000000000 +0000 @@ -249,9 +249,6 @@ { X.Event* xevent = (X.Event*) gdk_xevent; - debug("Event filter hit: %d, %d", - xevent.type, gdk_event.type); - if(xevent->type == X.EventType.KeyPress) { debug("Key pressed, keycode: %u, modifiers: %u", xevent->xkey.keycode, xevent->xkey.state); diff -Nru diodon-1.0.2/po/LINGUAS diodon-1.0.3/po/LINGUAS --- diodon-1.0.2/po/LINGUAS 2013-05-03 19:05:36.000000000 +0000 +++ diodon-1.0.3/po/LINGUAS 2013-07-13 14:25:15.000000000 +0000 @@ -10,6 +10,7 @@ it lt nb +nl pt_BR ru se diff -Nru diodon-1.0.2/po/nl.po diodon-1.0.3/po/nl.po --- diodon-1.0.2/po/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ diodon-1.0.3/po/nl.po 2013-07-13 14:25:15.000000000 +0000 @@ -0,0 +1,234 @@ +# Dutch translation for diodon +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the diodon package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: diodon\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-10-24 21:43+0200\n" +"PO-Revision-Date: 2013-05-23 19:02+0000\n" +"Last-Translator: rob \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-05-24 06:01+0000\n" +"X-Generator: Launchpad (build 16640)\n" + +#: ../data/diodon.desktop.in.h:1 ../plugins/unitylens/diodon.lens.in.in.h:1 +msgid "Clipboard Manager" +msgstr "Klembordbeheer" + +#: ../data/diodon.desktop.in.h:2 ../plugins/unitylens/diodon.lens.in.in.h:2 +msgid "GTK+ Clipboard Manager" +msgstr "GTK+-klembordbeheer" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:1 +msgid "Use clipboard (Ctrl+C)" +msgstr "Klembord gebruiken (Ctrl+C)" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:2 +#: ../data/preferences.ui.h:3 +msgid "" +"Adds the text which is copied to the clipboard with e.g. Ctrl + C to the " +"clipboard history." +msgstr "" +"Voegt de tekst, die gekopieerd is naar het klembord via bijvoorbeeld Ctrl + " +"C, toe aan de klembordgeschiedenis." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:3 +msgid "Use primary selection" +msgstr "Primaire selectie gebruiken" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:4 +#: ../data/preferences.ui.h:5 +msgid "" +"Adds the primary selection (an area of the screen which is selected with the " +"mouse) to the clipboard history." +msgstr "" +"Voegt de primaire selectie (een gebied van het scherm dat geselecteerd is " +"met de muis) toe aan de klembordgeschiedenis." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:5 +msgid "Synchronize clipboards" +msgstr "Klemborden synchroniseren" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:6 +#: ../data/preferences.ui.h:7 +msgid "" +"Synchronizes the selection (an area of the screen which is selected with the " +"mouse) and the clipboard so that anything in the selection is immediately " +"available in the clipboard and vice versa e.g. for pasting with Ctrl + V and " +"the middle mouse button." +msgstr "" +"Synchroniseert de selectie (een gebied van het scherm dat geselecteerd is " +"met de muis) en het klembord zodat de selectie direct beschikbaar is in het " +"klembord en vice versa, bijvoorbeeld voor het plakken via Ctrl + V en de " +"middelste muisknop." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:7 +msgid "Keep clipboard content" +msgstr "Klembordinhoud behouden" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:8 +#: ../data/preferences.ui.h:9 +msgid "" +"Prevents an empty clipboard. For instance when an application exits, the " +"clipboard would usually be emptied." +msgstr "" +"Voorkomt een leeg klembord. Wanneer een toepassing bijvoorbeeld afgesloten " +"wordt, dan wordt het klembord gewoonlijk gewist." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:9 +msgid "Automatically paste selected item" +msgstr "Geselecteerd onderdeel automatisch plakken" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:10 +#: ../data/preferences.ui.h:11 +msgid "" +"Automatically paste selected item instead of just copying it to the " +"clipboard." +msgstr "" +"Geselecteerde onderdeel automatisch plakken in plaats van het alleen te " +"kopiëren naar het klembord." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:11 +#: ../data/preferences.ui.h:13 +msgid "Clipboard size" +msgstr "Klembordgrootte" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:12 +#: ../data/preferences.ui.h:12 +msgid "Number of items in the clipboard history." +msgstr "Aantal onderdelen in de klembordgeschiedenis." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:13 +#: ../data/preferences.ui.h:16 +msgid "History key" +msgstr "Sneltoets klembordgeschiedenis" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:14 +#: ../data/preferences.ui.h:15 +msgid "Hotkey to quickly allow you to access the clipboard history." +msgstr "Toets voor snelle toegang tot de klembordgeschiedenis." + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:15 +msgid "Active plugins" +msgstr "Actieve plug-ins" + +#: ../data/net.launchpad.Diodon.gschema.xml.in.in.h:16 +msgid "List of active plugins." +msgstr "Lijst met actieve plug-ins" + +#: ../data/preferences.ui.h:1 +msgid "Diodon Preferences" +msgstr "Diodon-voorkeuren" + +#: ../data/preferences.ui.h:2 +msgid "_Use clipboard (Ctrl+C)" +msgstr "Klembord gebr_uiken (Ctrl+C)" + +#: ../data/preferences.ui.h:4 +msgid "Use _primary selection" +msgstr "_Primaire selectie gebruiken" + +#: ../data/preferences.ui.h:6 +msgid "S_ynchronize clipboards" +msgstr "Klemborden s_ynchroniseren" + +#: ../data/preferences.ui.h:8 +msgid "_Keep clipboard content" +msgstr "_Klembordinhoud behouden" + +#: ../data/preferences.ui.h:10 +msgid "_Automatically paste selected item" +msgstr "Geselecteerde onderdeel _automatisch plakken" + +#: ../data/preferences.ui.h:14 +msgid "Clipboard" +msgstr "Klembord" + +#: ../data/preferences.ui.h:17 +msgid "Hotkeys" +msgstr "Sneltoetsen" + +#: ../data/preferences.ui.h:18 +msgid "Plugins" +msgstr "Plug-ins" + +#: ../libdiodon/clipboard-menu.vala:42 +msgid "" +msgstr "" + +#: ../plugins/indicator/indicator.plugin.in.h:1 +msgid "Application Indicator" +msgstr "Toepassingsindicator" + +#: ../plugins/indicator/indicator.plugin.in.h:2 +msgid "Access clipboard history with an application indicator." +msgstr "Toegang tot de klembordgeschiedenis via een toepassingsindicator." + +#: ../plugins/indicator/indicator.plugin.in.h:3 +#: ../plugins/unitylens/unitylens.plugin.in.h:3 +msgid "Copyright © 2011 Diodon Team" +msgstr "Copyright © 2011 Diodon-team" + +#: ../plugins/unitylens/diodon.lens.in.in.h:3 +msgid "Search clipboard" +msgstr "Klembord doorzoeken" + +#: ../plugins/unitylens/unity-lens-plugin.vala:95 +msgid "Search Clipboard" +msgstr "Klembord doorzoeken" + +#: ../plugins/unitylens/unity-lens-plugin.vala:147 +#: ../plugins/unitylens/unity-lens-plugin.vala:171 +msgid "Text" +msgstr "Tekst" + +#: ../plugins/unitylens/unity-lens-plugin.vala:151 +#: ../plugins/unitylens/unity-lens-plugin.vala:172 +msgid "Files" +msgstr "Bestanden" + +#: ../plugins/unitylens/unity-lens-plugin.vala:155 +#: ../plugins/unitylens/unity-lens-plugin.vala:173 +msgid "Images" +msgstr "Afbeeldingen" + +#: ../plugins/unitylens/unity-lens-plugin.vala:169 +msgid "Type" +msgstr "Type" + +#: ../plugins/unitylens/unity-lens-plugin.vala:202 +msgid "Sorry, there is no clipboard content that matches your search." +msgstr "" +"Sorry, er is geen klembordinhoud gevonden die overeenkomt met uw " +"zoekopdracht." + +#: ../plugins/unitylens/unity-lens-plugin.vala:269 +msgid "Copy to clipboard" +msgstr "Kopiëren naar klembord" + +#: ../plugins/unitylens/unitylens.plugin.in.h:1 +msgid "Unity Lens" +msgstr "Unity-lens" + +#: ../plugins/unitylens/unitylens.plugin.in.h:2 +msgid "Access clipboard history with the unity dash." +msgstr "Toegang tot de klembordgeschiedenis via de Unity-Snelzoeker." + +#: ../plugins/zeitgeist/zeitgeist.plugin.in.h:1 +msgid "Zeitgeist Data-Source" +msgstr "Zeitgeist-databron" + +#: ../plugins/zeitgeist/zeitgeist.plugin.in.h:2 +msgid "Adds clipboard activities as events to the Zeitgeist daemon." +msgstr "" +"Voegt klembordactiviteiten toe als gebeurtenissen aan de Zeitgeist-daemon." + +#: ../plugins/zeitgeist/zeitgeist.plugin.in.h:3 +msgid "Copyright © 2012 Diodon Team" +msgstr "Copyright © 2012 Diodon-team" diff -Nru diodon-1.0.2/wscript diodon-1.0.3/wscript --- diodon-1.0.2/wscript 2013-05-03 19:05:36.000000000 +0000 +++ diodon-1.0.3/wscript 2013-07-13 14:25:15.000000000 +0000 @@ -7,7 +7,7 @@ from waflib.Tools import waf_unit_test NAME = 'Diodon' -VERSION = '1.0.2' +VERSION = '1.0.3' APPNAME = 'diodon' WEBSITE = 'https://launchpad.net/diodon' COPYRIGHT = 'Copyright \xc2\xa9 2010 Diodon Team'