comparison 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 <[e-mail]>

11902:391acec18e46

				    0, &error);
    
    if (dbus_error_is_set (&error)) {
	dbus_connection_unref(gaim_dbus_connection);
	dbus_error_free(&error);
	gaim_debug_error("dbus", "Failed to get serv name: %s\n", error.name);
	return FALSE;
    }
	
    dbus_connection_setup_with_g_main(gaim_dbus_connection, NULL);

    }
}

#undef my_arg

void gaim_dbus_signal_emit_gaim(char *name, int num_values, 
				GaimValue **values, va_list vargs)
{
    DBusMessage *signal;
    DBusMessageIter iter;
    char *newname;

    g_return_if_fail(gaim_dbus_connection);
    
    /* The test below is a hack that prevents our "dbus-method-called"
       signal from being propagated to dbus.  What we really need is a
       flag for each signal that states whether this signal is to be
       dbus-propagated or not. */

11903:c9312177821a

				    0, &error);
    
    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;
    }
	
    dbus_connection_setup_with_g_main(gaim_dbus_connection, NULL);

    }
}

#undef my_arg

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
       flag for each signal that states whether this signal is to be
       dbus-propagated or not. */