[patch] Combined Patch in KDE git repo

patch.diff (text/plain), 1.94 KB, created by Carter Young on 2011-05-25 00:46:25 UTC

diff --git a/plasma/generic/dataengines/geolocation/location_gps.h b/plasma/generic/dataengines/geolocation/location_gps.h
--- a/plasma/generic/dataengines/geolocation/location_gps.h
+++ b/plasma/generic/dataengines/geolocation/location_gps.h
@@ -58,6 +58,9 @@ public:
 
 private:
     Gpsd* m_gpsd;
+#if GPSD_API_MAJOR_VERSION >= 5
+    gps_data_t* m_gpsdata;
+#endif
 };
 
 #endif
diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/generic/dataengines/geolocation/location_gps.cpp
--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
+++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
@@ -51,7 +51,11 @@ void Gpsd::run()
     while (!m_abort) {
         Plasma::DataEngine::Data d;
 
+#if GPSD_API_MAJOR_VERSION >= 5
+	if (gps_read(m_gpsdata) != -1) {
+#else
         if (gps_poll(m_gpsdata) != -1) {
+#endif
             //kDebug() << "poll ok";
             if (m_gpsdata->online) {
                 //kDebug() << "online";
@@ -73,11 +77,19 @@ void Gpsd::run()
 Gps::Gps(QObject* parent, const QVariantList& args)
     : GeolocationProvider(parent, args),
       m_gpsd(0)
+#if GPSD_API_MAJOR_VERSION >= 5
+    , m_gpsdata(0)
+#endif
 {
-    gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
-    if (gpsdata) {
+#if GPSD_API_MAJOR_VERSION >= 5
+    m_gpsdata = new gps_data_t;
+    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
+#else
+    gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+#endif
+    if (m_gpsdata) {
         kDebug() << "gpsd found.";
-        m_gpsd = new Gpsd(gpsdata);
+        m_gpsd = new Gpsd(m_gpsdata);
         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
                 this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
     } else {
@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariantList& args)
 Gps::~Gps()
 {
     delete m_gpsd;
+#if GPSD_API_MAJOR_VERSION >= 5
+    delete m_gpsdata;
+#endif
 }
 
 void Gps::update()