diff --git a/mythtv/libs/libmythbase/mythversion.h b/mythtv/libs/libmythbase/mythversion.h index 782ab330bbb..c77ee655439 100644 --- a/mythtv/libs/libmythbase/mythversion.h +++ b/mythtv/libs/libmythbase/mythversion.h @@ -12,7 +12,7 @@ /// Update this whenever the plug-in API changes. /// Including changes in the libmythbase, libmyth, libmythtv, libmythav* and /// libmythui class methods used by plug-ins. -#define MYTH_BINARY_VERSION "0.27.20121128-1" +#define MYTH_BINARY_VERSION "0.27.20121204-1" /** \brief Increment this whenever the MythTV network protocol changes. * diff --git a/mythtv/libs/libmythui/mythuifilebrowser.cpp b/mythtv/libs/libmythui/mythuifilebrowser.cpp index 4694956d168..2de17869cfc 100644 --- a/mythtv/libs/libmythui/mythuifilebrowser.cpp +++ b/mythtv/libs/libmythui/mythuifilebrowser.cpp @@ -151,7 +151,7 @@ MythUIFileBrowser::MythUIFileBrowser(MythScreenStack *parent, { m_retObject = NULL; - Init(startPath); + SetPath(startPath); m_typeFilter = (QDir::AllDirs | QDir::Drives | QDir::Files | QDir::Readable | QDir::Writable | QDir::Executable); @@ -167,7 +167,7 @@ MythUIFileBrowser::~MythUIFileBrowser() { } -void MythUIFileBrowser::Init(const QString &startPath) +void MythUIFileBrowser::SetPath(const QString &startPath) { if (startPath.startsWith("myth://")) { @@ -363,7 +363,7 @@ void MythUIFileBrowser::editLostFocus() { QString newPath = m_locationEdit->GetText(); - Init(newPath); + SetPath(newPath); updateFileList(); } diff --git a/mythtv/libs/libmythui/mythuifilebrowser.h b/mythtv/libs/libmythui/mythuifilebrowser.h index 3aff90288d2..7b16822e6dd 100644 --- a/mythtv/libs/libmythui/mythuifilebrowser.h +++ b/mythtv/libs/libmythui/mythuifilebrowser.h @@ -80,7 +80,6 @@ class MUI_PUBLIC MythUIFileBrowser : public MythScreenType MythUIFileBrowser(MythScreenStack *parent, const QString &startPath); ~MythUIFileBrowser(); - void Init(const QString &startPath); bool Create(void); void SetReturnEvent(QObject *retobject, const QString &resultid); @@ -99,6 +98,7 @@ class MUI_PUBLIC MythUIFileBrowser : public MythScreenType void LoadPreview(void); private: + void SetPath(const QString &startPath); bool GetRemoteFileList(const QString &url, const QString &sgDir, QStringList &list); void updateFileList(void);