[gnome-session] Revert "autostart-app: give ever app its own journal id"

[Ray Strode <halfline src gnome org>]

commit a8f8c4fd1382c97215a216abfee6c250535416b4
Author: Ray Strode <rstrode redhat com>
Date:   Fri Nov 6 10:18:24 2015 -0500

    Revert "autostart-app: give ever app its own journal id"
    
    This reverts commit 5449174a1618cc7637f8c3a96c0eeae679c55248.

 gnome-session/gsm-autostart-app.c |   44 +------------------------------------
 1 files changed, 1 insertions(+), 43 deletions(-)
---
diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c
index 08a434b..75008fe 100644
--- a/gnome-session/gsm-autostart-app.c
+++ b/gnome-session/gsm-autostart-app.c
@@ -32,11 +32,6 @@
 #include <gconf/gconf-client.h>
 #endif
 
-#ifdef HAVE_SYSTEMD
-#include <systemd/sd-journal.h>
-#include <systemd/sd-daemon.h>
-#endif
-
 #include "gsm-autostart-app.h"
 #include "gsm-util.h"
 
@@ -1019,34 +1014,6 @@ app_launched (GAppLaunchContext *ctx,
         app->priv->startup_id = sn_id;
 }
 
-#ifdef HAVE_SYSTEMD
-static void
-on_child_setup (GsmAutostartApp *app)
-{
-        int standard_output, standard_error;
-
-        /* The FALSE means programs aren't expected to prefix each
-         * line with <n> prefix to specify priority.
-         */
-        standard_output = sd_journal_stream_fd (app->priv->desktop_id,
-                                                LOG_INFO,
-                                                FALSE);
-        standard_error = sd_journal_stream_fd (app->priv->desktop_id,
-                                               LOG_WARNING,
-                                               FALSE);
-
-        if (standard_output >= 0) {
-                dup2 (standard_output, STDOUT_FILENO);
-                close (standard_output);
-        }
-
-        if (standard_error >= 0) {
-                dup2 (standard_error, STDERR_FILENO);
-                close (standard_error);
-        }
-}
-#endif
-
 static gboolean
 autostart_app_start_spawn (GsmAutostartApp *app,
                            GError         **error)
@@ -1055,8 +1022,6 @@ autostart_app_start_spawn (GsmAutostartApp *app,
         GError          *local_error;
         const char      *startup_id;
         GAppLaunchContext *ctx;
-        GSpawnChildSetupFunc child_setup_func = NULL;
-        gpointer             child_setup_data = NULL;
         guint handler;
 
         startup_id = gsm_app_peek_startup_id (GSM_APP (app));
@@ -1076,19 +1041,12 @@ autostart_app_start_spawn (GsmAutostartApp *app,
                 g_app_launch_context_setenv (ctx, "DESKTOP_AUTOSTART_ID", startup_id);
         }
 
-#ifdef HAVE_SYSTEMD
-        if (sd_booted () > 0) {
-                child_setup_func = (GSpawnChildSetupFunc) on_child_setup;
-                child_setup_data = app;
-        }
-#endif
-
         handler = g_signal_connect (ctx, "launched", G_CALLBACK (app_launched), app);
         success = g_desktop_app_info_launch_uris_as_manager (app->priv->app_info,
                                                              NULL,
                                                              ctx,
                                                              G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH,
-                                                             child_setup_func, child_setup_data,
+                                                             NULL, NULL,
                                                              NULL, NULL,
                                                              &local_error);
         g_signal_handler_disconnect (ctx, handler);