Merge remote branch 'upstream/master'

diff --git a/tools/EventClients/Makefile b/tools/EventClients/Makefile
index 78dd808..7460851 100644 (file)
--- a/tools/EventClients/Makefile
+++ b/tools/EventClients/Makefile
@@ -8,7 +8,7 @@ wiimote: Clients/WiiRemote/WiiRemote
 
 Clients/WiiRemote/WiiRemote:
        cd Clients/WiiRemote && \
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) CWIID_WiiRemote.cpp -lcwiid -DICON_PATH="\"$(datarootdir)/pixmaps/xbmc/\"" $(WII_EXTRA_OPTS) -o WiiRemote
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) CWIID_WiiRemote.cpp -lcwiid -lbluetooth -DICON_PATH="\"$(datarootdir)/pixmaps/xbmc/\"" $(WII_EXTRA_OPTS) -o WiiRemote
 
 j2me-remote:
        cd Clients/J2ME\ Client

diff --git a/xbmc/lib/libjsonrpc/FileItemHandler.cpp b/xbmc/lib/libjsonrpc/FileItemHandler.cpp
index 4e567b7..80b00d2 100644 (file)
--- a/xbmc/lib/libjsonrpc/FileItemHandler.cpp
+++ b/xbmc/lib/libjsonrpc/FileItemHandler.cpp
@@ -218,7 +218,7 @@ bool CFileItemHandler::ParseSortMethods(const CStdString &method, const bool &ig
     sortmethod = SORT_METHOD_PLAYLIST_ORDER;
   else if (method.Equals("episode"))
     sortmethod = SORT_METHOD_EPISODE;
-  else if (method.Equals("title"))
+  else if (method.Equals("videotitle"))
     sortmethod = SORT_METHOD_VIDEO_TITLE;
   else if (method.Equals("sorttitle"))
     sortmethod = ignorethe ? SORT_METHOD_VIDEO_SORT_TITLE_IGNORE_THE : SORT_METHOD_VIDEO_SORT_TITLE;