r6408 - in /vdr/vdr-plugin-osdserver/trunk/debian/patches: ./ 00list 01_vdr-1.5.15.dpatch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Tue Feb 19 17:45:24 2008
New Revision: 6408

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6408
Log:
added patches

Added:
    vdr/vdr-plugin-osdserver/trunk/debian/patches/
    vdr/vdr-plugin-osdserver/trunk/debian/patches/00list
    vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch   (with props)

Added: vdr/vdr-plugin-osdserver/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-osdserver/trunk/debian/patches/00list?rev=6408&op=file
==============================================================================
--- vdr/vdr-plugin-osdserver/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-osdserver/trunk/debian/patches/00list Tue Feb 19 17:45:24 2008
@@ -1,0 +1,1 @@
+01_vdr-1.5.15

Added: vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch?rev=6408&op=file
==============================================================================
--- vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch (added)
+++ vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch Tue Feb 19 17:45:24 2008
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_vdr-1.5.15.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad vdr-plugin-osdserver-0.1.1~/osdobjects.c vdr-plugin-osdserver-0.1.1/osdobjects.c
+--- vdr-plugin-osdserver-0.1.1~/osdobjects.c	2007-10-07 00:23:44.000000000 +0200
++++ vdr-plugin-osdserver-0.1.1/osdobjects.c	2008-02-19 18:43:28.000000000 +0100
+@@ -261,7 +261,7 @@
+ void cOsdServerMenu::GetCurrent(int &cur, cString &curs) {
+     cur = current;
+     cOsdServerMenuItem *o = menuitems.Get(cur);
+-    curs = o ? o->Name() : NULL;
++    curs = o ? *(o->Name()) : NULL;
+ }
+ 
+ void cOsdServerMenu::SetCurrent(int cur) {
+diff -urNad vdr-plugin-osdserver-0.1.1~/osdobjectsbase.c vdr-plugin-osdserver-0.1.1/osdobjectsbase.c
+--- vdr-plugin-osdserver-0.1.1~/osdobjectsbase.c	2008-02-19 18:43:04.000000000 +0100
++++ vdr-plugin-osdserver-0.1.1/osdobjectsbase.c	2008-02-19 18:43:10.000000000 +0100
+@@ -48,7 +48,7 @@
+     if (localContext)
+         localContext->Add(Object, Name);
+ 
+-    if (!Name)
++    if (!*Name)
+         Name = cString::sprintf("_%i", Object->id);
+ 
+     ObjectList::iterator i = objects.find(Name);
+diff -urNad vdr-plugin-osdserver-0.1.1~/osdobjectsbase.h vdr-plugin-osdserver-0.1.1/osdobjectsbase.h
+--- vdr-plugin-osdserver-0.1.1~/osdobjectsbase.h	2008-02-19 18:43:04.000000000 +0100
++++ vdr-plugin-osdserver-0.1.1/osdobjectsbase.h	2008-02-19 18:43:10.000000000 +0100
+@@ -189,7 +189,7 @@
+ // Forwarded inlines of cOsdServerObject
+ 
+ inline cString cOsdServerObject::Name() {
+-    return context ? context->GetNameById(id) : NULL; 
++    return context ? *(context->GetNameById(id)) : NULL; 
+ }
+ 
+ inline void cOsdServerObject::SetFocusObject() {

Propchange: vdr/vdr-plugin-osdserver/trunk/debian/patches/01_vdr-1.5.15.dpatch
------------------------------------------------------------------------------
    svn:executable = *