[Python-apps-commits] r11384 - in packages/pdfshuffler/trunk/debian (2 files)

[sharky at users.alioth.debian.org]

    Date: Tuesday, October 7, 2014 @ 14:09:40
  Author: sharky
Revision: 11384

remove calls to deprecated GDK threading functions

Modified:
  packages/pdfshuffler/trunk/debian/changelog
  packages/pdfshuffler/trunk/debian/patches/fix-threading

Modified: packages/pdfshuffler/trunk/debian/changelog
===================================================================
--- packages/pdfshuffler/trunk/debian/changelog	2014-10-07 10:56:36 UTC (rev 11383)
+++ packages/pdfshuffler/trunk/debian/changelog	2014-10-07 14:09:40 UTC (rev 11384)
@@ -1,3 +1,9 @@
+pdfshuffler (0.6.0-7) unstable; urgency=medium
+
+  * Remove calls to deprecated GDK threading functions altogether.
+
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 07 Oct 2014 16:07:58 +0200
+
 pdfshuffler (0.6.0-6) unstable; urgency=medium
 
   * Fall back to PyPDF2 if pyPdf is not found (Closes: #762083).

Modified: packages/pdfshuffler/trunk/debian/patches/fix-threading
===================================================================
--- packages/pdfshuffler/trunk/debian/patches/fix-threading	2014-10-07 10:56:36 UTC (rev 11383)
+++ packages/pdfshuffler/trunk/debian/patches/fix-threading	2014-10-07 14:09:40 UTC (rev 11384)
@@ -10,9 +10,9 @@
 
     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758619
 
---- a/pdfshuffler/pdfshuffler.py	2012-04-28 16:15:17.000000000 +0200
-+++ b/pdfshuffler/pdfshuffler.py	2014-09-27 14:33:07.413122319 +0200
-@@ -326,11 +326,9 @@
+--- a/pdfshuffler/pdfshuffler.py
++++ b/pdfshuffler/pdfshuffler.py
+@@ -326,11 +326,9 @@ class PdfShuffler:
    
      def update_thumbnail(self, object, num, thumbnail, resample):
          row = self.model[num]
@@ -24,15 +24,11 @@
  
      def on_window_size_request(self, window, event):
          """Main Window resize - workaround for autosetting of
-@@ -1080,9 +1078,10 @@
+@@ -1079,7 +1077,6 @@ class PDF_Renderer(threading.Thread,gobj
+ 
  def main():
      """This function starts PdfShuffler"""
-     gtk.gdk.threads_init()
--    gobject.threads_init()
-+    gtk.gdk.threads_enter()
+-    gtk.gdk.threads_init()
+     gobject.threads_init()
      PdfShuffler()
      gtk.main()
-+    gtk.gdk.threads_leave()
- 
- if __name__ == '__main__':
-     main()