[Conky-commits] SF.net SVN: conky: [883] branches/conky1.5

[<pk...@us...>]

Revision: 883
          http://svn.sourceforge.net/conky/?rev=883&view=rev
Author:   pkovacs
Date:     2007-07-13 12:16:07 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
API changes for Libdexter SVN

Modified Paths:
--------------
    branches/conky1.5/ChangeLog
    branches/conky1.5/src/conky.c

Modified: branches/conky1.5/ChangeLog
===================================================================
--- branches/conky1.5/ChangeLog	2007-06-23 00:30:11 UTC (rev 882)
+++ branches/conky1.5/ChangeLog	2007-07-13 19:16:07 UTC (rev 883)
@@ -1,5 +1,8 @@
 # $Id$
 
+2007-07-13
+	* API changes for Libdexter SVN.
+
 2007-06-21
   * Right-justify top/top_mem vars (pid/cpu/mem} so they align on the decimal.
 

Modified: branches/conky1.5/src/conky.c
===================================================================
--- branches/conky1.5/src/conky.c	2007-06-23 00:30:11 UTC (rev 882)
+++ branches/conky1.5/src/conky.c	2007-07-13 19:16:07 UTC (rev 883)
@@ -7223,7 +7223,14 @@
 
     if (dexter_client)
     {
-      if (!(info.dexter.channel = dexter_channel_new (NULL, NULL, NULL, dexter_channel_events)))
+      DexterChannelSettings settings = {
+        DEXTER_CHANNEL_SETTING_EVENT_CALLBACK,
+        NULL, NULL, NULL, 0, 0, 
+        dexter_channel_events, 
+        NULL, NULL, NULL, NULL, NULL, FALSE
+      };
+
+      if (!(info.dexter.channel = dexter_channel_new (&settings)))
         CRIT_ERR("unable to create channel to server");
       dexter_channel_open (info.dexter.channel, &error);
       if (error)
@@ -7231,9 +7238,11 @@
       dexter_channel_greet (info.dexter.channel, &error);
       if (error)
         CRIT_ERR ("%s", error->message);
-      dexter_channel_starttls (info.dexter.channel, NULL, &error);
+      /*
+      dexter_channel_starttls (info.dexter.channel, &error);
       if (error)
         CRIT_ERR ("%s", error->message);
+      */
       if (dexter_client_init () < 0)
         CRIT_ERR ("error initializing dexter client");
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.