Mercurial > pidgin
changeset 12627:2078f65a8e98
[gaim-migrate @ 14963]
Some de-warning, and clean up generated files with make clean
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 22 Dec 2005 18:28:08 +0000 |
| parents | 6a2e376b0a34 |
| children | 26647ddcc9c5 |
| files | plugins/musicmessaging/musicmessaging.c src/Makefile.am src/dbus-analyze-functions.py src/dbus-server.c src/dbus-server.h src/gaim-client.h src/media.h |
| diffstat | 7 files changed, 33 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/musicmessaging/musicmessaging.c Thu Dec 22 17:38:38 2005 +0000 +++ b/plugins/musicmessaging/musicmessaging.c Thu Dec 22 18:28:08 2005 +0000 @@ -642,7 +642,8 @@ static GaimGtkPluginUiInfo ui_info = { - get_config_frame + get_config_frame, + 0 /* page_num (reserved) */ }; static GaimPluginInfo info = {
--- a/src/Makefile.am Thu Dec 22 17:38:38 2005 +0000 +++ b/src/Makefile.am Thu Dec 22 18:28:08 2005 +0000 @@ -170,9 +170,11 @@ dbus-bindings.c \ dbus-client-binding.c \ dbus-client-binding.h \ - gaim.service \ dbus-types.c \ - dbus-types.h + dbus-types.h \ + gaim-client-bindings.c \ + gaim-client-bindings.h \ + gaim.service # gaim dbus server
--- a/src/dbus-analyze-functions.py Thu Dec 22 17:38:38 2005 +0000 +++ b/src/dbus-analyze-functions.py Thu Dec 22 18:28:08 2005 +0000 @@ -487,7 +487,7 @@ print '{"%s", "%s", %s_DBUS},' % \ (ctopascal(function), params, function) - print "{NULL, NULL}" + print "{NULL, NULL, NULL}" print "};" print "#define GAIM_DBUS_REGISTER_BINDINGS(handle) gaim_dbus_register_bindings(handle, bindings_DBUS)"
--- a/src/dbus-server.c Thu Dec 22 17:38:38 2005 +0000 +++ b/src/dbus-server.c Thu Dec 22 18:28:08 2005 +0000 @@ -533,9 +533,9 @@ -gboolean gaim_dbus_dispatch_init(void) +static gboolean gaim_dbus_dispatch_init(void) { - static DBusObjectPathVTable vtable = {NULL, &gaim_dbus_dispatch}; + static DBusObjectPathVTable vtable = {NULL, &gaim_dbus_dispatch, NULL, NULL, NULL, NULL}; DBusError error; int result;
--- a/src/dbus-server.h Thu Dec 22 17:38:38 2005 +0000 +++ b/src/dbus-server.h Thu Dec 22 18:28:08 2005 +0000 @@ -143,6 +143,12 @@ gboolean gaim_dbus_init(void); +/** + * Returns the dbus subsystem handle. + * + * @return The dbus subsystem handle. + */ +void *gaim_dbus_get_handle(void); /**
--- a/src/gaim-client.h Thu Dec 22 17:38:38 2005 +0000 +++ b/src/gaim-client.h Thu Dec 22 18:28:08 2005 +0000 @@ -1,5 +1,5 @@ -#ifndef _LIBGAIM_H_INCLUDED_ -#define _LIBGAIM_H_INCLUDED_ +#ifndef _GAIM_CLIENT_H_INCLUDED_ +#define _GAIM_CLIENT_H_INCLUDED_ #include <glib.h> #include "gaim-client-bindings.h"
--- a/src/media.h Thu Dec 22 17:38:38 2005 +0000 +++ b/src/media.h Thu Dec 22 18:28:08 2005 +0000 @@ -97,7 +97,7 @@ void gaim_voice_chat_destroy(GaimVoiceChat *vc); /** - * Acessor function of the name of the other user on the voice chat + * Acessor function to get the name of the other user on the voice chat * * @param vc The voice chat * @return The name @@ -105,6 +105,14 @@ const char *gaim_voice_chat_get_name(GaimVoiceChat *vc); /** + * Acessor function to set the name of the other user on the voice chat + * + * @param vc The voice chat + * @return The name + */ +void gaim_voice_chat_set_name(GaimVoiceChat *vc, const char *name); + +/** * Accessor for the GaimConnection of the voice chat * * @param vc The voice chat @@ -198,6 +206,13 @@ */ struct _MSSync *gaim_voice_chat_get_timer(GaimVoiceChat *vc); +/** + * Start the streams + * + * @param vc The voice chat + */ +void gaim_voice_chat_start_streams(GaimVoiceChat *vc); + /*@}*/ /**************************************************************************/