session: Try dbus before SM/ICE on logout/shutdown

Otherwise we will not get the Shutdown/Reboot dialog but always the
Logout one (with dbus and SM both enabled).

misc/Makefile.am

@@ -17,7 +17,10 @@ XSESSION_DESKTOPS = $(XSESSION_MISC) $(XSESSION_GNOME2) $(XSESSION_GNOME3)
 DESKTOPS = $(DESKTOPS_APP) $(XSESSION_DESKTOPS)
 
 miscdir = $(pkgdatadir)/misc
-misc_SCRIPTS = $(XCLIENTS) starte16 e16-dbus-cmd
+misc_SCRIPTS = $(XCLIENTS) starte16
+if ENABLE_DBUS
+misc_SCRIPTS += e16-dbus-cmd
+endif
 
 applicationdir = $(datadir)/applications
 application_DATA = $(DESKTOPS_APP)

src/session.c

@@ -564,25 +564,26 @@ _SessionExitDbus(int how)
 static void
 _SessionLogout(int how)
 {
-#if USE_SM
+#ifdef USE_SM
     if (EDebug(EDBUG_TYPE_SESSION))
         Eprintf("%s: how=%d smc=%p\n", __func__, how, sm_conn);
+#else
+    if (EDebug(EDBUG_TYPE_SESSION))
+        Eprintf("%s: how=%d\n", __func__, how);
+#endif
 
+#if USE_DBUS
+    if (_SessionExitDbus(how) == 0)
+        return;
+#endif
+
+#if USE_SM
     if (sm_conn)
     {
         SmcRequestSaveYourself(sm_conn, SmSaveBoth, True, SmInteractStyleAny,
                                False, True);
         return;
     }
-#else
-    if (EDebug(EDBUG_TYPE_SESSION))
-        Eprintf("%s: how=%d\n", __func__, how);
-
-#endif                          /* USE_SM */
-
-#if USE_DBUS
-    if (_SessionExitDbus(how) == 0)
-        return;
 #endif
 
     switch (how)