Anonymous

Index: libs/libmythtv/tvremoteutil.cpp
===================================================================
--- libs/libmythtv/tvremoteutil.cpp	(revision 22937)
+++ libs/libmythtv/tvremoteutil.cpp	(working copy)
@@ -264,14 +264,6 @@
     return blank;
 }
 
-void RemoteSendMessage(const QString &message)
-{
-    QStringList strlist( "MESSAGE" );
-    strlist << message;
-
-    gContext->SendReceiveStringList(strlist);
-}
-
 void RemoteGeneratePreviewPixmap(ProgramInfo *pginfo)
 {
     QStringList strlist( "QUERY_GENPIXMAP" );
Index: libs/libmyth/remoteutil.cpp
===================================================================
--- libs/libmyth/remoteutil.cpp	(revision 22937)
+++ libs/libmyth/remoteutil.cpp	(working copy)
@@ -258,6 +258,13 @@
 
 void RemoteSendMessage(const QString &message)
 {
+    if (gContext->IsMasterBackend())
+    {
+        MythEvent event(message);
+        gContext->dispatch(event);
+        return;
+    }
+
     QStringList strlist( "MESSAGE" );
     strlist << message;
 
@@ -266,9 +273,15 @@
 
 void RemoteSendEvent(const MythEvent &event)
 {
+    if (gContext->IsMasterBackend())
+    {
+        gContext->dispatch(event);
+        return;
+    }
+
     QStringList strlist( "MESSAGE" );
     strlist << event.Message();
-    strlist<< event.ExtraDataList();
+    strlist << event.ExtraDataList();
 
     gContext->SendReceiveStringList(strlist);
 }
Index: libs/libmyth/mythcontext.h
===================================================================
--- libs/libmyth/mythcontext.h	(revision 22937)
+++ libs/libmyth/mythcontext.h	(working copy)
@@ -196,8 +196,8 @@
     void waitPrivRequest() const;
     MythPrivRequest popPrivRequest();
 
-    void dispatch(MythEvent &event);
-    void dispatchNow(MythEvent &event);
+    void dispatch(const MythEvent &event);
+    void dispatchNow(const MythEvent &event);
 
     void sendPlaybackStart(void);
     void sendPlaybackEnd(void);
Index: libs/libmyth/mythdialogs.h
===================================================================
--- libs/libmyth/mythdialogs.h	(revision 22937)
+++ libs/libmyth/mythdialogs.h	(working copy)
@@ -214,7 +214,7 @@
     QColor       popupForegroundColor;
     int          hpadding, wpadding;
     bool         arrowAccel;
-} __attribute__ ((deprecated));
+};
 
 /** The MythTV progress bar dialog.
 
@@ -280,7 +280,7 @@
     void setTotalSteps(int totalSteps);
     int steps;
     int m_totalSteps;
-} __attribute__ ((deprecated));
+};
 
 /** MythDialog box that displays a busy spinner-style dialog box to
     indicate the program is busy, but that the number of steps needed
@@ -336,7 +336,7 @@
 
   private:
     QTimer *timer;
-} __attribute__ ((deprecated));
+};
 
 class MPUBLIC MythThemedDialog : public MythDialog
 {
@@ -457,7 +457,7 @@
     MythLineEdit        *password_editor;
     QString              target_text;
     bool                *success_flag;
-} __attribute__ ((deprecated));
+};
 
 class MPUBLIC MythSearchDialog: public MythPopupBox
 {
Index: libs/libmyth/mythcontext.cpp
===================================================================
--- libs/libmyth/mythcontext.cpp	(revision 22937)
+++ libs/libmyth/mythcontext.cpp	(working copy)
@@ -2478,14 +2478,14 @@
     return ret;
 }
 
-void MythContext::dispatch(MythEvent &event)
+void MythContext::dispatch(const MythEvent &event)
 {
     VERBOSE(VB_NETWORK, QString("MythEvent: %1").arg(event.Message()));
 
     MythObservable::dispatch(event);
 }
 
-void MythContext::dispatchNow(MythEvent &event)
+void MythContext::dispatchNow(const MythEvent &event)
 {
     VERBOSE(VB_NETWORK, QString("MythEvent: %1").arg(event.Message()));
 
Index: libs/libmythdb/mythobservable.cpp
===================================================================
--- libs/libmythdb/mythobservable.cpp	(revision 22937)
+++ libs/libmythdb/mythobservable.cpp	(working copy)
@@ -43,7 +43,7 @@
     return m_listeners;
 }
 
-void MythObservable::dispatch(MythEvent &event)
+void MythObservable::dispatch(const MythEvent &event)
 {
     QList<QObject*>::const_iterator it = m_listeners.begin();
     while (it != m_listeners.end())
@@ -53,7 +53,7 @@
     }
 }
 
-void MythObservable::dispatchNow(MythEvent &event)
+void MythObservable::dispatchNow(const MythEvent &event)
 {
     QList<QObject*>::const_iterator it = m_listeners.begin();
     while (it != m_listeners.end())
Index: libs/libmythdb/mythevent.h
===================================================================
--- libs/libmythdb/mythevent.h	(revision 22937)
+++ libs/libmythdb/mythevent.h	(working copy)
@@ -48,7 +48,8 @@
     const QStringList& ExtraDataList() const { return extradata; }
     int ExtraDataCount() const { return extradata.size(); }
 
-    virtual MythEvent* clone() { return new MythEvent(message, extradata); }
+    virtual MythEvent *clone() const
+    { return new MythEvent(message, extradata); }
 
   private:
     QString message;
Index: libs/libmythdb/mythversion.h
===================================================================
--- libs/libmythdb/mythversion.h	(revision 22937)
+++ libs/libmythdb/mythversion.h	(working copy)
@@ -8,7 +8,7 @@
 /// Update this whenever the plug-in API changes.
 /// Including changes in the libmythdb, libmyth and libmythui class methods
 /// used by plug-ins.
-#define MYTH_BINARY_VERSION "0.23.20091129-1"
+#define MYTH_BINARY_VERSION "0.23.20091201-1"
 
 /** \brief Increment this whenever the MythTV network protocol changes.
  *
Index: libs/libmythdb/mythobservable.h
===================================================================
--- libs/libmythdb/mythobservable.h	(revision 22937)
+++ libs/libmythdb/mythobservable.h	(working copy)
@@ -120,7 +120,7 @@
 
         \param event a MythEvent to dispatch.
     */
-    void dispatch(MythEvent &event);
+    void dispatch(const MythEvent &event);
 
     /** \brief Dispatch an event to all listeners
 
@@ -131,7 +131,7 @@
 
         \param event a MythEvent to dispatch.
     */
-    void dispatchNow(MythEvent &event);
+    void dispatchNow(const MythEvent &event);
 
   private:
     QList<QObject*> m_listeners;