Ticket #12: 00-mythcontext-protocoldialogs.patch

mythtv/libs/libmyth/mythcontext.cpp

@@ -1892 +1902 @@
                                     "backend=%2)\n")
                                     .arg(MYTH_PROTO_VERSION).arg(strlist[1]));
 
-        if (d->mainWindow && d->m_ui && d->m_ui->IsScreenSetup())
+        if(d->m_gui)
         {
-            MythPopupBox::showOkPopup(
-                d->mainWindow,
-                "Connection failure",
-                tr("The server uses network protocol version %1, "
-                   "but this client only understands version %2.  "
-                   "Make sure you are running compatible versions of "
-                   "the backend and frontend.")
-                .arg(strlist[1]).arg(MYTH_PROTO_VERSION));
+            QString message = tr("The server uses network protocol version %1, "
+              "but this client only understands version %2.  "
+              "Make sure you are running compatible versions of "
+              "the backend and frontend.")
+              .arg(strlist[1]).arg(MYTH_PROTO_VERSION);
+
+            MythConfirmationDialog *protocolPopup;
+            protocolPopup = ShowOkPopup(message, this); 
         }
         return false;
     }
@@ -1979 +1989 @@
     if (libversion == pluginversion)
         return true;
 
-    QString err = tr("Plugin %1 is not compatible with the installed MythTV "
-                     "libraries. Please recompile the plugin after a make "
-                     "distclean");
-
     VERBOSE(VB_GENERAL, QString("Plugin %1 (%2) binary version does not "
                                 "match libraries (%3)")
                                 .arg(name).arg(pluginversion).arg(libversion));
 
-    if (GetMainWindow() && !d->disablelibrarypopup)
-        ShowOkPopup(err.arg(name));
-
+    if(d->m_gui && !d->disablelibrarypopup)
+    {
+        QString err = tr("Plugin %1 is not compatible with the installed MythTV "
+                     "libraries. Please recompile the plugin after a make "
+                     "distclean").arg(name);
+        MythConfirmationDialog *libMismatchPopup;
+        libMismatchPopup = ShowOkPopup(err, this); 
+    }
     return false;
 }