jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: remove not needed patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-11-18 03:09:59 +01:00
parent d988b8ed97
commit 5e3a5d8007
1 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/mediacenter/xbmc/patches/xbmc-0e174c0-341-xbmc-settingsdialog_IsConfirmed-0.1.patch
View File

@ -1,54 +0,0 @@
diff --git a/xbmc/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp
index 8bfbce7..587fc6d 100644
--- a/xbmc/addons/GUIDialogAddonSettings.cpp
+++ b/xbmc/addons/GUIDialogAddonSettings.cpp
@@ -180,7 +180,7 @@ void CGUIDialogAddonSettings::OnInitWindow()
}
// \brief Show CGUIDialogOK dialog, then wait for user to dismiss it.
-bool CGUIDialogAddonSettings::ShowAndGetInput(const AddonPtr &addon, bool saveToDisk /* = true */)
+bool CGUIDialogAddonSettings::ShowAndGetInput(const AddonPtr &addon, bool saveToDisk /* = true */, bool* confirmed /*= NULL*/)
{
if (!addon)
return false;
@@ -203,6 +203,7 @@ bool CGUIDialogAddonSettings::ShowAndGetInput(const AddonPtr &addon, bool saveTo
pDialog->m_addon = addon;
pDialog->m_saveToDisk = saveToDisk;
pDialog->DoModal();
+ *confirmed=pDialog->IsConfirmed();
ret = true;
}
else
diff --git a/xbmc/addons/GUIDialogAddonSettings.h b/xbmc/addons/GUIDialogAddonSettings.h
index 4483e9c..1e0d3bb 100644
--- a/xbmc/addons/GUIDialogAddonSettings.h
+++ b/xbmc/addons/GUIDialogAddonSettings.h
@@ -35,7 +35,7 @@ public:
\param saveToDisk whether the changes should be saved to disk or just made local to the addon. Defaults to true
\return true if settings were changed and the dialog confirmed, false otherwise.
*/
- static bool ShowAndGetInput(const ADDON::AddonPtr &addon, bool saveToDisk = true);
+ static bool ShowAndGetInput(const ADDON::AddonPtr &addon, bool saveToDisk = true, bool* confirmed = NULL);
virtual void DoProcess(unsigned int currentTime, CDirtyRegionList &dirtyregions);
CStdString GetCurrentID() const;
diff --git a/xbmc/interfaces/python/xbmcmodule/PythonAddon.cpp b/xbmc/interfaces/python/xbmcmodule/PythonAddon.cpp
index 2159d25..210d7e4 100644
--- a/xbmc/interfaces/python/xbmcmodule/PythonAddon.cpp
+++ b/xbmc/interfaces/python/xbmcmodule/PythonAddon.cpp
@@ -285,11 +285,11 @@ namespace PYXBMC
// show settings dialog
AddonPtr addon(self->pAddon);
CPyThreadState pyState;
- CGUIDialogAddonSettings::ShowAndGetInput(addon);
+ bool bResult;
+ CGUIDialogAddonSettings::ShowAndGetInput(addon, true, &bResult);
pyState.Restore();
- Py_INCREF(Py_None);
- return Py_None;
+ return Py_BuildValue((char*)"b", bResult);
}
PyDoc_STRVAR(getAddonInfo__doc__,