[Xfce4-commits] [xfce/xfwm4] 01/07: Make it clear daemon is no more available

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

olivier pushed a commit to branch master
in repository xfce/xfwm4.

commit 337873958f3b671d413c258af471ddb1c49698c2
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Tue Aug 25 16:44:09 2015 +0200

    Make it clear daemon is no more available
    
    By displaying a message in the daemon option is passed.
    
    Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
 src/main.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 129b70c..2798c18 100644
--- a/src/main.c
+++ b/src/main.c
@@ -463,6 +463,16 @@ compositor_callback (const gchar  *name,
 }
 #endif /* HAVE_COMPOSITOR */
 
+static gboolean
+daemon_callback (const gchar  *name,
+                 const gchar  *value,
+                 gpointer      user_data,
+                 GError      **error)
+{
+    g_warning ("Option 'daemon' is now removed and has no effect!");
+    return TRUE;
+}
+
 static int
 initialize (gint compositor_mode, gboolean replace_wm)
 {
@@ -601,7 +611,6 @@ init_pango_cache (void)
 int
 main (int argc, char **argv)
 {
-    gboolean daemon_mode = FALSE;
     gboolean version = FALSE;
     gboolean replace_wm = FALSE;
     int status;
@@ -613,7 +622,7 @@ main (int argc, char **argv)
 #endif
     GOptionEntry option_entries[] =
     {
-        { "daemon", '\0', 0, G_OPTION_ARG_NONE, &daemon_mode, N_("Fork to the background (not supported)"), NULL },
+        { "daemon", '\0', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, daemon_callback, N_("Fork to the background (not supported)"), NULL },
 #ifdef HAVE_COMPOSITOR
         { "compositor", '\0', 0, G_OPTION_ARG_CALLBACK, compositor_callback, N_("Set the compositor mode"), "on|off|auto" },
 #else

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.