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

List:       kde-commits
Subject:    kdeutils/kdelirc
From:       Gav Wood <gav () indigoarchive ! net>
Date:       2004-07-27 22:28:15
Message-ID: 20040727222815.F3BE699ED () office ! kde ! org
[Download RAW message or body]

CVS commit by gav: 

An urgent fix for Mandrake users and a build warning expunged.


  M +6 -1      irkick/klircclient.cpp   1.7
  M +1 -1      kcmlirc/kcmlirc.cpp   1.35


--- kdeutils/kdelirc/irkick/klircclient.cpp  #1.6:1.7
@@ -59,6 +59,11 @@ bool KLircClient::connectToLirc()
         if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
         {       ::close(sock);
+                // in case of mandrake...
+                strcpy(addr.sun_path, "/tmp/.lircd");
+                if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
+                {       ::close(sock);
                 return false;
         }
+        }
 
         theSocket = new QSocket;

--- kdeutils/kdelirc/kcmlirc/kcmlirc.cpp  #1.34:1.35
@@ -50,5 +50,5 @@ typedef KGenericFactory<KCMLirc, QWidget
 K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
 
-KCMLirc::KCMLirc(QWidget *parent, const char *name, QStringList /*args*/) : \
KCModule(parent, name), DCOPObject("KCMLirc") +KCMLirc::KCMLirc(QWidget *parent, \
const char *name, QStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, \
name)  {
     KGlobal::locale()->insertCatalogue( "kdelirc" );


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