From: John (J5) Palmieri <johnp@redhat.com>
Date: Wed, 3 Oct 2007 20:43:22 +0000 (-0400)
Subject: fd.o bug #12547 remove superfluous if
X-Git-Tag: dbus-1.1.3~59^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d9d3fc031244bee29b5ac25e07f3e8e5b5dd97b;p=thirdparty%2Fdbus.git

fd.o bug #12547 remove superfluous if

* also convert tabs to spaces
---

diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index 11b6e6a4d..80d885f44 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -324,17 +324,16 @@ print_variables (const char *bus_address, pid_t bus_pid, long bus_wid,
       printf ("setenv DBUS_SESSION_BUS_ADDRESS '%s';\n", bus_address);	
       printf ("set DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
       if (bus_wid)
-	printf ("set DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid);
+        printf ("set DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid);
       fflush (stdout);
     }
   else if (bourne_shell_syntax)
     {
       printf ("DBUS_SESSION_BUS_ADDRESS='%s';\n", bus_address);
-      if (bourne_shell_syntax)
-	printf ("export DBUS_SESSION_BUS_ADDRESS;\n");
+      printf ("export DBUS_SESSION_BUS_ADDRESS;\n");
       printf ("DBUS_SESSION_BUS_PID=%ld;\n", (long) bus_pid);
       if (bus_wid)
-	printf ("DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid);
+        printf ("DBUS_SESSION_BUS_WINDOWID=%ld;\n", (long) bus_wid);
       fflush (stdout);
     }
   else