Download as
Browse Code »

Commit ddad4e2ca11cc96b6641c127ae37de1fcd915f41

Authored by perry.werneck@gmail.com
1 parent 8deeb7f3
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo erro na compilação em linux

Showing 1 changed file with 6 additions and 4 deletions   Show diff stats
src/classlib/remote.cc
  Diff comments   View file @ddad4e2
@@ -303,7 +303,7 @@ @@ -303,7 +303,7 @@
303 303
304 int query_strval(const char *method, unsigned char *buffer, size_t sz) 304 int query_strval(const char *method, unsigned char *buffer, size_t sz)
305 { 305 {
306 - DBusMessage * outMsg = create_message(const char *method); 306 + DBusMessage * outMsg = create_message(method);
307 307
308 if(outMsg) 308 if(outMsg)
309 { 309 {
@@ -312,6 +312,8 @@ @@ -312,6 +312,8 @@
312 DBusMessage * rspMsg = call(outMsg); 312 DBusMessage * rspMsg = call(outMsg);
313 if(rspMsg) 313 if(rspMsg)
314 { 314 {
  315 + DBusMessageIter iter;
  316 +
315 if(dbus_message_iter_init(rspMsg, &iter)) 317 if(dbus_message_iter_init(rspMsg, &iter))
316 { 318 {
317 if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING) 319 if(dbus_message_iter_get_arg_type(&iter) == DBUS_TYPE_STRING)
@@ -319,13 +321,13 @@ @@ -319,13 +321,13 @@
319 const char * str; 321 const char * str;
320 dbus_message_iter_get_basic(&iter, &str); 322 dbus_message_iter_get_basic(&iter, &str);
321 trace("Response: [%s]",str); 323 trace("Response: [%s]",str);
322 - strncpy(buffer,str,sz);  
323 - dbus_message_unref(msg); 324 + strncpy((char *) buffer,str,sz);
  325 + dbus_message_unref(rspMsg);
324 return 0; 326 return 0;
325 } 327 }
326 328
327 exception e = exception("DBUS Return type was %c, expecting %c",dbus_message_iter_get_arg_type(&iter),DBUS_TYPE_INT32); 329 exception e = exception("DBUS Return type was %c, expecting %c",dbus_message_iter_get_arg_type(&iter),DBUS_TYPE_INT32);
328 - dbus_message_unref(msg); 330 + dbus_message_unref(rspMsg);
329 331
330 throw e; 332 throw e;
331 333