[mutter] launcher: Move activate_session abstraction into the launcher code

[Jasper St. Pierre <jstpierre src gnome org>]

commit 3c3b94921ff8b02a8718deff97ef71fdaa49e473
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Apr 22 17:08:57 2014 -0400

    launcher: Move activate_session abstraction into the launcher code
    
    login1 has a separate ActivateSession request, so put it here so
    that we don't have to modify any backend code.

 src/backends/native/meta-backend-native.c |    2 +-
 src/backends/native/meta-launcher.c       |    8 +++++++-
 src/backends/native/meta-launcher.h       |    4 ++++
 3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index ff772c5..2feb698 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -221,7 +221,7 @@ meta_activate_session (void)
   MetaBackendNative *native = META_BACKEND_NATIVE (backend);
   MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
 
-  if (!meta_launcher_activate_vt (priv->launcher, -1, &error))
+  if (!meta_launcher_activate_session (priv->launcher, &error))
     {
       g_warning ("Could not activate session: %s\n", error->message);
       g_error_free (error);
diff --git a/src/backends/native/meta-launcher.c b/src/backends/native/meta-launcher.c
index 6e9c92a..5bab053 100644
--- a/src/backends/native/meta-launcher.c
+++ b/src/backends/native/meta-launcher.c
@@ -395,6 +395,13 @@ meta_launcher_free (MetaLauncher *launcher)
 }
 
 gboolean
+meta_launcher_activate_session (MetaLauncher  *launcher,
+                                GError       **error)
+{
+  return meta_launcher_activate_vt (launcher, -1, error);
+}
+
+gboolean
 meta_launcher_activate_vt (MetaLauncher  *launcher,
                           signed char    vt,
                           GError       **error)
@@ -406,4 +413,3 @@ meta_launcher_activate_vt (MetaLauncher  *launcher,
 
   return send_message_to_wl (launcher, &message, sizeof (message), NULL, NULL, error);
 }
-
diff --git a/src/backends/native/meta-launcher.h b/src/backends/native/meta-launcher.h
index fbea59a..16f6597 100644
--- a/src/backends/native/meta-launcher.h
+++ b/src/backends/native/meta-launcher.h
@@ -27,7 +27,11 @@ typedef struct _MetaLauncher MetaLauncher;
 MetaLauncher     *meta_launcher_new                     (void);
 void              meta_launcher_free                    (MetaLauncher  *self);
 
+gboolean          meta_launcher_activate_session        (MetaLauncher  *self,
+                                                        GError       **error);
+
 gboolean          meta_launcher_activate_vt             (MetaLauncher  *self,
                                                         signed char    vt,
                                                         GError       **error);
+
 #endif /* META_LAUNCHER_H */