kid3 wrong patch

[Christian Mangold]

Hi everyone,

I got attached patch from upstream, because the one I included is wrong. As I 
do not have any time to fix this, I am forwarding to this list. Probably 
someone can have a look at it?

Christian

----------  Weitergeleitete Nachricht  ----------

> Great. However, the fix_gnome_file_dialog.diff patch is not correctly
> included in the Ubuntu kid3 sources:
> The correct version is
> ----------
> Index: kid3-1.2/kid3/kid3.cpp
> ===================================================================
> --- kid3-1.2.orig/kid3/kid3.cpp	2009-04-28 20:20:27.000000000 +0200
> +++ kid3-1.2/kid3/kid3.cpp	2009-10-06 18:02:43.273594704 +0200
> @@ -1482,7 +1482,9 @@
>  			if (start != -1 && end != -1 && end > start) {
>  				filter = filter.mid(start + 1, end - start - 1);
>  			}
> -			s_miscCfg.m_nameFilter = filter;
> +			if (!filter.isEmpty()) {
> +				s_miscCfg.m_nameFilter = filter;
> +			}
>  			openDirectory(dir);
>  		}
>  	}
> ----------
> 
> The version in kid3_1.2-1ubuntu5.diff.gz is:
> ----------
> Index: kid3-1.2/kid3/kid3.cpp
> ===================================================================
> --- kid3-1.2.orig/kid3/kid3.cpp	2009-10-07 00:51:03.933252564 +0200
> +++ kid3-1.2/kid3/kid3.cpp	2009-10-07 00:52:49.137259288 +0200
> @@ -1483,6 +1483,9 @@
>  				filter = filter.mid(start + 1, end - start - 1);
>  			}
>  			s_miscCfg.m_nameFilter = filter;
> +                        if (!filter.isEmpty()) {
> +                                s_miscCfg.m_nameFilter = filter;
> +                        }
>  			openDirectory(dir);
>  		}
>  	}
> ----------
> 
> The important difference is the '-' at the beginning of the line
> "s_miscCfg.m_nameFilter = filter;", without the minus, the line is not
> removed and the patch does not work. I have attached the correct
> version of the patch.
> 
> Regards,
> Urs

-------------------------------------------------------------
-- 
neversfelde at jabber.neversfelde.de
neversfelde on irc.freenode.net
http://launchpad.net/~neversfelde
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_gnome_file_dialog.diff
Type: application/octet-stream
Size: 504 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20091013/dede1201/attachment.obj 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : https://lists.ubuntu.com/archives/kubuntu-devel/attachments/20091013/dede1201/attachment.pgp