[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdevelop/parts/debugger
From:       Hamish Rodda <meddie () yoyo ! its ! monash ! edu ! au>
Date:       2003-06-10 13:52:12
[Download RAW message or body]

CVS commit by rodda: 

1) Only offer the debug button if the binary name is the same as the current
   projects' binary (doesn't make too much sense otherwise, and the symbols
   don't get loaded properly)
2) KDE 3.x < 3.1.90 compatability


  M +21 -3     debuggerpart.cpp   1.74


--- kdevelop/parts/debugger/debuggerpart.cpp  #1.73:1.74
@@ -307,7 +307,18 @@ void DebuggerPart::slotDCOPApplicationRe
 {
     if (appId.find("drkonqi-") == 0) {
+        QByteArray answer;
+        QCString replyType;
+
+        kapp->dcopClient()->call(appId, "krashinfo", "appName()", QByteArray(), \
replyType, answer, true, 5000); +
+        QDataStream d(answer, IO_ReadOnly);
+        QCString appName;
+        d >> appName;
+
+        if (appName.length() && project() && \
                project()->mainProgram().endsWith(appName)) {
         kapp->dcopClient()->send(appId, "krashinfo", \
                "registerDebuggingApplication(QString)", i18n("Debug in &KDevelop"));
         connectDCOPSignal(appId, "krashinfo", "acceptDebuggingApplication()", \
"slotDebugExternalProcess()", true);  }
+    }
 }
 
@@ -317,6 +328,13 @@ ASYNC DebuggerPart::slotDebugExternalPro
     QCString replyType;
 
+#if defined(KDE_MAKE_VERSION)
+# if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90)
     kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", \
                QByteArray(), replyType, answer, true, 5000);
-
+# else
+    kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", \
QByteArray(), replyType, answer, true); +# endif
+#else
+    kapp->dcopClient()->call(kapp->dcopClient()->senderId(), "krashinfo", "pid()", \
QByteArray(), replyType, answer, true); +#endif
     QDataStream d(answer, IO_ReadOnly);
     int pid;


[prev in list] [next in list] [prev in thread] [next in thread]