Attachment #395448 for bug #524660

View | Details | Raw Unified | Return to bug 524660
Collapse All | Expand All

Lines 53-63 PKG_CHECK_MODULES(GIO, [gio-unix-2.0]) Link Here

(-)lxsession-0.5.2-old/configure.ac (-2 / +2 lines)
53	AC_SUBST(GIO_CFLAGS)	53	AC_SUBST(GIO_CFLAGS)
54	AC_SUBST(GIO_LIBS)	54	AC_SUBST(GIO_LIBS)
55		55
56	PKG_CHECK_MODULES(DBUSGLIB, [dbus-glib-1])	56	#PKG_CHECK_MODULES(DBUSGLIB, [dbus-glib-1])
57	AC_SUBST(DBUSGLIB_CFLAGS)	57	AC_SUBST(DBUSGLIB_CFLAGS)
58	AC_SUBST(DBUSGLIB_LIBS)	58	AC_SUBST(DBUSGLIB_LIBS)
59		59
60	PKG_CHECK_MODULES(DBUS, [dbus-1])	60	#PKG_CHECK_MODULES(DBUS, [dbus-1])
61	AC_SUBST(DBUS_CFLAGS)	61	AC_SUBST(DBUS_CFLAGS)
62	AC_SUBST(DBUS_LIBS)	62	AC_SUBST(DBUS_LIBS)
63		63




<?xml version="1.0"?>
<interface>
  <requires lib="gtk+" version="2.16"/>
  <object class="GtkDialog" id="dlg">
    <property name="border_width">5</property>
    <property name="title" translatable="yes">Authentication</property>
    <property name="resizable">False</property>
    <property name="window_position">center</property>
    <property name="type_hint">normal</property>
    <child internal-child="vbox">
      <object class="GtkVBox" id="dialog-vbox1">
        <property name="visible">True</property>
        <property name="orientation">vertical</property>
        <property name="spacing">2</property>
        <child>
          <object class="GtkVBox" id="vbox1">
            <property name="visible">True</property>
            <property name="border_width">12</property>
            <property name="orientation">vertical</property>
            <property name="spacing">6</property>
            <child>
              <object class="GtkHBox" id="hbox1">
                <property name="visible">True</property>
                <child>
                  <object class="GtkImage" id="icon">
                    <property name="visible">True</property>
                    <property name="stock">gtk-missing-image</property>
                  </object>
                  <packing>
                    <property name="expand">False</property>
                    <property name="position">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkLabel" id="msg">
                    <property name="visible">True</property>
                    <property name="xalign">0</property>
                    <property name="yalign">0</property>
                    <property name="wrap">True</property>
                  </object>
                  <packing>
                    <property name="position">1</property>
                  </packing>
                </child>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="position">0</property>
              </packing>
            </child>
            <child>
              <object class="GtkHBox" id="id_hbox">
                <property name="visible">True</property>
                <property name="spacing">6</property>
                <child>
                  <object class="GtkLabel" id="label1">
                    <property name="visible">True</property>
                    <property name="label" translatable="yes">Identity:</property>
                  </object>
                  <packing>
                    <property name="expand">False</property>
                    <property name="position">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkComboBox" id="id">
                    <property name="visible">True</property>
                    <child>
                      <object class="GtkCellRendererText" id="rendertext"/>
                      <attributes>
                        <attribute name="text">0</attribute>
                      </attributes>
                    </child>
                  </object>
                  <packing>
                    <property name="position">1</property>
                  </packing>
                </child>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="position">1</property>
              </packing>
            </child>
            <child>
              <object class="GtkHBox" id="hbox2">
                <property name="visible">True</property>
                <child>
                  <object class="GtkLabel" id="request_label">
                    <property name="visible">True</property>
                  </object>
                  <packing>
                    <property name="expand">False</property>
                    <property name="position">0</property>
                  </packing>
                </child>
                <child>
                  <object class="GtkEntry" id="request">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="has_focus">True</property>
                    <property name="visibility">False</property>
                    <property name="invisible_char">&#x2022;</property>
                    <property name="activates_default">True</property>
                  </object>
                  <packing>
                    <property name="position">1</property>
                  </packing>
                </child>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="position">2</property>
              </packing>
            </child>
            <child>
              <object class="GtkLabel" id="detail">
                <property name="visible">True</property>
                <property name="xalign">0</property>
                <property name="yalign">0</property>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="position">3</property>
              </packing>
            </child>
          </object>
          <packing>
            <property name="expand">False</property>
            <property name="position">1</property>
          </packing>
        </child>
        <child internal-child="action_area">
          <object class="GtkHButtonBox" id="dialog-action_area1">
            <property name="visible">True</property>
            <property name="layout_style">end</property>
            <child>
              <object class="GtkButton" id="cancel">
                <property name="label">gtk-cancel</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="use_stock">True</property>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="fill">False</property>
                <property name="position">0</property>
              </packing>
            </child>
            <child>
              <object class="GtkButton" id="ok">
                <property name="label">gtk-ok</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="can_default">True</property>
                <property name="has_default">True</property>
                <property name="receives_default">True</property>
                <property name="use_stock">True</property>
              </object>
              <packing>
                <property name="expand">False</property>
                <property name="fill">False</property>
                <property name="position">1</property>
              </packing>
            </child>
          </object>
          <packing>
            <property name="expand">False</property>
            <property name="pack_type">end</property>
            <property name="position">0</property>
          </packing>
        </child>
      </object>
    </child>
    <action-widgets>
      <action-widget response="-6">cancel</action-widget>
      <action-widget response="-5">ok</action-widget>
    </action-widgets>
  </object>
</interface>

Lines 10-16 Link Here

(-)lxsession-0.5.2-old/data/ui/lxsession-edit.ui (-1 lines)
10	<property name="default_width">512</property>	10	<property name="default_width">512</property>
11	<property name="default_height">420</property>	11	<property name="default_height">420</property>
12	<property name="type_hint">dialog</property>	12	<property name="type_hint">dialog</property>
13	<property name="has_separator">True</property>
14	<child internal-child="vbox">	13	<child internal-child="vbox">
15	<object class="GtkVBox" id="dialog-vbox">	14	<object class="GtkVBox" id="dialog-vbox">
16	<property name="visible">True</property>	15	<property name="visible">True</property>




#include <glib.h>
#include <glib-object.h>
#include <gio/gio.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-glib.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>

		_data_->_tmp2_ = FALSE;
		_data_->_tmp2_ = lxsession_console_kit_object_can_stop_finish (_data_->_tmp1_, _data_->_res_, &_data_->_inner_error_);
		_data_->_tmp0_ = _data_->_tmp2_;
		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
			goto __catch11_g_error;
				goto __catch11_dbus_gerror;
			}
			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
			g_clear_error (&_data_->_inner_error_);
			return FALSE;
		}
		_data_->can_shutdown_available = _data_->_tmp0_;
	}
	goto __finally11;
	__catch11_g_error:
	{
		_data_->err = _data_->_inner_error_;
		_data_->_inner_error_ = NULL;

		LxsessionConsoleKitObject* _tmp0_ = NULL;
		_tmp0_ = self->dbus_interface;
		lxsession_console_kit_object_stop (_tmp0_, &_inner_error_);
		if (G_UNLIKELY (_inner_error_ != NULL)) {
			goto __catch12_g_error;
				goto __catch12_dbus_gerror;
			}
			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
			g_clear_error (&_inner_error_);
			return;
		}
	}
	goto __finally12;
	__catch12_g_error:
	{
		GError* err = NULL;
		GError* _tmp1_ = NULL;

		LxsessionConsoleKitObject* _tmp0_ = NULL;
		_tmp0_ = self->dbus_interface;
		lxsession_console_kit_object_restart (_tmp0_, &_inner_error_);
		if (G_UNLIKELY (_inner_error_ != NULL)) {
			goto __catch13_g_error;
				goto __catch13_dbus_gerror;
			}
			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
			g_clear_error (&_inner_error_);
			return;
		}
	}
	goto __finally13;
	__catch13_g_error:
	{
		GError* err = NULL;
		GError* _tmp1_ = NULL;

	GVariant *_arguments;
	GVariantBuilder _arguments_builder;
	GDBusMessage *_reply_message;
	DBUS_GERROR;
	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.ConsoleKit.Manager", "Restart");
	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
	_arguments = g_variant_builder_end (&_arguments_builder);

	GVariant *_arguments;
	GVariantBuilder _arguments_builder;
	GDBusMessage *_reply_message;
	DBUS_GERROR;
	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.ConsoleKit.Manager", "Stop");
	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
	_arguments = g_variant_builder_end (&_arguments_builder);

	GDBusMessage *_message;
	GVariant *_arguments;
	GVariantBuilder _arguments_builder;
	DBUS_GERROR;
	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.ConsoleKit.Manager", "CanRestart");
	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
	_arguments = g_variant_builder_end (&_arguments_builder);

	GDBusMessage *_message;
	GVariant *_arguments;
	GVariantBuilder _arguments_builder;
	DBUS_GERROR;
	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.freedesktop.ConsoleKit.Manager", "CanStop");
	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
	_arguments = g_variant_builder_end (&_arguments_builder);




        try {
            can_shutdown_available = yield dbus_interface.can_stop ();
        }
        catch (Error err) {
            warning ("%s", err.message);
            can_shutdown_available = false;
        }

        try {
            dbus_interface.stop ();
        }
        catch (Error err) {
            warning ("%s", err.message);
        }
    }

        try {
            dbus_interface.restart ();
        }
        catch (Error err) {
            warning ("%s", err.message);
        }
    }

    public const string OBJECT_PATH = "/org/freedesktop/ConsoleKit/Manager";
    public const string INTERFACE_NAME = "org.freedesktop.ConsoleKit.Manager";
    
    public abstract void restart () throws Error;
    public abstract void stop () throws Error;
    public abstract async bool can_restart () throws Error;
    public abstract async bool can_stop () throws Error;
}

void on_bus_aquired (DBusConnection conn) {

Lines 15-21 Link Here

(-)lxsession-0.5.2-old/lxsession-logout/lxsession-logout-dbus-interface.c (-1 lines)
15	#include <config.h>	15	#include <config.h>
16	#include <glib.h>	16	#include <glib.h>
17	#include <string.h>	17	#include <string.h>
18	#include <dbus/dbus.h>
19	#include <gio/gio.h>	18	#include <gio/gio.h>
20		19
21	/* Mechanism independent */	20	/* Mechanism independent */




    $(NULL)

if USE_GTK3
lxclipboard_lxclipboard_VALAFLAGS += -D USE_GTK3
else
lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 -D USE_GTK2
lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS)
lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS)
endif

    $(NULL)

if USE_GTK3
lxpolkit_lxpolkit_VALAFLAGS += -D USE_GTK3
else
lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 -D USE_GTK2
lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS)
lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS)
endif

lxsession_default_apps_lxsession_default_apps_VALAFLAGS = \
    --vapidir=$(srcdir)/vapi \
    --pkg @VALA_GTK_LIBS@ \
    --pkg dbus-glib-1 \
    --pkg gio-2.0 \
    --pkg posix \
    --pkg lxsession-edit \

    $(X11_LIBS) \
    $(NULL)

if USE_GTK3
lxsession_default_apps_lxsession_default_apps_VALAFLAGS += -D USE_GTK3
else
lxsession_default_apps_lxsession_default_apps_VALAFLAGS += -D USE_GTK2
endif

if USE_BUILDIN_CLIPBOARD
buildinclip_SOURCES = \
    lxclipboard/clipboard.c \


lxsession_lxsession_VALAFLAGS = \
    --vapidir=$(srcdir)/vapi \
    --pkg dbus-glib-1 \
    --pkg gio-2.0 \
    --pkg posix \
    --pkg lxsettings-daemon \




}

/* Handler for "expose_event" on background. */
#if GTK_CHECK_VERSION(3,0,0)
gboolean draw(GtkWidget * widget, cairo_t * cr, GdkPixbuf * pixbuf)
{
    if (pixbuf != NULL)
    {
        /* Copy the appropriate rectangle of the root window pixmap to the drawing area.
         * All drawing areas are immediate children of the toplevel window, so the allocation yields the source coordinates directly. */
       gdk_cairo_set_source_pixbuf (
           cr,
           pixbuf,
           0,
           0);

       cairo_paint (cr);
    }
    return FALSE;
}
#else
gboolean expose_event(GtkWidget * widget, GdkEventExpose * event, GdkPixbuf * pixbuf)
{
    if (pixbuf != NULL)

    }
    return FALSE;
}
#endif

static char lockfile[PATH_MAX];


    textdomain (GETTEXT_PACKAGE);
#endif

    /* Initialize GTK (via g_option_context_parse) and parse command line arguments. */
    GOptionContext * context = g_option_context_new("");
    g_option_context_add_main_entries(context, opt_entries, GETTEXT_PACKAGE);
    g_option_context_add_group(context, gtk_get_option_group(TRUE));
    GError * err = NULL;
    if ( ! g_option_context_parse(context, &argc, &argv, &err))
    {
        g_print(_("Error: %s\n"), err->message);
        g_error_free(err);
        return 1;
    }
    g_option_context_free(context);

    HandlerContext handler_context;
    memset(&handler_context, 0, sizeof(handler_context));


        handler_context.lock_screen = TRUE;
    }

    /* Initialize GTK (via g_option_context_parse) and parse command line arguments. */
    GOptionContext * context = g_option_context_new("");
    g_option_context_add_main_entries(context, opt_entries, GETTEXT_PACKAGE);
    g_option_context_add_group(context, gtk_get_option_group(TRUE));
    GError * err = NULL;
    if ( ! g_option_context_parse(context, &argc, &argv, &err))
    {
        g_print(_("Error: %s\n"), err->message);
        g_error_free(err);
        return 1;
    }
    g_option_context_free(context);

    /* Make the button images accessible. */
    gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");


    GdkScreen* screen = gtk_widget_get_screen(window);
    gtk_window_set_default_size(GTK_WINDOW(window), gdk_screen_get_width(screen), gdk_screen_get_height(screen));
    gtk_widget_set_app_paintable(window, TRUE);
#if GTK_CHECK_VERSION(3,0,0)
    g_signal_connect(G_OBJECT(window), "draw", G_CALLBACK(draw), pixbuf);
#else
    g_signal_connect(G_OBJECT(window), "expose_event", G_CALLBACK(expose_event), pixbuf);
#endif
    g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);

    /* Toplevel container */

Lines 42-48 Link Here

(-)lxsession-0.5.2-old/lxpolkit/main.vala (-1 / +1 lines)
42	}	42	}
43	#endif	43	#endif
44	# if USE_GTK3	44	# if USE_GTK3
45	Application app = new Application ();	45	GLib.Application app = new GLib.Application ("org.lxde.lxpolkit", 0);
46	app.run (args);	46	app.run (args);
47	#endif	47	#endif
48		48

Lines 37-43 Link Here

(-)lxsession-0.5.2-old/lxclipboard/main.vala (-1 / +1 lines)
37	}	37	}
38	#endif	38	#endif
39	# if USE_GTK3	39	# if USE_GTK3
40	Application app = new Application ();	40	GLib.Application app = new GLib.Application ("org.lxde.lxclipboard", 0);
41	app.run (args);	41	app.run (args);
42	#endif	42	#endif
43		43




            session = "";
            extras = "";
        }
        else if (global_settings.get_item_string("Session", "windows_manager", "command") != null)
        {
            mode = "advanced";
            wm_command = global_settings.get_item_string("Session", "windows_manager", "command");
            session = global_settings.get_item_string("Session", "windows_manager", "session");
            extras = global_settings.get_item_string("Session", "windows_manager", "extras");
        }
        else
        {
            mode = "simple";
            wm_command = "openbox";
        }

        string session_command;


Lines 233-238 Link Here

(-)lxsession-0.5.2-old/lxsession/main.vala (+6 lines)
233	global_windows_manager = windowsmanager;	233	global_windows_manager = windowsmanager;
234	global_windows_manager.launch();	234	global_windows_manager.launch();
235	}	235	}
		236	else
		237	{
		238	var windowsmanager = new WindowsManagerApp();
		239	global_windows_manager = windowsmanager;
		240	global_windows_manager.launch();
		241	}
236		242
237	/* Disable autostart if it's specified in the conf file. */	243	/* Disable autostart if it's specified in the conf file. */
238	if (global_settings.get_item_string("Session", "disable_autostart", null) == "all")	244	if (global_settings.get_item_string("Session", "disable_autostart", null) == "all")

Return to bug 524660

Lines 23-30 Link Here

(-)lxsession-0.5.2-old/lxsession/dbus-common.c (-30 / +9 lines)
23	#include <glib.h>	23	#include <glib.h>
24	#include <glib-object.h>	24	#include <glib-object.h>
25	#include <gio/gio.h>	25	#include <gio/gio.h>
26	#include <dbus/dbus-glib-lowlevel.h>
27	#include <dbus/dbus-glib.h>
28	#include <stdlib.h>	26	#include <stdlib.h>
29	#include <string.h>	27	#include <string.h>
30	#include <stdio.h>	28	#include <stdio.h>
Lines 304-321 static gboolean lxsession_session_object Link Here
304	_data_->_tmp2_ = FALSE;	302	_data_->_tmp2_ = FALSE;
305	_data_->_tmp2_ = lxsession_console_kit_object_can_stop_finish (_data_->_tmp1_, _data_->_res_, &_data_->_inner_error_);	303	_data_->_tmp2_ = lxsession_console_kit_object_can_stop_finish (_data_->_tmp1_, _data_->_res_, &_data_->_inner_error_);
306	_data_->_tmp0_ = _data_->_tmp2_;	304	_data_->_tmp0_ = _data_->_tmp2_;
307	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {	305	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
308	if (_data_->_inner_error_->domain == DBUS_GERROR) {	306	goto __catch11_g_error;
309	goto __catch11_dbus_gerror;
310	}
311	g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code);
312	g_clear_error (&_data_->_inner_error_);
313	return FALSE;
314	}	307	}
315	_data_->can_shutdown_available = _data_->_tmp0_;	308	_data_->can_shutdown_available = _data_->_tmp0_;
316	}	309	}
317	goto __finally11;	310	goto __finally11;
318	__catch11_dbus_gerror:	311	__catch11_g_error:
319	{	312	{
320	_data_->err = _data_->_inner_error_;	313	_data_->err = _data_->_inner_error_;
321	_data_->_inner_error_ = NULL;	314	_data_->_inner_error_ = NULL;
Lines 358-374 void lxsession_session_object_lxsession_ Link Here
358	LxsessionConsoleKitObject* _tmp0_ = NULL;	351	LxsessionConsoleKitObject* _tmp0_ = NULL;
359	_tmp0_ = self->dbus_interface;	352	_tmp0_ = self->dbus_interface;
360	lxsession_console_kit_object_stop (_tmp0_, &_inner_error_);	353	lxsession_console_kit_object_stop (_tmp0_, &_inner_error_);
361	if (G_UNLIKELY (_inner_error_ != NULL)) {	354	if (G_UNLIKELY (_inner_error_ != NULL)) {
362	if (_inner_error_->domain == DBUS_GERROR) {	355	goto __catch12_g_error;
363	goto __catch12_dbus_gerror;
364	}
365	g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
366	g_clear_error (&_inner_error_);
367	return;
368	}	356	}
369	}	357	}
370	goto __finally12;	358	goto __finally12;
371	__catch12_dbus_gerror:	359	__catch12_g_error:
372	{	360	{
373	GError* err = NULL;	361	GError* err = NULL;
374	GError* _tmp1_ = NULL;	362	GError* _tmp1_ = NULL;
Lines 396-412 void lxsession_session_object_lxsession_ Link Here
396	LxsessionConsoleKitObject* _tmp0_ = NULL;	384	LxsessionConsoleKitObject* _tmp0_ = NULL;
397	_tmp0_ = self->dbus_interface;	385	_tmp0_ = self->dbus_interface;
398	lxsession_console_kit_object_restart (_tmp0_, &_inner_error_);	386	lxsession_console_kit_object_restart (_tmp0_, &_inner_error_);
399	if (G_UNLIKELY (_inner_error_ != NULL)) {	387	if (G_UNLIKELY (_inner_error_ != NULL)) {
400	if (_inner_error_->domain == DBUS_GERROR) {	388	goto __catch13_g_error;
401	goto __catch13_dbus_gerror;
402	}
403	g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
404	g_clear_error (&_inner_error_);
405	return;
406	}	389	}
407	}	390	}
408	goto __finally13;	391	goto __finally13;
409	__catch13_dbus_gerror:	392	__catch13_g_error:
410	{	393	{
411	GError* err = NULL;	394	GError* err = NULL;
412	GError* _tmp1_ = NULL;	395	GError* _tmp1_ = NULL;
Lines 533-539 static void lxsession_console_kit_object Link Here
533	GVariant *_arguments;	515	GVariant *_arguments;
534	GVariantBuilder _arguments_builder;	516	GVariantBuilder _arguments_builder;
535	GDBusMessage *_reply_message;	517	GDBusMessage *_reply_message;
536	DBUS_GERROR;
537	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "Restart");	518	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "Restart");
538	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);	519	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
539	_arguments = g_variant_builder_end (&_arguments_builder);	520	_arguments = g_variant_builder_end (&_arguments_builder);
Lines 556-562 static void lxsession_console_kit_object Link Here
556	GVariant *_arguments;	537	GVariant *_arguments;
557	GVariantBuilder _arguments_builder;	538	GVariantBuilder _arguments_builder;
558	GDBusMessage *_reply_message;	539	GDBusMessage *_reply_message;
559	DBUS_GERROR;
560	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "Stop");	540	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "Stop");
561	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);	541	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
562	_arguments = g_variant_builder_end (&_arguments_builder);	542	_arguments = g_variant_builder_end (&_arguments_builder);
Lines 585-591 static void lxsession_console_kit_object Link Here
585	GDBusMessage *_message;	565	GDBusMessage *_message;
586	GVariant *_arguments;	566	GVariant *_arguments;
587	GVariantBuilder _arguments_builder;	567	GVariantBuilder _arguments_builder;
588	DBUS_GERROR;
589	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "CanRestart");	568	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "CanRestart");
590	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);	569	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
591	_arguments = g_variant_builder_end (&_arguments_builder);	570	_arguments = g_variant_builder_end (&_arguments_builder);
Lines 623-629 static void lxsession_console_kit_object Link Here
623	GDBusMessage *_message;	602	GDBusMessage *_message;
624	GVariant *_arguments;	603	GVariant *_arguments;
625	GVariantBuilder _arguments_builder;	604	GVariantBuilder _arguments_builder;
626	DBUS_GERROR;
627	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "CanStop");	605	_message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy ) self), g_dbus_proxy_get_object_path ((GDBusProxy ) self), "org.freedesktop.ConsoleKit.Manager", "CanStop");
628	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);	606	g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
629	_arguments = g_variant_builder_end (&_arguments_builder);	607	_arguments = g_variant_builder_end (&_arguments_builder);

Lines 419-424 Link Here

(-)lxsession-0.5.2-old/lxsession-logout/lxsession-logout.c (-13 / +36 lines)
419	}	419	}
420		420
421	/* Handler for "expose_event" on background. */	421	/* Handler for "expose_event" on background. */
		422	#if GTK_CHECK_VERSION(3,0,0)
		423	gboolean draw(GtkWidget * widget, cairo_t * cr, GdkPixbuf * pixbuf)
		424	{
		425	if (pixbuf != NULL)
		426	{
		427	/* Copy the appropriate rectangle of the root window pixmap to the drawing area.
		428	* All drawing areas are immediate children of the toplevel window, so the allocation yields the source coordinates directly. */
		429	gdk_cairo_set_source_pixbuf (
		430	cr,
		431	pixbuf,
		432	0,
		433	0);
		434
		435	cairo_paint (cr);
		436	}
		437	return FALSE;
		438	}
		439	#else
422	gboolean expose_event(GtkWidget * widget, GdkEventExpose * event, GdkPixbuf * pixbuf)	440	gboolean expose_event(GtkWidget * widget, GdkEventExpose * event, GdkPixbuf * pixbuf)
423	{	441	{
424	if (pixbuf != NULL)	442	if (pixbuf != NULL)
Lines 441-446 Link Here
441	}	459	}
442	return FALSE;	460	return FALSE;
443	}	461	}
		462	#endif
444		463
445	static char lockfile[PATH_MAX];	464	static char lockfile[PATH_MAX];
446		465
Lines 460-478 Link Here
460	textdomain (GETTEXT_PACKAGE);	479	textdomain (GETTEXT_PACKAGE);
461	#endif	480	#endif
462		481
463	/* Initialize GTK (via g_option_context_parse) and parse command line arguments. */
464	GOptionContext * context = g_option_context_new("");
465	g_option_context_add_main_entries(context, opt_entries, GETTEXT_PACKAGE);
466	g_option_context_add_group(context, gtk_get_option_group(TRUE));
467	GError * err = NULL;
468	if ( ! g_option_context_parse(context, &argc, &argv, &err))
469	{
470	g_print(_("Error: %s\n"), err->message);
471	g_error_free(err);
472	return 1;
473	}
474	g_option_context_free(context);
475
476	HandlerContext handler_context;	482	HandlerContext handler_context;
477	memset(&handler_context, 0, sizeof(handler_context));	483	memset(&handler_context, 0, sizeof(handler_context));
478		484
Lines 587-592 Link Here
587	handler_context.lock_screen = TRUE;	593	handler_context.lock_screen = TRUE;
588	}	594	}
589		595
		596	/* Initialize GTK (via g_option_context_parse) and parse command line arguments. */
		597	GOptionContext * context = g_option_context_new("");
		598	g_option_context_add_main_entries(context, opt_entries, GETTEXT_PACKAGE);
		599	g_option_context_add_group(context, gtk_get_option_group(TRUE));
		600	GError * err = NULL;
		601	if ( ! g_option_context_parse(context, &argc, &argv, &err))
		602	{
		603	g_print(_("Error: %s\n"), err->message);
		604	g_error_free(err);
		605	return 1;
		606	}
		607	g_option_context_free(context);
		608
590	/* Make the button images accessible. */	609	/* Make the button images accessible. */
591	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");	610	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), PACKAGE_DATA_DIR "/lxsession/images");
592		611
Lines 600-606 Link Here
600	GdkScreen* screen = gtk_widget_get_screen(window);	619	GdkScreen* screen = gtk_widget_get_screen(window);
601	gtk_window_set_default_size(GTK_WINDOW(window), gdk_screen_get_width(screen), gdk_screen_get_height(screen));	620	gtk_window_set_default_size(GTK_WINDOW(window), gdk_screen_get_width(screen), gdk_screen_get_height(screen));
602	gtk_widget_set_app_paintable(window, TRUE);	621	gtk_widget_set_app_paintable(window, TRUE);
		622	#if GTK_CHECK_VERSION(3,0,0)
		623	g_signal_connect(G_OBJECT(window), "draw", G_CALLBACK(draw), pixbuf);
		624	#else
603	g_signal_connect(G_OBJECT(window), "expose_event", G_CALLBACK(expose_event), pixbuf);	625	g_signal_connect(G_OBJECT(window), "expose_event", G_CALLBACK(expose_event), pixbuf);
		626	#endif
604	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);	627	g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL);
605		628
606	/* Toplevel container */	629	/* Toplevel container */

Line 1 Link Here

(-)lxsession-0.5.2-old/data/ui/lxpolkit.ui (-1 / +181 lines)
1	<?xml version="1.0"?><interface><requires lib="gtk+" version="2.16"/><object class="GtkDialog" id="dlg"><property name="border_width">5</property><property name="title" translatable="yes">Authentication</property><property name="resizable">False</property><property name="window_position">center</property><property name="type_hint">normal</property><property name="has_separator">False</property><child internal-child="vbox"><object class="GtkVBox" id="dialog-vbox1"><property name="visible">True</property><property name="orientation">vertical</property><property name="spacing">2</property><child><object class="GtkVBox" id="vbox1"><property name="visible">True</property><property name="border_width">12</property><property name="orientation">vertical</property><property name="spacing">6</property><child><object class="GtkHBox" id="hbox1"><property name="visible">True</property><child><object class="GtkImage" id="icon"><property name="visible">True</property><property name="stock">gtk-missing-image</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkLabel" id="msg"><property name="visible">True</property><property name="xalign">0</property><property name="yalign">0</property><property name="wrap">True</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkHBox" id="id_hbox"><property name="visible">True</property><property name="spacing">6</property><child><object class="GtkLabel" id="label1"><property name="visible">True</property><property name="label" translatable="yes">Identity:</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkComboBox" id="id"><property name="visible">True</property><child><object class="GtkCellRendererText" id="rendertext"/><attributes><attribute name="text">0</attribute></attributes></child></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child><object class="GtkHBox" id="hbox2"><property name="visible">True</property><child><object class="GtkLabel" id="request_label"><property name="visible">True</property></object><packing><property name="expand">False</property><property name="position">0</property></packing></child><child><object class="GtkEntry" id="request"><property name="visible">True</property><property name="can_focus">True</property><property name="has_focus">True</property><property name="visibility">False</property><property name="invisible_char">•</property><property name="activates_default">True</property></object><packing><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="position">2</property></packing></child><child><object class="GtkLabel" id="detail"><property name="visible">True</property><property name="xalign">0</property><property name="yalign">0</property></object><packing><property name="expand">False</property><property name="position">3</property></packing></child></object><packing><property name="expand">False</property><property name="position">1</property></packing></child><child internal-child="action_area"><object class="GtkHButtonBox" id="dialog-action_area1"><property name="visible">True</property><property name="layout_style">end</property><child><object class="GtkButton" id="cancel"><property name="label">gtk-cancel</property><property name="visible">True</property><property name="can_focus">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">0</property></packing></child><child><object class="GtkButton" id="ok"><property name="label">gtk-ok</property><property name="visible">True</property><property name="can_focus">True</property><property name="can_default">True</property><property name="has_default">True</property><property name="receives_default">True</property><property name="use_stock">True</property></object><packing><property name="expand">False</property><property name="fill">False</property><property name="position">1</property></packing></child></object><packing><property name="expand">False</property><property name="pack_type">end</property><property name="position">0</property></packing></child></object></child><action-widgets><action-widget response="-6">cancel</action-widget><action-widget response="-5">ok</action-widget></action-widgets></object></interface>	1	<?xml version="1.0"?>
		2	<interface>
		3	<requires lib="gtk+" version="2.16"/>
		4	<object class="GtkDialog" id="dlg">
		5	<property name="border_width">5</property>
		6	<property name="title" translatable="yes">Authentication</property>
		7	<property name="resizable">False</property>
		8	<property name="window_position">center</property>
		9	<property name="type_hint">normal</property>
		10	<child internal-child="vbox">
		11	<object class="GtkVBox" id="dialog-vbox1">
		12	<property name="visible">True</property>
		13	<property name="orientation">vertical</property>
		14	<property name="spacing">2</property>
		15	<child>
		16	<object class="GtkVBox" id="vbox1">
		17	<property name="visible">True</property>
		18	<property name="border_width">12</property>
		19	<property name="orientation">vertical</property>
		20	<property name="spacing">6</property>
		21	<child>
		22	<object class="GtkHBox" id="hbox1">
		23	<property name="visible">True</property>
		24	<child>
		25	<object class="GtkImage" id="icon">
		26	<property name="visible">True</property>
		27	<property name="stock">gtk-missing-image</property>
		28	</object>
		29	<packing>
		30	<property name="expand">False</property>
		31	<property name="position">0</property>
		32	</packing>
		33	</child>
		34	<child>
		35	<object class="GtkLabel" id="msg">
		36	<property name="visible">True</property>
		37	<property name="xalign">0</property>
		38	<property name="yalign">0</property>
		39	<property name="wrap">True</property>
		40	</object>
		41	<packing>
		42	<property name="position">1</property>
		43	</packing>
		44	</child>
		45	</object>
		46	<packing>
		47	<property name="expand">False</property>
		48	<property name="position">0</property>
		49	</packing>
		50	</child>
		51	<child>
		52	<object class="GtkHBox" id="id_hbox">
		53	<property name="visible">True</property>
		54	<property name="spacing">6</property>
		55	<child>
		56	<object class="GtkLabel" id="label1">
		57	<property name="visible">True</property>
		58	<property name="label" translatable="yes">Identity:</property>
		59	</object>
		60	<packing>
		61	<property name="expand">False</property>
		62	<property name="position">0</property>
		63	</packing>
		64	</child>
		65	<child>
66	<object class="GtkComboBox" id="id">
67	<property name="visible">True</property>
68	<child>
69	<object class="GtkCellRendererText" id="rendertext"/>
70	<attributes>
71	<attribute name="text">0</attribute>
72	</attributes>
73	</child>
74	</object>
75	<packing>
76	<property name="position">1</property>
77	</packing>
78	</child>
79	</object>
80	<packing>
81	<property name="expand">False</property>
82	<property name="position">1</property>
83	</packing>
84	</child>
85	<child>
86	<object class="GtkHBox" id="hbox2">
87	<property name="visible">True</property>
88	<child>
89	<object class="GtkLabel" id="request_label">
90	<property name="visible">True</property>
91	</object>
92	<packing>
93	<property name="expand">False</property>
94	<property name="position">0</property>
95	</packing>
96	</child>
97	<child>
98	<object class="GtkEntry" id="request">
99	<property name="visible">True</property>
100	<property name="can_focus">True</property>
101	<property name="has_focus">True</property>
102	<property name="visibility">False</property>
103	<property name="invisible_char">•</property>
104	<property name="activates_default">True</property>
105	</object>
106	<packing>
107	<property name="position">1</property>
108	</packing>
109	</child>
110	</object>
111	<packing>
112	<property name="expand">False</property>
113	<property name="position">2</property>
114	</packing>
115	</child>
116	<child>
117	<object class="GtkLabel" id="detail">
118	<property name="visible">True</property>
119	<property name="xalign">0</property>
120	<property name="yalign">0</property>
121	</object>
122	<packing>
123	<property name="expand">False</property>
124	<property name="position">3</property>
125	</packing>
126	</child>
127	</object>
128	<packing>
129	<property name="expand">False</property>
130	<property name="position">1</property>
131	</packing>
132	</child>
133	<child internal-child="action_area">
134	<object class="GtkHButtonBox" id="dialog-action_area1">
135	<property name="visible">True</property>
136	<property name="layout_style">end</property>
137	<child>
138	<object class="GtkButton" id="cancel">
139	<property name="label">gtk-cancel</property>
140	<property name="visible">True</property>
141	<property name="can_focus">True</property>
142	<property name="receives_default">True</property>
143	<property name="use_stock">True</property>
144	</object>
145	<packing>
146	<property name="expand">False</property>
147	<property name="fill">False</property>
148	<property name="position">0</property>
149	</packing>
150	</child>
151	<child>
152	<object class="GtkButton" id="ok">
153	<property name="label">gtk-ok</property>
154	<property name="visible">True</property>
155	<property name="can_focus">True</property>
156	<property name="can_default">True</property>
157	<property name="has_default">True</property>
158	<property name="receives_default">True</property>
159	<property name="use_stock">True</property>
160	</object>
161	<packing>
162	<property name="expand">False</property>
163	<property name="fill">False</property>
164	<property name="position">1</property>
165	</packing>
166	</child>
167	</object>
168	<packing>
169	<property name="expand">False</property>
170	<property name="pack_type">end</property>
171	<property name="position">0</property>
172	</packing>
173	</child>
174	</object>
175	</child>
176	<action-widgets>
177	<action-widget response="-6">cancel</action-widget>
178	<action-widget response="-5">ok</action-widget>
179	</action-widgets>
180	</object>
181	</interface>

Lines 43-49 public class SessionObject: Object { Link Here

(-)lxsession-0.5.2-old/lxsession/dbus-common.vala (-7 / +7 lines)
43	try {	43	try {
44	can_shutdown_available = yield dbus_interface.can_stop ();	44	can_shutdown_available = yield dbus_interface.can_stop ();
45	}	45	}
46	catch (DBus.Error err) {	46	catch (Error err) {
47	warning ("%s", err.message);	47	warning ("%s", err.message);
48	can_shutdown_available = false;	48	can_shutdown_available = false;
49	}	49	}
Lines 55-61 public class SessionObject: Object { Link Here
55	try {	55	try {
56	dbus_interface.stop ();	56	dbus_interface.stop ();
57	}	57	}
58	catch (DBus.Error err) {	58	catch (Error err) {
59	warning ("%s", err.message);	59	warning ("%s", err.message);
60	}	60	}
61	}	61	}
Lines 64-70 public class SessionObject: Object { Link Here
64	try {	64	try {
65	dbus_interface.restart ();	65	dbus_interface.restart ();
66	}	66	}
67	catch (DBus.Error err) {	67	catch (Error err) {
68	warning ("%s", err.message);	68	warning ("%s", err.message);
69	}	69	}
70	}	70	}
Lines 77-86 public interface ConsoleKitObject: Objec Link Here
77	public const string OBJECT_PATH = "/org/freedesktop/ConsoleKit/Manager";	77	public const string OBJECT_PATH = "/org/freedesktop/ConsoleKit/Manager";
78	public const string INTERFACE_NAME = "org.freedesktop.ConsoleKit.Manager";	78	public const string INTERFACE_NAME = "org.freedesktop.ConsoleKit.Manager";
79		79
80	public abstract void restart () throws DBus.Error;	80	public abstract void restart () throws Error;
81	public abstract void stop () throws DBus.Error;	81	public abstract void stop () throws Error;
82	public abstract async bool can_restart () throws DBus.Error;	82	public abstract async bool can_restart () throws Error;
83	public abstract async bool can_stop () throws DBus.Error;	83	public abstract async bool can_stop () throws Error;
84	}	84	}
85		85
86	void on_bus_aquired (DBusConnection conn) {	86	void on_bus_aquired (DBusConnection conn) {

Lines 83-90 Link Here

(-)lxsession-0.5.2-old/Makefile.am (-4 / +10 lines)
83	$(NULL)	83	$(NULL)
84		84
85	if USE_GTK3	85	if USE_GTK3
		86	lxclipboard_lxclipboard_VALAFLAGS += -D USE_GTK3
86	else	87	else
87	lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0	88	lxclipboard_lxclipboard_VALAFLAGS += --pkg unique-1.0 -D USE_GTK2
88	lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS)	89	lxclipboard_lxclipboard_CPPFLAGS += $(UNIQUE_CFLAGS)
89	lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS)	90	lxclipboard_lxclipboard_LDADD += $(UNIQUE_LIBS)
90	endif	91	endif
Lines 128-135 Link Here
128	$(NULL)	129	$(NULL)
129		130
130	if USE_GTK3	131	if USE_GTK3
		132	lxpolkit_lxpolkit_VALAFLAGS += -D USE_GTK3
131	else	133	else
132	lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0	134	lxpolkit_lxpolkit_VALAFLAGS += --pkg unique-1.0 -D USE_GTK2
133	lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS)	135	lxpolkit_lxpolkit_CPPFLAGS += $(UNIQUE_CFLAGS)
134	lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS)	136	lxpolkit_lxpolkit_LDADD += $(UNIQUE_LIBS)
135	endif	137	endif
Lines 215-221 Link Here
215	lxsession_default_apps_lxsession_default_apps_VALAFLAGS = \	217	lxsession_default_apps_lxsession_default_apps_VALAFLAGS = \
216	--vapidir=$(srcdir)/vapi \	218	--vapidir=$(srcdir)/vapi \
217	--pkg @VALA_GTK_LIBS@ \	219	--pkg @VALA_GTK_LIBS@ \
218	--pkg dbus-glib-1 \
219	--pkg gio-2.0 \	220	--pkg gio-2.0 \
220	--pkg posix \	221	--pkg posix \
221	--pkg lxsession-edit \	222	--pkg lxsession-edit \
Lines 242-247 Link Here
242	$(X11_LIBS) \	243	$(X11_LIBS) \
243	$(NULL)	244	$(NULL)
244		245
		246	if USE_GTK3
		247	lxsession_default_apps_lxsession_default_apps_VALAFLAGS += -D USE_GTK3
		248	else
		249	lxsession_default_apps_lxsession_default_apps_VALAFLAGS += -D USE_GTK2
		250	endif
		251
245	if USE_BUILDIN_CLIPBOARD	252	if USE_BUILDIN_CLIPBOARD
246	buildinclip_SOURCES = \	253	buildinclip_SOURCES = \
247	lxclipboard/clipboard.c \	254	lxclipboard/clipboard.c \
Lines 420-426 Link Here
420		427
421	lxsession_lxsession_VALAFLAGS = \	428	lxsession_lxsession_VALAFLAGS = \
422	--vapidir=$(srcdir)/vapi \	429	--vapidir=$(srcdir)/vapi \
423	--pkg dbus-glib-1 \
424	--pkg gio-2.0 \	430	--pkg gio-2.0 \
425	--pkg posix \	431	--pkg posix \
426	--pkg lxsettings-daemon \	432	--pkg lxsettings-daemon \

Lines 225-237 Link Here

(-)lxsession-0.5.2-old/lxsession/app.vala (-1 / +6 lines)
225	session = "";	225	session = "";
226	extras = "";	226	extras = "";
227	}	227	}
228	else	228	else if (global_settings.get_item_string("Session", "windows_manager", "command") != null)
229	{	229	{
230	mode = "advanced";	230	mode = "advanced";
231	wm_command = global_settings.get_item_string("Session", "windows_manager", "command");	231	wm_command = global_settings.get_item_string("Session", "windows_manager", "command");
232	session = global_settings.get_item_string("Session", "windows_manager", "session");	232	session = global_settings.get_item_string("Session", "windows_manager", "session");
233	extras = global_settings.get_item_string("Session", "windows_manager", "extras");	233	extras = global_settings.get_item_string("Session", "windows_manager", "extras");
234	}	234	}
		235	else
		236	{
		237	mode = "simple";
		238	wm_command = "openbox";
		239	}
235		240
236	string session_command;	241	string session_command;
237		242