rpms/parcellite/F-9 parcellite-0.9-de.po.patch, NONE, 1.1 parcellite-0.9-main.c.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 parcellite.spec, 1.2, 1.3 sources, 1.3, 1.4

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/parcellite/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4841/F-9

Modified Files:
	.cvsignore parcellite.spec sources 
Added Files:
	parcellite-0.9-de.po.patch parcellite-0.9-main.c.patch 
Log Message:
* Sun Nov 23 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9-1
- Update to 0.9
- Fix Control+Click behaviour
- Small corrections to German translation


parcellite-0.9-de.po.patch:

--- NEW FILE parcellite-0.9-de.po.patch ---
--- parcellite-0.9.orig/po/de.po	2008-11-21 00:58:40.000000000 +0100
+++ parcellite-0.9/po/de.po	2008-11-23 16:20:24.000000000 +0100
@@ -24,7 +24,7 @@
 #: ../src/main.c:159 ../src/main.c:758 ../data/parcellite.desktop.in.h:1
 #: ../data/parcellite-startup.desktop.in.h:1
 msgid "Clipboard Manager"
-msgstr "Zwischenablage-Manager"
+msgstr "Zwischenablagen-Manager"
 
 #: ../src/main.c:182
 msgid "Could not create thread for executed action\n"
@@ -40,7 +40,7 @@
 
 #: ../src/main.c:294
 msgid "Save changes"
-msgstr "Änderungen Speichern"
+msgstr "Änderungen speichern"
 
 #: ../src/main.c:304
 msgid "Discard changes"
@@ -52,7 +52,7 @@
 
 #: ../src/main.c:394
 msgid "Lightweight GTK+ clipboard manager."
-msgstr "Ein GTK+-Manager für die Zwischenablage."
+msgstr "Ein schlanker GTK+-Manager für die Zwischenablage."
 
 #: ../src/main.c:480
 msgid "<b>None</b>"
@@ -112,7 +112,7 @@
 "Report bugs to <xyhthyx at gmail.com>."
 msgstr ""
 "Entwickelt von Gilberto \"Xyhthyx\" Miralla.\n"
-"Melden Sie bitte Fehler an <xyhthyx at gmail.com>."
+"Melden Sie Fehler bitte an <xyhthyx at gmail.com>."
 
 #. Create the dialog
 #: ../src/preferences.c:371
@@ -124,17 +124,17 @@
 msgstr "Verhalten"
 
 #: ../src/preferences.c:394
-#, fuzzy
 msgid "<b>Clipboards</b>"
-msgstr "<b>Zwischenablage</b>"
+msgstr "<b>Zwischenablagen</b>"
 
 #: ../src/preferences.c:401
 msgid "Use _Copy (Ctrl-C)"
 msgstr "Kopieren benutzen (Ctrl-C)"
 
 #: ../src/preferences.c:403
+#, fuzzy
 msgid "Use _Primary (Selection)"
-msgstr "Kopieren benutzen (Ctrl-C)"
+msgstr "_Primäre Zwischenablage benutzen (Auswahl)"
 
 #: ../src/preferences.c:411
 msgid "<b>History</b>"
@@ -157,9 +157,8 @@
 msgstr "<b>Verschiedenes</b>"
 
 #: ../src/preferences.c:443
-#, fuzzy
 msgid "Capture _hyperlinks only"
-msgstr "Erfasse nur Links"
+msgstr "Nur Hyperlinks erfassen"
 
 #: ../src/preferences.c:445
 msgid "C_onfirm before clearing history"
@@ -187,11 +186,11 @@
 
 #: ../src/preferences.c:486
 msgid "<b>Omitting</b>"
-msgstr "<b>Ignorieren</b>"
+msgstr "<b>Kürzen</b>"
 
 #: ../src/preferences.c:495
 msgid "Omit items in the:"
-msgstr "Ignoriere Einträge in:"
+msgstr "Einträge kürzen:"
 
 #: ../src/preferences.c:499
 msgid "Beginning"
@@ -212,7 +211,7 @@
 #. Build the actions label
 #: ../src/preferences.c:513
 msgid "Control-click Parcellite's tray icon to use actions"
-msgstr "Um Aktionen auszuführen auf das Parcellite-Symbol klicken"
+msgstr "Um Aktionen auszuführen bei gedrückter STRG-Taste auf das Parcellite-Symbol klicken"
 
 #: ../src/preferences.c:533
 msgid "Action"

parcellite-0.9-main.c.patch:

--- NEW FILE parcellite-0.9-main.c.patch ---
--- src/main.c	2008-11-20 19:58:37.000000000 -0400
+++ src/main2.c	2008-11-23 17:30:49.000000000 -0400
@@ -694,18 +694,21 @@
 status_icon_clicked(GtkStatusIcon *status_icon, gpointer user_data)
 {
   /* Check what type of click was recieved */
-  GdkEvent* current_event = gtk_get_current_event();
+  GdkModifierType state;
+  gtk_get_current_event_state(&state);
   /* Control click */
-  if (current_event->button.state == (GDK_MOD2_MASK | GDK_CONTROL_MASK))
+  if (state == GDK_MOD2_MASK+GDK_CONTROL_MASK || state == GDK_CONTROL_MASK)
   {
-    if (!actions_lock)
+    if (actions_lock == FALSE)
+    {
       g_timeout_add(POPUP_DELAY, show_actions_menu, NULL);
+    }
   }
   /* Normal click */
   else
+  {
     g_timeout_add(POPUP_DELAY, show_history_menu, NULL);
-  /* Free the event */
-  gdk_event_free(current_event);
+  }
 }
 
 /* Called when history global hotkey is pressed */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parcellite/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Aug 2008 22:46:14 -0000	1.3
+++ .cvsignore	23 Nov 2008 22:42:54 -0000	1.4
@@ -1 +1 @@
-parcellite-0.8.tar.gz
+parcellite-0.9.tar.gz


Index: parcellite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parcellite/F-9/parcellite.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parcellite.spec	13 Aug 2008 22:46:15 -0000	1.2
+++ parcellite.spec	23 Nov 2008 22:42:54 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           parcellite
-Version:        0.8
+Version:        0.9
 Release:        1%{?dist}
 Summary:        A lightweight GTK+ clipboard manager
 
@@ -7,6 +7,10 @@
 License:        GPLv3+
 URL:            http://parcellite.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/parcellite/parcellite-%{version}.tar.gz
+# submitted upstream and to German translator by mail on Nov 23 2008
+Patch0:         parcellite-0.9-de.po.patch
+# received from upstream by mail on Nov 23 2008
+Patch1:         parcellite-0.9-main.c.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.10.0 
@@ -23,9 +27,8 @@
 
 %prep
 %setup -q
-# quick fix for desktop file
-echo "Type=Application" >> %{name}-startup.desktop
-
+%patch0 -p1 -b .orig
+%patch1 -p0 -b .click
 
 %build
 %configure
@@ -64,13 +67,18 @@
 
 
 %changelog
-* Sat Apr 19 2008 Christoph Wickert <fedora christoph-wickert de> - 0.8-1
-- Update to 0.8.
+* Sun Nov 23 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.9-1
+- Update to 0.9
+- Fix Control+Click behaviour
+- Small corrections to German translation
+
+* Sat Apr 19 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.8-1
+- Update to 0.8
 
-* Sat Apr 19 2008 Christoph Wickert <fedora christoph-wickert de> - 0.7-2
+* Sat Apr 19 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.7-2
 - No longer require lxpanel
 - Preserve timestamps during install
 - Include NEWS in doc
 
-* Sat Apr 12 2008 Christoph Wickert <fedora christoph-wickert de> - 0.7-1
+* Sat Apr 12 2008 Christoph Wickert <cwickert at fedoraproject.org> - 0.7-1
 - Initial Fedora RPM


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parcellite/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Aug 2008 22:46:15 -0000	1.3
+++ sources	23 Nov 2008 22:42:54 -0000	1.4
@@ -1 +1 @@
-fa8944b30a23211b2281b9edb6ab6a70  parcellite-0.8.tar.gz
+1cc676e124a9c8a13d23130d852971e8  parcellite-0.9.tar.gz