[brasero] Make brasero work under wayland

[Matthias Clasen <matthiasc src gnome org>]

commit cb05e3bffd3c80fe9f46ddc98f246596d4bfa665
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Dec 5 22:16:23 2013 -0500

    Make brasero work under wayland
    
    Drop oldschool X session support, with all its X11-specifics.
    If session management support is still desired, it should just
    use the GtkApplication session support.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719944

 src/Makefile.am           |    8 -
 src/brasero-app.c         |   11 +-
 src/brasero-xsession.c    |  134 ----
 src/brasero-xsession.h    |   44 --
 src/eggdesktopfile.c      | 1520 ---------------------------------------------
 src/eggdesktopfile.h      |  163 -----
 src/eggsmclient-private.h |   59 --
 src/eggsmclient-xsmp.c    | 1375 ----------------------------------------
 src/eggsmclient.c         |  604 ------------------
 src/eggsmclient.h         |  117 ----
 src/main.c                |    1 -
 11 files changed, 4 insertions(+), 4032 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0581791..ba1b0e6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -106,14 +106,6 @@ brasero_SOURCES = \
        brasero-project-name.h           \
        brasero-project-parse.c           \
        brasero-project-parse.h           \
-       brasero-xsession.c           \
-       brasero-xsession.h              \
-       eggdesktopfile.c        \
-       eggdesktopfile.h        \
-       eggsmclient.c        \
-       eggsmclient.h        \
-       eggsmclient-private.h        \
-       eggsmclient-xsmp.c        \
        brasero-setting.h        \
        brasero-setting.c        \
        brasero-search-engine.h        \
diff --git a/src/brasero-app.c b/src/brasero-app.c
index 8d10781..bae2e8e 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -40,7 +40,6 @@
 #include "brasero-sum-dialog.h"
 #include "brasero-eject-dialog.h"
 #include "brasero-project-manager.h"
-#include "brasero-xsession.h"
 #include "brasero-pref.h"
 
 #include "brasero-drive.h"
@@ -513,7 +512,10 @@ brasero_app_set_parent (BraseroApp *app,
        BraseroAppPrivate *priv;
 
        priv = BRASERO_APP_PRIVATE (app);
-       priv->parent = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), parent_xid);
+#ifdef GDK_WINDOWING_X11
+       if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
+               priv->parent = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), 
parent_xid);
+#endif
 }
 
 gboolean
@@ -2064,9 +2066,6 @@ brasero_app_init (BraseroApp *object)
        priv->setting = brasero_setting_get_default ();
        brasero_setting_load (priv->setting);
 
-       /* Connect to session */
-       brasero_session_connect (object);
-
        g_set_application_name (_("Disc Burner"));
        gtk_window_set_default_icon_name ("brasero");
 
@@ -2084,8 +2083,6 @@ brasero_app_finalize (GObject *object)
        g_object_unref (priv->setting);
        priv->setting = NULL;
 
-       brasero_session_disconnect (BRASERO_APP (object));
-
        if (priv->saved_contents) {
                g_free (priv->saved_contents);
                priv->saved_contents = NULL;
diff --git a/src/main.c b/src/main.c
index 7dff68a..cd7e1ed 100644
--- a/src/main.c
+++ b/src/main.c
@@ -89,7 +89,6 @@ main (int argc, char **argv)
                                           GETTEXT_PACKAGE);
        g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
 
-       g_option_context_add_group (context, egg_sm_client_get_option_group ());
        g_option_context_add_group (context, gtk_get_option_group (TRUE));
        g_option_context_add_group (context, brasero_media_get_option_group ());
        g_option_context_add_group (context, brasero_burn_library_get_option_group ());