diff options
author | xrs <xrs@mail36.net> | 2016-05-04 19:29:49 +0200 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2016-05-04 19:29:49 +0200 |
commit | 71cf10aff4f121d34f30828b31dadefbddbf18bd (patch) | |
tree | 338833c0465d2e2f92dc26f37c4a5262ff130401 | |
parent | 73da724ced1997791ecbeebb67af494eb95d33ee (diff) | |
download | secushare-71cf10aff4f121d34f30828b31dadefbddbf18bd.tar.gz secushare-71cf10aff4f121d34f30828b31dadefbddbf18bd.zip |
bugfix
-rw-r--r-- | src/gnunet/gnunet.cpp | 13 | ||||
-rw-r--r-- | src/gnunet/gnunet.h | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/gnunet/gnunet.cpp b/src/gnunet/gnunet.cpp index b8b2a29..3585e7c 100644 --- a/src/gnunet/gnunet.cpp +++ b/src/gnunet/gnunet.cpp | |||
@@ -119,7 +119,7 @@ GnuNet::mainLoop (char *const *args, const char *cfgfile, | |||
119 | setConnected (true); | 119 | setConnected (true); |
120 | 120 | ||
121 | // An update function to process our messages | 121 | // An update function to process our messages |
122 | GNUNET_SCHEDULER_add_now (processQtEventsTask, this); | 122 | GNUNET_SCHEDULER_add_now (&processQtEventsTask, this); |
123 | } | 123 | } |
124 | 124 | ||
125 | 125 | ||
@@ -142,10 +142,8 @@ GnuNet::mainLoopCallback (void *cls, char *const *args, const char *cfgfile, | |||
142 | * Static function | 142 | * Static function |
143 | */ | 143 | */ |
144 | void | 144 | void |
145 | GnuNet::processQtEventsTask (void *cls, | 145 | GnuNet::processQtEventsTask (void *cls) |
146 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
147 | { | 146 | { |
148 | Q_UNUSED (tc); | ||
149 | 147 | ||
150 | GnuNet *gnunet = (GnuNet *) cls; | 148 | GnuNet *gnunet = (GnuNet *) cls; |
151 | Q_ASSERT (NULL != gnunet); | 149 | Q_ASSERT (NULL != gnunet); |
@@ -157,7 +155,8 @@ GnuNet::processQtEventsTask (void *cls, | |||
157 | { | 155 | { |
158 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply | 156 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply |
159 | (GNUNET_TIME_UNIT_MILLISECONDS, 100), | 157 | (GNUNET_TIME_UNIT_MILLISECONDS, 100), |
160 | processQtEventsTask, gnunet); | 158 | &processQtEventsTask, |
159 | gnunet); | ||
161 | } | 160 | } |
162 | } | 161 | } |
163 | 162 | ||
@@ -167,10 +166,8 @@ GnuNet::processQtEventsTask (void *cls, | |||
167 | * Static function | 166 | * Static function |
168 | */ | 167 | */ |
169 | void | 168 | void |
170 | GnuNet::shutdownTask (void *cls, | 169 | GnuNet::shutdownTask (void *cls) |
171 | const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
172 | { | 170 | { |
173 | Q_UNUSED (tc); | ||
174 | 171 | ||
175 | GnuNet *gnunet = (GnuNet *) cls; | 172 | GnuNet *gnunet = (GnuNet *) cls; |
176 | Q_ASSERT (NULL != gnunet); | 173 | Q_ASSERT (NULL != gnunet); |
diff --git a/src/gnunet/gnunet.h b/src/gnunet/gnunet.h index 0de079b..0e42d8a 100644 --- a/src/gnunet/gnunet.h +++ b/src/gnunet/gnunet.h | |||
@@ -121,12 +121,10 @@ class GnuNet : public QObject | |||
121 | const struct GNUNET_CONFIGURATION_Handle *cfg); | 121 | const struct GNUNET_CONFIGURATION_Handle *cfg); |
122 | 122 | ||
123 | static void | 123 | static void |
124 | processQtEventsTask (void *cls, | 124 | processQtEventsTask (void *cls); |
125 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
126 | 125 | ||
127 | static void | 126 | static void |
128 | shutdownTask (void *cls, | 127 | shutdownTask (void *cls); |
129 | const struct GNUNET_SCHEDULER_TaskContext *tc); | ||
130 | 128 | ||
131 | SocialApp *m_social; | 129 | SocialApp *m_social; |
132 | 130 | ||