Bug#463644: gnomekeyring: find_network_password_sync returns None instead of results

[Justin Mazzola Paluska]

Package: python-gnome2-desktop
Version: 2.20.0-1.jmp3
Severity: normal
Tags: patch

The find_network_password_sync function of the gnomekeyring module
constructs, when it finds a match returns None instead of the matches
it should return.  (See bug #463494 for what it does with no match.)
This is silly, because it even constructs the list of matches in
Python!

The attached patch should fix the problems.

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-686 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages python-gnome2-desktop depends on:
ii  libart-2.0-2           2.3.19-3          Library of functions for 2D graphi
ii  libatk1.0-0            1.20.0-1          The ATK accessibility toolkit
ii  libbonobo2-0           2.20.3-1          Bonobo CORBA interfaces library
ii  libbonoboui2-0         2.20.0-1          The Bonobo UI library
ii  libc6                  2.7-6             GNU C Library: Shared libraries
ii  libcairo2              1.4.14-1          The Cairo 2D vector graphics libra
ii  libdbus-1-3            1.1.2-1           simple interprocess messaging syst
ii  libffi4                4.3-20080116-1    Foreign Function Interface library
ii  libgconf2-4            2.20.1-2+b1       GNOME configuration database syste
ii  libglade2-0            1:2.6.2-1         library to load .glade files at ru
ii  libglib2.0-0           2.14.5-2          The GLib library of C routines
ii  libgnome-desktop-2     2.20.3-1          Utility library for loading .deskt
ii  libgnome-keyring0      2.20.3-1          GNOME keyring services library
ii  libgnome-media0        2.20.1-3          runtime libraries for the GNOME me
ii  libgnome2-0            2.20.1.1-1        The GNOME 2 library - runtime file
ii  libgnomecanvas2-0      2.20.1.1-1        A powerful object-oriented display
ii  libgnomeprint2.2-0     2.18.0-2          The GNOME 2.2 print architecture -
ii  libgnomeprintui2.2-0   2.18.1-1          GNOME 2.2 print architecture User 
ii  libgnomeui-0           2.20.1.1-1        The GNOME 2 libraries (User Interf
ii  libgnomevfs2-0         1:2.20.1-1        GNOME Virtual File System (runtime
ii  libgtk2.0-0            2.12.5-2          The GTK+ graphical user interface 
ii  libgtksourceview1.0-0  1.8.5-1           shared libraries for the GTK+ synt
ii  libgtop2-7             2.20.1-1          gtop system monitoring library
ii  libhal1                0.5.10-5          Hardware Abstraction Layer - share
ii  libice6                2:1.0.4-1         X11 Inter-Client Exchange library
ii  libmetacity0           1:2.20.2-1        library of lightweight GTK2 based 
ii  libnautilus-burn4      2.20.0-1          Nautilus Burn Library - runtime ve
ii  liborbit2              1:2.14.10-0.1     libraries for ORBit2 - a CORBA ORB
ii  libpanel-applet2-0     2.20.3-1          library for GNOME Panel applets
ii  libpango1.0-0          1.18.4-1          Layout and rendering of internatio
ii  libpopt0               1.10-3            lib for parsing cmdline parameters
ii  librsvg2-2             2.18.2-1          SAX-based renderer library for SVG
ii  libsm6                 2:1.0.3-1+b1      X11 Session Management library
ii  libstartup-notificatio 0.9-1             library for program launch feedbac
ii  libtotem-plparser7     2.20.3-1          Totem Playlist Parser library - ru
ii  libwnck22              2.20.3-1          Window Navigator Construction Kit 
ii  libxml2                2.6.31.dfsg-1     GNOME XML library
ii  python                 2.4.4-6           An interactive high-level object-o
ii  python-gtk2 [python2.5 2.12.1-1          Python bindings for the GTK+ widge
ii  python-pyorbit         2.14.3-2          A Python language binding for the 
ii  python-support         0.7.6             automated rebuilding support for p
pn  python2.4-gtk2         <none>            (no description available)
ii  zlib1g                 1:1.2.3.3.dfsg-11 compression library - runtime

python-gnome2-desktop recommends no packages.

-- no debconf information
-------------- next part --------------
diff -ru gnome-python-clean/gnome-python-desktop-2.20.0/gnomekeyring/gnomekeyring.override gnome-python/gnome-python-desktop-2.20.0/gnomekeyring/gnomekeyring.override
--- gnome-python-clean/gnome-python-desktop-2.20.0/gnomekeyring/gnomekeyring.override	2007-09-15 16:44:56.000000000 -0400
+++ gnome-python/gnome-python-desktop-2.20.0/gnomekeyring/gnomekeyring.override	2008-02-01 16:38:58.000000000 -0500
@@ -408,8 +408,7 @@
     gnome_keyring_network_password_list_free(result);
     if (pygnomekeyring_result_check(ret))
         return NULL;
-    Py_INCREF(Py_None);
-    return Py_None;
+    return py_result;
 }
 
 %%