Mercurial > pidgin
diff src/dbus-server.c @ 11903:c9312177821a
[gaim-migrate @ 14194]
"make distcheck" fixes - mostly fixing DBUS things so they can
compile outside the source tree, and a few compile warning fixes.
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 30 Oct 2005 17:24:38 +0000 |
parents | 57fccea36e36 |
children | 2078f65a8e98 |
line wrap: on
line diff
--- a/src/dbus-server.c Sun Oct 30 17:23:15 2005 +0000 +++ b/src/dbus-server.c Sun Oct 30 17:24:38 2005 +0000 @@ -564,6 +564,7 @@ if (dbus_error_is_set (&error)) { dbus_connection_unref(gaim_dbus_connection); dbus_error_free(&error); + gaim_dbus_connection = NULL; gaim_debug_error("dbus", "Failed to get serv name: %s\n", error.name); return FALSE; } @@ -668,14 +669,20 @@ #undef my_arg -void gaim_dbus_signal_emit_gaim(char *name, int num_values, +void gaim_dbus_signal_emit_gaim(const char *name, int num_values, GaimValue **values, va_list vargs) { DBusMessage *signal; DBusMessageIter iter; char *newname; +#if 0 /* this is noisy with no dbus connection */ g_return_if_fail(gaim_dbus_connection); +#else + if (gaim_dbus_connection == NULL) + return; +#endif + /* The test below is a hack that prevents our "dbus-method-called" signal from being propagated to dbus. What we really need is a