[Goodies-commits] r6448 - in xfce4-clipman-plugin/trunk: . panel-plugin po
Mike Massonnet
mmassonnet at xfce.org
Tue Jan 13 13:49:52 CET 2009
Author: mmassonnet
Date: 2009-01-13 12:49:51 +0000 (Tue, 13 Jan 2009)
New Revision: 6448
Added:
xfce4-clipman-plugin/trunk/po/nl.po
Modified:
xfce4-clipman-plugin/trunk/ChangeLog
xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
xfce4-clipman-plugin/trunk/po/ChangeLog
xfce4-clipman-plugin/trunk/po/LINGUAS
Log:
- Lookup the GdkWindow of the owner to notice if the clipboard was set
from within Clipman and drop the IgnoreSignal variable (patch from
David Collins)
- Update the settings dialog
* nl.po: Add new Dutch translation (Vincent)
Modified: xfce4-clipman-plugin/trunk/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/ChangeLog 2009-01-12 23:35:23 UTC (rev 6447)
+++ xfce4-clipman-plugin/trunk/ChangeLog 2009-01-13 12:49:51 UTC (rev 6448)
@@ -1,7 +1,12 @@
+2008-01-13 Mike Massonnet <mmassonnet at xfce.org>
+
+ - Lookup the GdkWindow of the owner to notice if the clipboard was set
+ from within Clipman and drop the IgnoreSignal variable (patch from
+ David Collins)
+
2008-01-09 Mike Massonnet <mmassonnet at xfce.org>
-Update the settings dialog.
-
+ - Update the settings dialog
- Move everything to the General tab
2008-01-09 Mike Massonnet <mmassonnet at xfce.org>
Modified: xfce4-clipman-plugin/trunk/panel-plugin/clipman.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/clipman.c 2009-01-12 23:35:23 UTC (rev 6447)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman.c 2009-01-13 12:49:51 UTC (rev 6448)
@@ -43,7 +43,6 @@
/* For event-driven clipboard_change() function */
gboolean MouseSelecting=FALSE;
gboolean ShiftSelecting=FALSE;
-gboolean IgnoreSignal=FALSE;
/* Register the plugin */
static void
@@ -279,12 +278,8 @@
{
gboolean defaultcleared, primarycleared;
- /* This function will send a clipboard 'owner-change' signal which we will
- * ignore by setting IgnoreSignal to TRUE. */
-
/* Left mouse button - put item in BOTH clipboards */
if (ev->button == 1) {
- IgnoreSignal=TRUE;
gtk_clipboard_clear (defaultClip);
clipman_set_data (action->clip, defaultClip);
//gtk_clipboard_set_text (defaultClip, action->clip->data, -1);
@@ -292,7 +287,6 @@
DBG ("Clip copied to default clipboard");
if (action->clipman->AddSelect) {
- IgnoreSignal=TRUE;
gtk_clipboard_clear (primaryClip);
clipman_set_data (action->clip, primaryClip);
action->clipman->PrimaryIndex = action->index;
@@ -686,9 +680,9 @@
static void clipboard_changed(GtkClipboard *clipboard, GdkEvent *event, ClipmanPlugin *clipman) {
// Signal has been sent by this plugin
- if (IgnoreSignal) {
+ // (Found a GdkWindow that wraps the native X-window)
+ if (gdk_window_lookup(((GdkEventOwnerChange*)event)->owner)!=NULL) {
DBG("Signal Ignored");
- IgnoreSignal=FALSE;
return;
}
Modified: xfce4-clipman-plugin/trunk/po/ChangeLog
===================================================================
--- xfce4-clipman-plugin/trunk/po/ChangeLog 2009-01-12 23:35:23 UTC (rev 6447)
+++ xfce4-clipman-plugin/trunk/po/ChangeLog 2009-01-13 12:49:51 UTC (rev 6448)
@@ -1,3 +1,7 @@
+2009-01-xx Mike Massonnet <mmassonnet at xfce.org>
+
+ * nl.po: Add new Dutch translation (Vincent)
+
2009-01-13 Alexander Toresson <eulex at xfce.org>
* sv.po, LINGUAS: Swedish translation added (Daniel Nylander)
Modified: xfce4-clipman-plugin/trunk/po/LINGUAS
===================================================================
--- xfce4-clipman-plugin/trunk/po/LINGUAS 2009-01-12 23:35:23 UTC (rev 6447)
+++ xfce4-clipman-plugin/trunk/po/LINGUAS 2009-01-13 12:49:51 UTC (rev 6448)
@@ -1,2 +1,2 @@
# set of available languages (in alphabetic order)
-ar ca cs da de el en_GB es eu fr gl hu id it ja lv nb_NO pl pt_BR pt_PT sv tr uk ur zh_CN zh_TW
+ar ca cs da de el en_GB es eu fr gl hu id it ja lv nb_NO nl pl pt_BR pt_PT sv tr uk ur zh_CN zh_TW
Added: xfce4-clipman-plugin/trunk/po/nl.po
===================================================================
--- xfce4-clipman-plugin/trunk/po/nl.po (rev 0)
+++ xfce4-clipman-plugin/trunk/po/nl.po 2009-01-13 12:49:51 UTC (rev 6448)
@@ -0,0 +1,81 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: xfce4-clipman-plugin\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-09 14:34+0100\n"
+"PO-Revision-Date: 2009-01-09 18:55+0100\n"
+"Last-Translator: Vincent Tunru <projects at vinnl.nl>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../panel-plugin/clipman-dialogs.c:64
+#, c-format
+msgid "Unable to open the following url: %s"
+msgstr "Kon de volgende URL niet openen: %s"
+
+#: ../panel-plugin/clipman-dialogs.c:138
+#: ../panel-plugin/clipman.c:915
+msgid "Clipboard Manager"
+msgstr "Klembordbeheer"
+
+#: ../panel-plugin/clipman-dialogs.c:170
+msgid "Save clipboard contents on _exit"
+msgstr "Inhoud klembord opslaan bij _afsluiten"
+
+#: ../panel-plugin/clipman-dialogs.c:177
+msgid "A_dd selections to the history"
+msgstr "Selecties aan de geschiedenis _toevoegen"
+
+#: ../panel-plugin/clipman-dialogs.c:184
+msgid "_Show item numbers"
+msgstr "Getallen _weergeven"
+
+#: ../panel-plugin/clipman-dialogs.c:191
+msgid "<b>General</b>"
+msgstr "<b>Algemeen</b>"
+
+#: ../panel-plugin/clipman-dialogs.c:207
+msgid "Clipboard history items:"
+msgstr "Items onthouden:"
+
+#: ../panel-plugin/clipman-dialogs.c:231
+msgid "Menu item characters:"
+msgstr "Tekens in het menu:"
+
+#: ../panel-plugin/clipman-dialogs.c:253
+msgid "<b>Numbers</b>"
+msgstr "<b>Hoeveelheden</b>"
+
+#. *
+#. * Notebook label
+#. *
+#: ../panel-plugin/clipman-dialogs.c:261
+msgid "General"
+msgstr "Algemeen"
+
+#: ../panel-plugin/clipman.c:98
+msgid "Are you sure you want to clear the history?"
+msgstr "Geschiedenis wissen?"
+
+#: ../panel-plugin/clipman.c:456
+msgid "Clear History"
+msgstr "Geschiedenis wissen"
+
+#: ../panel-plugin/clipman.c:550
+msgid "Clipman History"
+msgstr "Geschiedenis klembord"
+
+#: ../panel-plugin/clipman.c:563
+msgid "< Clipboard Empty >"
+msgstr "< Leeg klembord >"
+
+#: ../panel-plugin/clipman.desktop.in.in.h:1
+msgid "Clipboard manager for the Xfce desktop"
+msgstr "Klembordbeheer voor Xfce"
+
+#: ../panel-plugin/clipman.desktop.in.in.h:2
+msgid "Clipman"
+msgstr "Clipman"
+
More information about the Goodies-commits
mailing list