main: Fix shell_dbus_acquire_names()

Commit 39727d1156 refactored dbus acquisition, but due to wrong use
of va_args we would only ever acquire the first bus name passed.

https://bugzilla.gnome.org/show_bug.cgi?id=658078
This commit is contained in:
Florian Müllner 2011-11-08 00:17:33 +01:00
parent 628e59894b
commit 2b6c5bb416

View File

@ -61,19 +61,17 @@ static void
shell_dbus_acquire_names (DBusGProxy *bus, shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags, guint32 request_name_flags,
gchar *name, gchar *name,
gboolean fatal, gboolean fatal, ...) G_GNUC_NULL_TERMINATED;
gchar *other, ...) G_GNUC_NULL_TERMINATED;
static void static void
shell_dbus_acquire_names (DBusGProxy *bus, shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags, guint32 request_name_flags,
gchar *name, gchar *name,
gboolean fatal, gboolean fatal, ...)
gchar *other, ...)
{ {
va_list al; va_list al;
guint32 request_name_result; guint32 request_name_result;
va_start (al, other); va_start (al, fatal);
for (;;) for (;;)
{ {
shell_dbus_acquire_name (bus, shell_dbus_acquire_name (bus,