diff options
| author | James Meyer <james.meyer@operamail.com> | 2010-11-10 23:13:08 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2010-11-10 23:13:08 (GMT) |
| commit | 88c1b84963b442a1d39d8193ce72d17e297f006f (patch) | |
| tree | 707179173751bff29a018a403dbed4923db47985 /abs/core/mythtv/stable-0.24/smolt_jump.patch | |
| parent | bf347ccc26e6d65950cea72b1990dbf8c9fe98c1 (diff) | |
| parent | 7921961814dea89fbf846d06095afd207c8dfd23 (diff) | |
| download | linhes_pkgbuild-88c1b84963b442a1d39d8193ce72d17e297f006f.zip linhes_pkgbuild-88c1b84963b442a1d39d8193ce72d17e297f006f.tar.gz linhes_pkgbuild-88c1b84963b442a1d39d8193ce72d17e297f006f.tar.bz2 | |
Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/mythtv/stable-0.24/smolt_jump.patch')
| -rw-r--r-- | abs/core/mythtv/stable-0.24/smolt_jump.patch | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/abs/core/mythtv/stable-0.24/smolt_jump.patch b/abs/core/mythtv/stable-0.24/smolt_jump.patch index 0fc452a..76f884c 100644 --- a/abs/core/mythtv/stable-0.24/smolt_jump.patch +++ b/abs/core/mythtv/stable-0.24/smolt_jump.patch @@ -1,30 +1,10 @@ -Index: programs/mythfrontend/networkcontrol.cpp -=================================================================== ---- programs/mythfrontend/networkcontrol.cpp (revision 19291) -+++ programs/mythfrontend/networkcontrol.cpp (working copy) -@@ -83,6 +83,7 @@ +--- programs/mythfrontend/networkcontrol.cpp.orig 2010-11-08 23:07:04.000000000 +0000 ++++ programs/mythfrontend/networkcontrol.cpp 2010-11-08 23:08:06.000000000 +0000 +@@ -88,6 +88,7 @@ jumpMap["zoneminderliveview"] = "ZoneMinder Live View"; jumpMap["zoneminderevents"] = "ZoneMinder Events"; jumpMap["snapshot"] = "ScreenShot"; + jumpMap["mythsmolt"] = "MythSmolt"; - // These jump point names match the (lowercased) locations from gContext jumpMap["channelrecpriority"] = "Channel Recording Priorities"; -@@ -191,7 +192,7 @@ - pthread_create(&command_thread, NULL, CommandThread, this); - - gContext->addListener(this); -- -+ - connect(this, SIGNAL(newConnection()), this, SLOT(newConnection())); - } - -@@ -307,7 +308,7 @@ - cs = new QTextStream(s); - cs->setCodec("UTF-8"); - } -- -+ - if (client) - { - closedOldConn = true; + jumpMap["viewscheduled"] = "Manage Recordings / Fix Conflicts"; |