[gnome-shell] main: Fix shell_dbus_acquire_names()
- From: Florian MÃllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] main: Fix shell_dbus_acquire_names()
- Date: Tue, 8 Nov 2011 00:01:47 +0000 (UTC)
commit 2b6c5bb4168b29f885cfecd7b16b19d12cde4d62
Author: Florian MÃllner <fmuellner gnome org>
Date: Tue Nov 8 00:17:33 2011 +0100
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
src/main.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index f759d23..d8cdff5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -61,19 +61,17 @@ static void
shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags,
gchar *name,
- gboolean fatal,
- gchar *other, ...) G_GNUC_NULL_TERMINATED;
+ gboolean fatal, ...) G_GNUC_NULL_TERMINATED;
static void
shell_dbus_acquire_names (DBusGProxy *bus,
guint32 request_name_flags,
gchar *name,
- gboolean fatal,
- gchar *other, ...)
+ gboolean fatal, ...)
{
va_list al;
guint32 request_name_result;
- va_start (al, other);
+ va_start (al, fatal);
for (;;)
{
shell_dbus_acquire_name (bus,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]