Gentoo Archives: gentoo-commits

From:	"Matthias Schwarzott (zzam)" <zzam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] gentoo-x86 commit in media-plugins/vdr-tvonscreen/files: vdr-tvonscreen-1.0.141-logo-path.diff
Date:	Wed, 25 Feb 2009 15:53:01
Message-Id:	`E1LcM48-0002vI-Vu@stork.gentoo.org`

1	zzam 09/02/25 15:52:56
2
3	Added: vdr-tvonscreen-1.0.141-logo-path.diff
4	Log:
5	Fix default logo path, to match the logos installed by x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on vdr-channel-logos now.
6	(Portage version: 2.1.6.7/cvs/Linux i686)
7
8	Revision Changes Path
9	1.1 media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
10
11	file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff?rev=1.1&view=markup
12	plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff?rev=1.1&content-type=text/plain
13
14	Index: vdr-tvonscreen-1.0.141-logo-path.diff
15	===================================================================
16	diff -ru tvonscreen-1.0.141.orig/magazine.c tvonscreen-1.0.141/magazine.c
17	--- tvonscreen-1.0.141.orig/magazine.c 2009-02-25 16:39:18.024158328 +0100
18	+++ tvonscreen-1.0.141/magazine.c 2009-02-25 16:39:51.401402805 +0100
19	@@ -183,7 +183,7 @@
20	txt=channel->ShortName(true);
21	// logo: 64x48px
22
23	- const char *ConfigDirectory=cPlugin::ConfigDirectory("logos");
24	+ const char *ConfigDirectory="/usr/share/vdr/channel-logos";
25	if (tvonscreenCfg.logos)
26	ConfigDirectory=tvonscreenCfg.logos;
27	char *fname=new char[strlen(ConfigDirectory) + 1 + strlen(txt) + strlen(".xpm") + 1];