mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-04 08:47:11 +00:00
Code Issues Releases Activity

* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)

Browse Source 
(Fdbus_register_signal, Fdbus_register_method): Cleanup memory of
error flag.
This commit is contained in:
Michael Albinus 2009-07-08 12:59:47 +00:00
parent 93c3eb7c61
commit c1d5ce9488
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2009-07-08 Michael Albinus <michael.albinus@gmx.de>
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
(Fdbus_register_signal, Fdbus_register_method): Cleanup memory of
error flag.
2009-07-08 Kenichi Handa <handa@m17n.org>
* fontset.c (fontset_find_font): Fix the logic of handling

12
src/dbusbind.c
View File

@ -716,6 +716,9 @@ xd_initialize (bus)
if (connection == NULL)
XD_SIGNAL2 (build_string ("No connection"), bus);
/* Cleanup. */
dbus_error_free (&derror);
/* Return the result. */
return connection;
}
@ -935,6 +938,7 @@ usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TI
}
/* Cleanup. */
dbus_error_free (&derror);
dbus_message_unref (dmessage);
dbus_message_unref (reply);
@ -1562,8 +1566,10 @@ xd_read_message (bus)
XD_DEBUG_MESSAGE ("Event stored: %s",
SDATA (format2 ("%s", event.arg, Qnil)));
/* Cleanup. */
cleanup:
dbus_message_unref (dmessage);
RETURN_UNGCPRO (Qnil);
}
@ -1716,6 +1722,9 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
XD_ERROR (derror);
}
/* Cleanup. */
dbus_error_free (&derror);
XD_DEBUG_MESSAGE ("Matching rule \"%s\" created", rule);
}
@ -1784,6 +1793,9 @@ used for composing the returning D-Bus message. */)
if (NILP (Fmember (key1, value)))
Fputhash (key, Fcons (key1, value), Vdbus_registered_functions_table);
/* Cleanup. */
dbus_error_free (&derror);
/* Return object. */
return list2 (key, list3 (service, path, handler));
}