[gnome-flashback] data: remove gnome-flashback-init.desktop

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 409621bdfe67df13bb48c41f29e784c4de443bbb
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Aug 16 15:11:51 2019 +0300

    data: remove gnome-flashback-init.desktop
    
    Simply start gnome-flashback in Initialization phase.

 data/applications/Makefile.am                     |  1 -
 data/applications/gnome-flashback-init.desktop.in |  9 ---------
 data/applications/gnome-flashback.desktop.in      |  2 +-
 data/sessions/Makefile.am                         |  1 -
 gnome-flashback/gf-main.c                         | 24 ++++-------------------
 po/POTFILES.in                                    |  1 -
 6 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/data/applications/Makefile.am b/data/applications/Makefile.am
index 81c62c6..160f3a5 100644
--- a/data/applications/Makefile.am
+++ b/data/applications/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 desktop_in_files = \
        gnome-flashback.desktop.in \
-       gnome-flashback-init.desktop.in \
        $(NULL)
 
 desktopdir = $(datadir)/applications
diff --git a/data/applications/gnome-flashback.desktop.in b/data/applications/gnome-flashback.desktop.in
index 35f5405..9a18615 100644
--- a/data/applications/gnome-flashback.desktop.in
+++ b/data/applications/gnome-flashback.desktop.in
@@ -4,6 +4,6 @@ Name=GNOME Flashback
 Exec=gnome-flashback
 OnlyShowIn=GNOME-Flashback;
 NoDisplay=true
-X-GNOME-Autostart-Phase=Desktop
+X-GNOME-Autostart-Phase=Initialization
 X-GNOME-Autostart-Notify=true
 X-GNOME-AutoRestart=true
diff --git a/data/sessions/Makefile.am b/data/sessions/Makefile.am
index b9850d6..89b03ab 100644
--- a/data/sessions/Makefile.am
+++ b/data/sessions/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 required_components_common = \
-       gnome-flashback-init \
        gnome-flashback \
        gnome-panel \
        $(NULL)
diff --git a/gnome-flashback/gf-main.c b/gnome-flashback/gf-main.c
index eebd53c..9210754 100644
--- a/gnome-flashback/gf-main.c
+++ b/gnome-flashback/gf-main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 - 2015 Alberts Muktupāvels
+ * Copyright (C) 2014 - 2019 Alberts Muktupāvels
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@ static GMainLoop *loop = NULL;
 static GfApplication *application = NULL;
 
 static gboolean debug = FALSE;
-static gboolean initialize = FALSE;
 static gboolean replace = FALSE;
 static gboolean version = FALSE;
 
@@ -41,12 +40,6 @@ static GOptionEntry entries[] =
     N_("Enable debugging code"),
     NULL
   },
-  {
-    "initialize", 0, G_OPTION_FLAG_NONE,
-    G_OPTION_ARG_NONE, &initialize,
-    N_("Initialize GNOME Flashback session"),
-    NULL
-  },
   {
     "replace", 'r', G_OPTION_FLAG_NONE,
     G_OPTION_ARG_NONE, &replace,
@@ -129,18 +122,9 @@ session_ready_cb (GfSession *session,
   g_unix_signal_add (SIGTERM, on_term_signal, NULL);
   g_unix_signal_add (SIGINT, on_int_signal, NULL);
 
-  if (initialize)
-    {
-      gf_session_set_environment (session, "XDG_MENU_PREFIX", "gnome-flashback-");
-      gf_session_register (session);
-
-      g_main_loop_quit (loop);
-    }
-  else
-    {
-      application = gf_application_new ();
-      gf_session_register (session);
-    }
+  application = gf_application_new ();
+  gf_session_set_environment (session, "XDG_MENU_PREFIX", "gnome-flashback-");
+  gf_session_register (session);
 }
 
 static void
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 54aebbd..d6935f3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
 # Please keep this file sorted alphabetically.
 backends/gf-monitor.c
 data/applications/gnome-flashback.desktop.in
-data/applications/gnome-flashback-init.desktop.in
 data/autostart/gnome-flashback-nm-applet.desktop.in
 data/autostart/gnome-flashback-screensaver.desktop.in
 data/directories/X-GNOME-Flashback-Settings.directory.desktop.in