diff -Nru lxsession-0.4.9.1~git20120708/debian/changelog lxsession-0.4.9.1~git20120828/debian/changelog --- lxsession-0.4.9.1~git20120708/debian/changelog 2012-07-08 12:35:47.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/debian/changelog 2012-09-09 13:55:11.000000000 +0000 @@ -1,4 +1,12 @@ -lxsession (0.4.9.1~git20120708-0ubuntu1~ppa1) quantal; urgency=low +lxsession (0.4.9.1~git20120828-0ubuntu1) quantal; urgency=low + + * New upstream snapshot, including only bug fixes and translation updates. + - Fix monitoring of the conf file (LP: #1037356) + - Fix usage of ConsoleKit in dbus interface (LP: #1041283) + + -- Julien Lavergne Sun, 09 Sep 2012 15:55:00 +0200 + +lxsession (0.4.9.1~git20120708-0ubuntu1) quantal; urgency=low * New upstream snapshot. - Implement Dbus method for lxsession-logout command (LP: #626286) @@ -14,9 +22,9 @@ - Use dh_install --fail-missing. - Clean also manpages generated. * debian/copyright - - Update with new files. + - Update with the new files. - -- Julien Lavergne Sun, 08 Jul 2012 14:35:40 +0200 + -- Julien Lavergne Sun, 08 Jul 2012 23:48:45 +0200 lxsession (0.4.6.1+git20120214-0ubuntu1) precise; urgency=low diff -Nru lxsession-0.4.9.1~git20120708/debian/control lxsession-0.4.9.1~git20120828/debian/control --- lxsession-0.4.9.1~git20120708/debian/control 2012-07-08 12:37:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/debian/control 2012-07-08 13:47:17.000000000 +0000 @@ -15,7 +15,7 @@ Package: lxsession Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, lxsession-data Recommends: openbox | x-window-manager, openssh-client | rsh-client | ssh-client Suggests: gpicview, lxde-common, lxpanel, pcmanfm Provides: lxsession-lite, x-session-manager diff -Nru lxsession-0.4.9.1~git20120708/lxpolkit/main.c lxsession-0.4.9.1~git20120828/lxpolkit/main.c --- lxsession-0.4.9.1~git20120708/lxpolkit/main.c 2012-07-08 12:08:01.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxpolkit/main.c 2012-08-27 18:39:21.000000000 +0000 @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.16.1, the Vala compiler +/* main.c generated by valac 0.14.2, the Vala compiler * generated from main.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/app.c lxsession-0.4.9.1~git20120828/lxsession/app.c --- lxsession-0.4.9.1~git20120708/lxsession/app.c 2012-07-08 12:08:03.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/app.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* app.c generated by valac 0.16.1, the Vala compiler +/* app.c generated by valac 0.14.2, the Vala compiler * generated from app.vala, do not modify */ /* @@ -30,6 +30,7 @@ #include #include #include +#include <../lxpolkit/lxpolkit.h> #define LXSESSION_TYPE_APP_OBJECT (lxsession_app_object_get_type ()) @@ -1917,23 +1918,7 @@ switch (0) { default: { - gchar* _tmp10_; - gchar* create_command; - const gchar* _tmp11_; - gchar** _tmp12_; - gchar** _tmp13_ = NULL; - gchar** _tmp14_; - gint _tmp14__length1; - lxsession_app_object_set_name ((LxsessionAppObject*) self, "lxpolkit"); - _tmp10_ = g_strdup ("lxpolkit"); - create_command = _tmp10_; - _tmp11_ = create_command; - _tmp13_ = _tmp12_ = g_strsplit_set (_tmp11_, " ", 0); - _tmp14_ = _tmp13_; - _tmp14__length1 = _vala_array_length (_tmp12_); - lxsession_app_object_set_command ((LxsessionAppObject*) self, _tmp14_, _vala_array_length (_tmp12_)); - _tmp14_ = (_vala_array_free (_tmp14_, _tmp14__length1, (GDestroyNotify) g_free), NULL); - _g_free0 (create_command); + policykit_agent_init (); break; } } @@ -1950,6 +1935,7 @@ void lxsession_polkit_app_deactivate (LxsessionPolkitApp* self) { g_return_if_fail (self != NULL); + policykit_agent_finalize (); } diff -Nru lxsession-0.4.9.1~git20120708/lxsession/autostart.c lxsession-0.4.9.1~git20120828/lxsession/autostart.c --- lxsession-0.4.9.1~git20120708/lxsession/autostart.c 2012-07-08 12:08:03.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/autostart.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* autostart.c generated by valac 0.16.1, the Vala compiler +/* autostart.c generated by valac 0.14.2, the Vala compiler * generated from autostart.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/conffiles.c lxsession-0.4.9.1~git20120828/lxsession/conffiles.c --- lxsession-0.4.9.1~git20120708/lxsession/conffiles.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/conffiles.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* conffiles.c generated by valac 0.16.1, the Vala compiler +/* conffiles.c generated by valac 0.14.2, the Vala compiler * generated from conffiles.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/control.c lxsession-0.4.9.1~git20120828/lxsession/control.c --- lxsession-0.4.9.1~git20120708/lxsession/control.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/control.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* control.c generated by valac 0.16.1, the Vala compiler +/* control.c generated by valac 0.14.2, the Vala compiler * generated from control.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/dbus-common.c lxsession-0.4.9.1~git20120828/lxsession/dbus-common.c --- lxsession-0.4.9.1~git20120708/lxsession/dbus-common.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/dbus-common.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* dbus-common.c generated by valac 0.16.1, the Vala compiler +/* dbus-common.c generated by valac 0.14.2, the Vala compiler * generated from dbus-common.vala, do not modify */ /* @@ -40,7 +40,6 @@ typedef struct _LxsessionSessionObject LxsessionSessionObject; typedef struct _LxsessionSessionObjectClass LxsessionSessionObjectClass; typedef struct _LxsessionSessionObjectPrivate LxsessionSessionObjectPrivate; -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define LXSESSION_TYPE_CONSOLE_KIT_OBJECT (lxsession_console_kit_object_get_type ()) #define LXSESSION_CONSOLE_KIT_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LXSESSION_TYPE_CONSOLE_KIT_OBJECT, LxsessionConsoleKitObject)) @@ -51,7 +50,7 @@ typedef struct _LxsessionConsoleKitObjectIface LxsessionConsoleKitObjectIface; #define LXSESSION_TYPE_CONSOLE_KIT_OBJECT_PROXY (lxsession_console_kit_object_proxy_get_type ()) -#define _dbus_g_connection_unref0(var) ((var == NULL) ? NULL : (var = (dbus_g_connection_unref (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _LxsessionSessionObjectLxsessionCanShutdownData LxsessionSessionObjectLxsessionCanShutdownData; typedef GDBusProxy LxsessionConsoleKitObjectProxy; @@ -77,15 +76,6 @@ typedef struct _LxsessionGnomeSessionServer LxsessionGnomeSessionServer; typedef struct _LxsessionGnomeSessionServerClass LxsessionGnomeSessionServerClass; -struct _LxsessionSessionObject { - GObject parent_instance; - LxsessionSessionObjectPrivate * priv; -}; - -struct _LxsessionSessionObjectClass { - GObjectClass parent_class; -}; - struct _LxsessionConsoleKitObjectIface { GTypeInterface parent_iface; void (*restart) (LxsessionConsoleKitObject* self, GError** error); @@ -96,6 +86,16 @@ gboolean (*can_stop_finish) (LxsessionConsoleKitObject* self, GAsyncResult* _res_, GError** error); }; +struct _LxsessionSessionObject { + GObject parent_instance; + LxsessionSessionObjectPrivate * priv; + LxsessionConsoleKitObject* dbus_interface; +}; + +struct _LxsessionSessionObjectClass { + GObjectClass parent_class; +}; + struct _LxsessionSessionObjectLxsessionCanShutdownData { int _state_; GObject* _source_object_; @@ -104,17 +104,12 @@ LxsessionSessionObject* self; gboolean result; gboolean can_shutdown_available; - DBusGConnection* _tmp0_; - DBusGConnection* connection; - DBusGConnection* _tmp1_; - DBusGProxy* _tmp2_; - LxsessionConsoleKitObject* dbus_interface; - LxsessionConsoleKitObject* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; + LxsessionConsoleKitObject* _tmp0_; + gboolean _tmp1_; + gboolean _tmp2_; GError* err; - GError* _tmp6_; - const gchar* _tmp7_; + GError* _tmp3_; + const gchar* _tmp4_; GError * _inner_error_; }; @@ -122,19 +117,18 @@ static gpointer lxsession_session_object_parent_class = NULL; GType lxsession_session_object_get_type (void) G_GNUC_CONST; +GType lxsession_console_kit_object_proxy_get_type (void) G_GNUC_CONST; +guint lxsession_console_kit_object_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); +GType lxsession_console_kit_object_get_type (void) G_GNUC_CONST; enum { LXSESSION_SESSION_OBJECT_DUMMY_PROPERTY }; +LxsessionSessionObject* lxsession_session_object_new (void); +LxsessionSessionObject* lxsession_session_object_construct (GType object_type); static void lxsession_session_object_lxsession_can_shutdown_data_free (gpointer _data); void lxsession_session_object_lxsession_can_shutdown (LxsessionSessionObject* self, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean lxsession_session_object_lxsession_can_shutdown_finish (LxsessionSessionObject* self, GAsyncResult* _res_); static gboolean lxsession_session_object_lxsession_can_shutdown_co (LxsessionSessionObjectLxsessionCanShutdownData* _data_); -#define LXSESSION_CONSOLE_KIT_OBJECT_UNIQUE_NAME "org.freedesktop.ConsoleKit" -#define LXSESSION_CONSOLE_KIT_OBJECT_OBJECT_PATH "/org/freedesktop/ConsoleKit/Manager" -#define LXSESSION_CONSOLE_KIT_OBJECT_INTERFACE_NAME "org.freedesktop.ConsoleKit.Manager" -GType lxsession_console_kit_object_proxy_get_type (void) G_GNUC_CONST; -guint lxsession_console_kit_object_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); -GType lxsession_console_kit_object_get_type (void) G_GNUC_CONST; void lxsession_console_kit_object_can_stop (LxsessionConsoleKitObject* self, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean lxsession_console_kit_object_can_stop_finish (LxsessionConsoleKitObject* self, GAsyncResult* _res_, GError** error); static void lxsession_session_object_lxsession_can_shutdown_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); @@ -142,10 +136,12 @@ void lxsession_console_kit_object_stop (LxsessionConsoleKitObject* self, GError** error); void lxsession_session_object_lxsession_restart (LxsessionSessionObject* self); void lxsession_console_kit_object_restart (LxsessionConsoleKitObject* self, GError** error); -LxsessionSessionObject* lxsession_session_object_new (void); -LxsessionSessionObject* lxsession_session_object_construct (GType object_type); +static void lxsession_session_object_finalize (GObject* obj); void lxsession_console_kit_object_can_restart (LxsessionConsoleKitObject* self, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean lxsession_console_kit_object_can_restart_finish (LxsessionConsoleKitObject* self, GAsyncResult* _res_, GError** error); +#define LXSESSION_CONSOLE_KIT_OBJECT_UNIQUE_NAME "org.freedesktop.ConsoleKit" +#define LXSESSION_CONSOLE_KIT_OBJECT_OBJECT_PATH "/org/freedesktop/ConsoleKit/Manager" +#define LXSESSION_CONSOLE_KIT_OBJECT_INTERFACE_NAME "org.freedesktop.ConsoleKit.Manager" static void lxsession_console_kit_object_proxy_g_signal (GDBusProxy* proxy, const gchar* sender_name, const gchar* signal_name, GVariant* parameters); static void lxsession_console_kit_object_proxy_restart (LxsessionConsoleKitObject* self, GError** error); static void lxsession_console_kit_object_proxy_stop (LxsessionConsoleKitObject* self, GError** error); @@ -196,6 +192,30 @@ static const GDBusInterfaceInfo _lxsession_console_kit_object_dbus_interface_info = {-1, "org.freedesktop.ConsoleKit.Manager", (GDBusMethodInfo **) (&_lxsession_console_kit_object_dbus_method_info), (GDBusSignalInfo **) (&_lxsession_console_kit_object_dbus_signal_info), (GDBusPropertyInfo **) (&_lxsession_console_kit_object_dbus_property_info)}; static const GDBusInterfaceVTable _lxsession_console_kit_object_dbus_interface_vtable = {lxsession_console_kit_object_dbus_interface_method_call, lxsession_console_kit_object_dbus_interface_get_property, lxsession_console_kit_object_dbus_interface_set_property}; +LxsessionSessionObject* lxsession_session_object_construct (GType object_type) { + LxsessionSessionObject * self = NULL; + LxsessionConsoleKitObject* _tmp0_ = NULL; + LxsessionConsoleKitObject* _tmp1_; + GError * _inner_error_ = NULL; + self = (LxsessionSessionObject*) g_object_new (object_type, NULL); + _tmp0_ = g_initable_new (LXSESSION_TYPE_CONSOLE_KIT_OBJECT_PROXY, NULL, &_inner_error_, "g-flags", 0, "g-name", "org.freedesktop.ConsoleKit", "g-bus-type", G_BUS_TYPE_SYSTEM, "g-object-path", "/org/freedesktop/ConsoleKit/Manager", "g-interface-name", "org.freedesktop.ConsoleKit.Manager", NULL); + _tmp1_ = (LxsessionConsoleKitObject*) _tmp0_; + if (_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught 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 NULL; + } + _g_object_unref0 (self->dbus_interface); + self->dbus_interface = _tmp1_; + return self; +} + + +LxsessionSessionObject* lxsession_session_object_new (void) { + return lxsession_session_object_construct (LXSESSION_TYPE_SESSION_OBJECT); +} + + static void lxsession_session_object_lxsession_can_shutdown_data_free (gpointer _data) { LxsessionSessionObjectLxsessionCanShutdownData* _data_; _data_ = _data; @@ -251,53 +271,32 @@ _state_0: _data_->can_shutdown_available = FALSE; { - _data_->_tmp0_ = NULL; - _data_->_tmp0_ = dbus_g_bus_get (DBUS_BUS_SYSTEM, &_data_->_inner_error_); - _data_->connection = _data_->_tmp0_; - if (_data_->_inner_error_ != NULL) { - if (_data_->_inner_error_->domain == DBUS_GERROR) { - goto __catch7_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_->_tmp1_ = _data_->connection; - _data_->_tmp2_ = NULL; - _data_->_tmp2_ = dbus_g_proxy_new_for_name (_data_->_tmp1_, LXSESSION_CONSOLE_KIT_OBJECT_UNIQUE_NAME, LXSESSION_CONSOLE_KIT_OBJECT_OBJECT_PATH, LXSESSION_CONSOLE_KIT_OBJECT_INTERFACE_NAME); - _data_->dbus_interface = LXSESSION_CONSOLE_KIT_OBJECT (_data_->_tmp2_); - _data_->_tmp3_ = _data_->dbus_interface; + _data_->_tmp0_ = _data_->self->dbus_interface; _data_->_state_ = 1; - lxsession_console_kit_object_can_stop (_data_->_tmp3_, lxsession_session_object_lxsession_can_shutdown_ready, _data_); + lxsession_console_kit_object_can_stop (_data_->_tmp0_, lxsession_session_object_lxsession_can_shutdown_ready, _data_); return FALSE; _state_1: - _data_->_tmp4_ = FALSE; - _data_->_tmp4_ = lxsession_console_kit_object_can_stop_finish (_data_->_tmp3_, _data_->_res_, &_data_->_inner_error_); - _data_->_tmp5_ = _data_->_tmp4_; + _data_->_tmp1_ = FALSE; + _data_->_tmp1_ = lxsession_console_kit_object_can_stop_finish (_data_->_tmp0_, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp2_ = _data_->_tmp1_; if (_data_->_inner_error_ != NULL) { - _g_object_unref0 (_data_->dbus_interface); - _dbus_g_connection_unref0 (_data_->connection); if (_data_->_inner_error_->domain == DBUS_GERROR) { goto __catch7_dbus_gerror; } - _g_object_unref0 (_data_->dbus_interface); - _dbus_g_connection_unref0 (_data_->connection); 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_->_tmp5_; - _g_object_unref0 (_data_->dbus_interface); - _dbus_g_connection_unref0 (_data_->connection); + _data_->can_shutdown_available = _data_->_tmp2_; } goto __finally7; __catch7_dbus_gerror: { _data_->err = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp6_ = _data_->err; - _data_->_tmp7_ = _data_->_tmp6_->message; - g_warning ("dbus-common.vala:36: %s", _data_->_tmp7_); + _data_->_tmp3_ = _data_->err; + _data_->_tmp4_ = _data_->_tmp3_->message; + g_warning ("dbus-common.vala:40: %s", _data_->_tmp4_); _data_->can_shutdown_available = FALSE; _g_error_free0 (_data_->err); } @@ -329,53 +328,29 @@ GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); { - DBusGConnection* _tmp0_ = NULL; - DBusGConnection* connection; - DBusGConnection* _tmp1_; - DBusGProxy* _tmp2_ = NULL; - LxsessionConsoleKitObject* dbus_interface; - LxsessionConsoleKitObject* _tmp3_; - _tmp0_ = dbus_g_bus_get (DBUS_BUS_SYSTEM, &_inner_error_); - connection = _tmp0_; - if (_inner_error_ != NULL) { - if (_inner_error_->domain == DBUS_GERROR) { - goto __catch8_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; - } - _tmp1_ = connection; - _tmp2_ = dbus_g_proxy_new_for_name (_tmp1_, LXSESSION_CONSOLE_KIT_OBJECT_UNIQUE_NAME, LXSESSION_CONSOLE_KIT_OBJECT_OBJECT_PATH, LXSESSION_CONSOLE_KIT_OBJECT_INTERFACE_NAME); - dbus_interface = LXSESSION_CONSOLE_KIT_OBJECT (_tmp2_); - _tmp3_ = dbus_interface; - lxsession_console_kit_object_stop (_tmp3_, &_inner_error_); + LxsessionConsoleKitObject* _tmp0_; + _tmp0_ = self->dbus_interface; + lxsession_console_kit_object_stop (_tmp0_, &_inner_error_); if (_inner_error_ != NULL) { - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); if (_inner_error_->domain == DBUS_GERROR) { goto __catch8_dbus_gerror; } - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); 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; } - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); } goto __finally8; __catch8_dbus_gerror: { GError* err = NULL; - GError* _tmp4_; - const gchar* _tmp5_; + GError* _tmp1_; + const gchar* _tmp2_; err = _inner_error_; _inner_error_ = NULL; - _tmp4_ = err; - _tmp5_ = _tmp4_->message; - g_warning ("dbus-common.vala:53: %s", _tmp5_); + _tmp1_ = err; + _tmp2_ = _tmp1_->message; + g_warning ("dbus-common.vala:52: %s", _tmp2_); _g_error_free0 (err); } __finally8: @@ -391,14 +366,9 @@ GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); { - DBusGConnection* _tmp0_ = NULL; - DBusGConnection* connection; - DBusGConnection* _tmp1_; - DBusGProxy* _tmp2_ = NULL; - LxsessionConsoleKitObject* dbus_interface; - LxsessionConsoleKitObject* _tmp3_; - _tmp0_ = dbus_g_bus_get (DBUS_BUS_SYSTEM, &_inner_error_); - connection = _tmp0_; + LxsessionConsoleKitObject* _tmp0_; + _tmp0_ = self->dbus_interface; + lxsession_console_kit_object_restart (_tmp0_, &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == DBUS_GERROR) { goto __catch9_dbus_gerror; @@ -407,37 +377,18 @@ g_clear_error (&_inner_error_); return; } - _tmp1_ = connection; - _tmp2_ = dbus_g_proxy_new_for_name (_tmp1_, LXSESSION_CONSOLE_KIT_OBJECT_UNIQUE_NAME, LXSESSION_CONSOLE_KIT_OBJECT_OBJECT_PATH, LXSESSION_CONSOLE_KIT_OBJECT_INTERFACE_NAME); - dbus_interface = LXSESSION_CONSOLE_KIT_OBJECT (_tmp2_); - _tmp3_ = dbus_interface; - lxsession_console_kit_object_restart (_tmp3_, &_inner_error_); - if (_inner_error_ != NULL) { - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); - if (_inner_error_->domain == DBUS_GERROR) { - goto __catch9_dbus_gerror; - } - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); - 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; - } - _g_object_unref0 (dbus_interface); - _dbus_g_connection_unref0 (connection); } goto __finally9; __catch9_dbus_gerror: { GError* err = NULL; - GError* _tmp4_; - const gchar* _tmp5_; + GError* _tmp1_; + const gchar* _tmp2_; err = _inner_error_; _inner_error_ = NULL; - _tmp4_ = err; - _tmp5_ = _tmp4_->message; - g_warning ("dbus-common.vala:67: %s", _tmp5_); + _tmp1_ = err; + _tmp2_ = _tmp1_->message; + g_warning ("dbus-common.vala:61: %s", _tmp2_); _g_error_free0 (err); } __finally9: @@ -449,20 +400,9 @@ } -LxsessionSessionObject* lxsession_session_object_construct (GType object_type) { - LxsessionSessionObject * self = NULL; - self = (LxsessionSessionObject*) g_object_new (object_type, NULL); - return self; -} - - -LxsessionSessionObject* lxsession_session_object_new (void) { - return lxsession_session_object_construct (LXSESSION_TYPE_SESSION_OBJECT); -} - - static void lxsession_session_object_class_init (LxsessionSessionObjectClass * klass) { lxsession_session_object_parent_class = g_type_class_peek_parent (klass); + G_OBJECT_CLASS (klass)->finalize = lxsession_session_object_finalize; } @@ -470,6 +410,14 @@ } +static void lxsession_session_object_finalize (GObject* obj) { + LxsessionSessionObject * self; + self = LXSESSION_SESSION_OBJECT (obj); + _g_object_unref0 (self->dbus_interface); + G_OBJECT_CLASS (lxsession_session_object_parent_class)->finalize (obj); +} + + GType lxsession_session_object_get_type (void) { static volatile gsize lxsession_session_object_type_id__volatile = 0; if (g_once_init_enter (&lxsession_session_object_type_id__volatile)) { diff -Nru lxsession-0.4.9.1~git20120708/lxsession/dbus-common.vala lxsession-0.4.9.1~git20120828/lxsession/dbus-common.vala --- lxsession-0.4.9.1~git20120708/lxsession/dbus-common.vala 2012-07-04 19:25:37.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/dbus-common.vala 2012-08-26 22:08:25.000000000 +0000 @@ -22,14 +22,18 @@ public class SessionObject: Object { + public ConsoleKitObject dbus_interface; + + public SessionObject() + { + dbus_interface = GLib.Bus.get_proxy_sync( BusType.SYSTEM, + "org.freedesktop.ConsoleKit", + "/org/freedesktop/ConsoleKit/Manager"); + } + public async bool lxsession_can_shutdown() { bool can_shutdown_available = false; try { - var connection = DBus.Bus.get (DBus.BusType.SYSTEM); - var dbus_interface = (ConsoleKitObject) - connection.get_object (ConsoleKitObject.UNIQUE_NAME, - ConsoleKitObject.OBJECT_PATH, - ConsoleKitObject.INTERFACE_NAME); can_shutdown_available = yield dbus_interface.can_stop (); } catch (DBus.Error err) { @@ -42,11 +46,6 @@ public void lxsession_shutdown() { try { - var connection = DBus.Bus.get (DBus.BusType.SYSTEM); - var dbus_interface = (ConsoleKitObject) - connection.get_object (ConsoleKitObject.UNIQUE_NAME, - ConsoleKitObject.OBJECT_PATH, - ConsoleKitObject.INTERFACE_NAME); dbus_interface.stop (); } catch (DBus.Error err) { @@ -56,11 +55,6 @@ public void lxsession_restart() { try { - var connection = DBus.Bus.get (DBus.BusType.SYSTEM); - var dbus_interface = (ConsoleKitObject) - connection.get_object (ConsoleKitObject.UNIQUE_NAME, - ConsoleKitObject.OBJECT_PATH, - ConsoleKitObject.INTERFACE_NAME); dbus_interface.restart (); } catch (DBus.Error err) { diff -Nru lxsession-0.4.9.1~git20120708/lxsession/dbus-gnome-session.c lxsession-0.4.9.1~git20120828/lxsession/dbus-gnome-session.c --- lxsession-0.4.9.1~git20120708/lxsession/dbus-gnome-session.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/dbus-gnome-session.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* dbus-gnome-session.c generated by valac 0.16.1, the Vala compiler +/* dbus-gnome-session.c generated by valac 0.14.2, the Vala compiler * generated from dbus-gnome-session.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/dbus-lxde-session.c lxsession-0.4.9.1~git20120828/lxsession/dbus-lxde-session.c --- lxsession-0.4.9.1~git20120708/lxsession/dbus-lxde-session.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/dbus-lxde-session.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* dbus-lxde-session.c generated by valac 0.16.1, the Vala compiler +/* dbus-lxde-session.c generated by valac 0.14.2, the Vala compiler * generated from dbus-lxde-session.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/environement.c lxsession-0.4.9.1~git20120828/lxsession/environement.c --- lxsession-0.4.9.1~git20120708/lxsession/environement.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/environement.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* environement.c generated by valac 0.16.1, the Vala compiler +/* environement.c generated by valac 0.14.2, the Vala compiler * generated from environement.vala, do not modify */ /* diff -Nru lxsession-0.4.9.1~git20120708/lxsession/main.c lxsession-0.4.9.1~git20120828/lxsession/main.c --- lxsession-0.4.9.1~git20120708/lxsession/main.c 2012-07-08 12:08:03.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/main.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* main.c generated by valac 0.16.1, the Vala compiler +/* main.c generated by valac 0.14.2, the Vala compiler * generated from main.vala, do not modify */ /* @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -361,17 +362,17 @@ const gchar* lxsession_lxsession_config_get_dbus_lxde (LxsessionLxsessionConfig* self); void lxsession_on_bus_aquired (GDBusConnection* conn); static void _lxsession_on_bus_aquired_gbus_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); +static void ___lambda0_ (void); +static void ____lambda0__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); +static void ___lambda1_ (void); +static void ____lambda1__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self); +const gchar* lxsession_lxsession_config_get_dbus_gnome (LxsessionLxsessionConfig* self); +void lxsession_on_gnome_bus_aquired (GDBusConnection* conn); +static void _lxsession_on_gnome_bus_aquired_gbus_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); static void ___lambda2_ (void); static void ____lambda2__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); static void ___lambda3_ (void); static void ____lambda3__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self); -const gchar* lxsession_lxsession_config_get_dbus_gnome (LxsessionLxsessionConfig* self); -void lxsession_on_gnome_bus_aquired (GDBusConnection* conn); -static void _lxsession_on_gnome_bus_aquired_gbus_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); -static void ___lambda4_ (void); -static void ____lambda4__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self); -static void ___lambda5_ (void); -static void ____lambda5__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self); void lxsession_clipboard_option_deactivate (LxsessionClipboardOption* self); void lxsession_polkit_app_deactivate (LxsessionPolkitApp* self); LxsessionMain* lxsession_main_new (void); @@ -390,22 +391,22 @@ } -static void ___lambda2_ (void) { +static void ___lambda0_ (void) { } -static void ____lambda2__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self) { - ___lambda2_ (); +static void ____lambda0__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self) { + ___lambda0_ (); } -static void ___lambda3_ (void) { +static void ___lambda1_ (void) { g_warning ("main.vala:289: Could not aquire name\n"); } -static void ____lambda3__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self) { - ___lambda3_ (); +static void ____lambda1__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self) { + ___lambda1_ (); } @@ -414,22 +415,22 @@ } -static void ___lambda4_ (void) { +static void ___lambda2_ (void) { } -static void ____lambda4__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self) { - ___lambda4_ (); +static void ____lambda2__gbus_name_acquired_callback (GDBusConnection* connection, const gchar* name, gpointer self) { + ___lambda2_ (); } -static void ___lambda5_ (void) { +static void ___lambda3_ (void) { g_warning ("main.vala:298: Could not aquire name\n"); } -static void ____lambda5__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self) { - ___lambda5_ (); +static void ____lambda3__gbus_name_lost_callback (GDBusConnection* connection, const gchar* name, gpointer self) { + ___lambda3_ (); } @@ -592,6 +593,8 @@ _tmp12_ = g_strdup (_tmp11_); _g_free0 (lxsession_session_global); lxsession_session_global = _tmp12_; + gtk_init (&args_length1, &args); + gtk_init (&args_length1, &args); _tmp13_ = lxsession_main_session; _tmp14_ = lxsession_main_desktop_environnement; _tmp15_ = lxsession_lxsession_env_new (_tmp13_, _tmp14_); @@ -1050,13 +1053,13 @@ _tmp195_ = lxsession_lxsession_config_get_dbus_lxde ((LxsessionLxsessionConfig*) _tmp194_); _tmp196_ = _tmp195_; if (g_strcmp0 (_tmp196_, "true") == 0) { - g_bus_own_name_with_closures (G_BUS_TYPE_SESSION, "org.lxde.SessionManager", G_BUS_NAME_OWNER_FLAGS_NONE, (GClosure*) ((_lxsession_on_bus_aquired_gbus_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _lxsession_on_bus_aquired_gbus_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda2__gbus_name_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda2__gbus_name_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda3__gbus_name_lost_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda3__gbus_name_lost_callback, NULL, NULL))); + g_bus_own_name_with_closures (G_BUS_TYPE_SESSION, "org.lxde.SessionManager", G_BUS_NAME_OWNER_FLAGS_NONE, (GClosure*) ((_lxsession_on_bus_aquired_gbus_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _lxsession_on_bus_aquired_gbus_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda0__gbus_name_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda0__gbus_name_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda1__gbus_name_lost_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda1__gbus_name_lost_callback, NULL, NULL))); } _tmp197_ = config; _tmp198_ = lxsession_lxsession_config_get_dbus_gnome ((LxsessionLxsessionConfig*) _tmp197_); _tmp199_ = _tmp198_; if (g_strcmp0 (_tmp199_, "true") == 0) { - g_bus_own_name_with_closures (G_BUS_TYPE_SESSION, "org.gnome.SessionManager", G_BUS_NAME_OWNER_FLAGS_NONE, (GClosure*) ((_lxsession_on_gnome_bus_aquired_gbus_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _lxsession_on_gnome_bus_aquired_gbus_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda4__gbus_name_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda4__gbus_name_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda5__gbus_name_lost_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda5__gbus_name_lost_callback, NULL, NULL))); + g_bus_own_name_with_closures (G_BUS_TYPE_SESSION, "org.gnome.SessionManager", G_BUS_NAME_OWNER_FLAGS_NONE, (GClosure*) ((_lxsession_on_gnome_bus_aquired_gbus_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) _lxsession_on_gnome_bus_aquired_gbus_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda2__gbus_name_acquired_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda2__gbus_name_acquired_callback, NULL, NULL)), (GClosure*) ((____lambda3__gbus_name_lost_callback == NULL) ? NULL : g_cclosure_new ((GCallback) ____lambda3__gbus_name_lost_callback, NULL, NULL))); } _tmp200_ = g_main_loop_new (NULL, FALSE); _tmp201_ = _tmp200_; diff -Nru lxsession-0.4.9.1~git20120708/lxsession/options.c lxsession-0.4.9.1~git20120828/lxsession/options.c --- lxsession-0.4.9.1~git20120708/lxsession/options.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/options.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* options.c generated by valac 0.16.1, the Vala compiler +/* options.c generated by valac 0.14.2, the Vala compiler * generated from options.vala, do not modify */ /* @@ -25,6 +25,7 @@ #include #include #include +#include <../lxclipboard/clipboard.h> #define LXSESSION_TYPE_OPTION (lxsession_option_get_type ()) @@ -754,11 +755,8 @@ switch (0) { default: { - gchar* _tmp7_; - g_message ("options.vala:157: Create Option Clipboard"); - _tmp7_ = g_strdup ("lxclipboard"); - _g_free0 (((LxsessionOption*) self)->command); - ((LxsessionOption*) self)->command = _tmp7_; + g_message ("options.vala:154: Create build-in Clipboard"); + clipboard_start (); break; } } @@ -774,6 +772,7 @@ void lxsession_clipboard_option_deactivate (LxsessionClipboardOption* self) { g_return_if_fail (self != NULL); + clipboard_stop (); } diff -Nru lxsession-0.4.9.1~git20120708/lxsession/settings.c lxsession-0.4.9.1~git20120828/lxsession/settings.c --- lxsession-0.4.9.1~git20120708/lxsession/settings.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/settings.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* settings.c generated by valac 0.16.1, the Vala compiler +/* settings.c generated by valac 0.14.2, the Vala compiler * generated from settings.vala, do not modify */ /* @@ -207,7 +207,10 @@ LxsessionLxsessionConfigKeyFilePrivate * priv; GKeyFile* kf; GFile* desktop_file; + GFile* home_desktop_file; GFileMonitor* monitor_desktop_file; + GFileMonitor* monitor_home_desktop_file; + GCancellable* monitor_cancel; }; struct _LxsessionLxsessionConfigKeyFileClass { @@ -496,6 +499,10 @@ const gchar* lxsession_lxsession_config_key_file_get_desktop_config_path (LxsessionLxsessionConfigKeyFile* self); void lxsession_lxsession_config_key_file_on_desktop_file_change (LxsessionLxsessionConfigKeyFile* self); static void _lxsession_lxsession_config_key_file_on_desktop_file_change_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); +gchar* lxsession_get_config_home_path (const gchar* conf_file); +void lxsession_lxsession_config_key_file_setup_creation_desktop_file (LxsessionLxsessionConfigKeyFile* self); +void lxsession_lxsession_config_key_file_on_desktop_file_creation (LxsessionLxsessionConfigKeyFile* self); +static void _lxsession_lxsession_config_key_file_on_desktop_file_creation_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self); GKeyFile* lxsession_load_keyfile (const gchar* config_path); void lxsession_lxsession_config_key_file_save_keyfile (LxsessionLxsessionConfigKeyFile* self); void lxsession_lxsession_config_key_file_on_update_window_manager_program (LxsessionLxsessionConfigKeyFile* self, const gchar* dbus_arg); @@ -1770,6 +1777,7 @@ gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; + gchar* _tmp6_; self->priv = LXSESSION_LXSESSION_CONFIG_GET_PRIVATE (self); _tmp0_ = g_strdup ("LXDE"); self->priv->_session_name = _tmp0_; @@ -1795,9 +1803,10 @@ self->priv->_terminal_manager = NULL; self->priv->_disable_autostart = NULL; self->priv->_laptop_mode = NULL; - self->priv->_clipboard_command = NULL; - _tmp2_ = g_strdup ("true"); - self->priv->_dbus_lxde = _tmp2_; + _tmp2_ = g_strdup ("lxclipboard"); + self->priv->_clipboard_command = _tmp2_; + _tmp3_ = g_strdup ("true"); + self->priv->_dbus_lxde = _tmp3_; self->priv->_dbus_gnome = NULL; self->priv->_keymap_mode = NULL; self->priv->_keymap_model = NULL; @@ -1816,13 +1825,13 @@ self->priv->_gtk_cursor_theme_size = 18; self->priv->_gtk_antialias = 1; self->priv->_gtk_hinting = 1; - _tmp3_ = g_strdup ("hintslight"); - self->priv->_gtk_hint_style = _tmp3_; - _tmp4_ = g_strdup ("rgb"); - self->priv->_gtk_rgba = _tmp4_; + _tmp4_ = g_strdup ("hintslight"); + self->priv->_gtk_hint_style = _tmp4_; + _tmp5_ = g_strdup ("rgb"); + self->priv->_gtk_rgba = _tmp5_; self->priv->_gtk_color_scheme = NULL; - _tmp5_ = g_strdup ("DMZ-White"); - self->priv->_gtk_cursor_theme_name = _tmp5_; + _tmp6_ = g_strdup ("DMZ-White"); + self->priv->_gtk_cursor_theme_name = _tmp6_; self->priv->_gtk_toolbar_icon_size = 3; self->priv->_gtk_enable_event_sounds = 1; self->priv->_gtk_enable_input_feedback_sounds = 1; @@ -2619,38 +2628,61 @@ const gchar* _tmp0_; GFile* _tmp1_ = NULL; GFile* _tmp2_; - GFileMonitor* _tmp3_ = NULL; - GFileMonitor* _tmp4_; + GCancellable* _tmp3_; + GFileMonitor* _tmp4_ = NULL; GFileMonitor* _tmp5_; - const gchar* _tmp6_; + GFileMonitor* _tmp6_; + const gchar* _tmp7_; + GFile* _tmp8_; + gchar* _tmp9_ = NULL; + gchar* _tmp10_; + gchar* _tmp11_ = NULL; + gchar* _tmp12_; + gboolean _tmp13_; _tmp0_ = self->priv->_desktop_config_path; _tmp1_ = g_file_new_for_path (_tmp0_); _g_object_unref0 (self->desktop_file); self->desktop_file = _tmp1_; _tmp2_ = self->desktop_file; - _tmp3_ = g_file_monitor_file (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); - _tmp4_ = _tmp3_; + _tmp3_ = self->monitor_cancel; + _tmp4_ = g_file_monitor_file (_tmp2_, G_FILE_MONITOR_NONE, _tmp3_, &_inner_error_); + _tmp5_ = _tmp4_; if (_inner_error_ != NULL) { goto __catch14_g_error; } _g_object_unref0 (self->monitor_desktop_file); - self->monitor_desktop_file = _tmp4_; - _tmp5_ = self->monitor_desktop_file; - g_signal_connect_object (_tmp5_, "changed", (GCallback) _lxsession_lxsession_config_key_file_on_desktop_file_change_g_file_monitor_changed, self, 0); - _tmp6_ = self->priv->_desktop_config_path; - g_message ("settings.vala:182: Monitoring: %s", _tmp6_); + self->monitor_desktop_file = _tmp5_; + _tmp6_ = self->monitor_desktop_file; + g_signal_connect_object (_tmp6_, "changed", (GCallback) _lxsession_lxsession_config_key_file_on_desktop_file_change_g_file_monitor_changed, self, 0); + _tmp7_ = self->priv->_desktop_config_path; + g_message ("settings.vala:185: Monitoring: %s", _tmp7_); + _tmp8_ = self->desktop_file; + _tmp9_ = g_file_get_path (_tmp8_); + _tmp10_ = _tmp9_; + _tmp11_ = lxsession_get_config_home_path ("desktop.conf"); + _tmp12_ = _tmp11_; + _tmp13_ = g_strcmp0 (_tmp10_, _tmp12_) == 0; + _g_free0 (_tmp12_); + _g_free0 (_tmp10_); + if (_tmp13_) { + g_message ("settings.vala:189: Desktop file is already in config home, do nothing"); + } else { + g_message ("settings.vala:193: Desktop file is not in config home, monitoring crea" \ +"tion of it"); + lxsession_lxsession_config_key_file_setup_creation_desktop_file (self); + } } goto __finally14; __catch14_g_error: { GError* err = NULL; - GError* _tmp7_; - const gchar* _tmp8_; + GError* _tmp14_; + const gchar* _tmp15_; err = _inner_error_; _inner_error_ = NULL; - _tmp7_ = err; - _tmp8_ = _tmp7_->message; - g_message ("settings.vala:184: %s", _tmp8_); + _tmp14_ = err; + _tmp15_ = _tmp14_->message; + g_message ("settings.vala:198: %s", _tmp15_); _g_error_free0 (err); } __finally14: @@ -2662,16 +2694,100 @@ } +static void _lxsession_lxsession_config_key_file_on_desktop_file_creation_g_file_monitor_changed (GFileMonitor* _sender, GFile* file, GFile* other_file, GFileMonitorEvent event_type, gpointer self) { + lxsession_lxsession_config_key_file_on_desktop_file_creation (self); +} + + +void lxsession_lxsession_config_key_file_setup_creation_desktop_file (LxsessionLxsessionConfigKeyFile* self) { + GError * _inner_error_ = NULL; + g_return_if_fail (self != NULL); + { + gchar* _tmp0_ = NULL; + gchar* _tmp1_; + GFile* _tmp2_ = NULL; + GFile* _tmp3_; + GFileMonitor* _tmp4_ = NULL; + GFileMonitor* _tmp5_; + GFileMonitor* _tmp6_; + GFile* _tmp7_; + gchar* _tmp8_ = NULL; + gchar* _tmp9_; + _tmp0_ = lxsession_get_config_home_path ("desktop.conf"); + _tmp1_ = _tmp0_; + _tmp2_ = g_file_new_for_path (_tmp1_); + _g_object_unref0 (self->home_desktop_file); + self->home_desktop_file = _tmp2_; + _g_free0 (_tmp1_); + _tmp3_ = self->home_desktop_file; + _tmp4_ = g_file_monitor_file (_tmp3_, G_FILE_MONITOR_NONE, NULL, &_inner_error_); + _tmp5_ = _tmp4_; + if (_inner_error_ != NULL) { + goto __catch15_g_error; + } + _g_object_unref0 (self->monitor_home_desktop_file); + self->monitor_home_desktop_file = _tmp5_; + _tmp6_ = self->monitor_home_desktop_file; + g_signal_connect_object (_tmp6_, "changed", (GCallback) _lxsession_lxsession_config_key_file_on_desktop_file_creation_g_file_monitor_changed, self, 0); + _tmp7_ = self->home_desktop_file; + _tmp8_ = g_file_get_path (_tmp7_); + _tmp9_ = _tmp8_; + g_message ("settings.vala:208: Monitoring home path: %s", _tmp9_); + _g_free0 (_tmp9_); + } + goto __finally15; + __catch15_g_error: + { + GError* err = NULL; + GError* _tmp10_; + const gchar* _tmp11_; + err = _inner_error_; + _inner_error_ = NULL; + _tmp10_ = err; + _tmp11_ = _tmp10_->message; + g_message ("settings.vala:210: %s", _tmp11_); + _g_error_free0 (err); + } + __finally15: + if (_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught 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; + } +} + + void lxsession_lxsession_config_key_file_on_desktop_file_change (LxsessionLxsessionConfigKeyFile* self) { GKeyFile* _tmp0_; g_return_if_fail (self != NULL); lxsession_lxsession_config_key_file_read_keyfile (self); - g_message ("settings.vala:191: Desktop file change, reloading XSettings daemon"); + g_message ("settings.vala:217: Desktop file change, reloading XSettings daemon"); _tmp0_ = self->kf; settings_daemon_reload (_tmp0_); } +void lxsession_lxsession_config_key_file_on_desktop_file_creation (LxsessionLxsessionConfigKeyFile* self) { + gchar* _tmp0_ = NULL; + gchar* _tmp1_; + GCancellable* _tmp2_; + GKeyFile* _tmp3_; + g_return_if_fail (self != NULL); + g_message ("settings.vala:223: Desktop file created in home directory, switch conf" \ +"iguration to it"); + _tmp0_ = lxsession_get_config_home_path ("desktop.conf"); + _tmp1_ = _tmp0_; + lxsession_lxsession_config_key_file_set_desktop_config_path (self, _tmp1_); + _g_free0 (_tmp1_); + _tmp2_ = self->monitor_cancel; + g_cancellable_cancel (_tmp2_); + lxsession_lxsession_config_key_file_read_keyfile (self); + _tmp3_ = self->kf; + settings_daemon_reload (_tmp3_); + lxsession_lxsession_config_key_file_setup_monitor_desktop_file (self); +} + + void lxsession_lxsession_config_key_file_read_keyfile (LxsessionLxsessionConfigKeyFile* self) { gchar* _tmp0_ = NULL; gchar* _tmp1_; @@ -2694,7 +2810,7 @@ _tmp5_ = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch15_g_key_file_error; + goto __catch16_g_key_file_error; } 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_); @@ -2704,8 +2820,8 @@ lxsession_lxsession_config_set_window_manager ((LxsessionLxsessionConfig*) self, _tmp6_); _g_free0 (_tmp6_); } - goto __finally15; - __catch15_g_key_file_error: + goto __finally16; + __catch16_g_key_file_error: { GError* err = NULL; GError* _tmp7_; @@ -2714,10 +2830,10 @@ _inner_error_ = NULL; _tmp7_ = err; _tmp8_ = _tmp7_->message; - g_message ("settings.vala:206: %s", _tmp8_); + g_message ("settings.vala:243: %s", _tmp8_); _g_error_free0 (err); } - __finally15: + __finally16: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2733,7 +2849,7 @@ _tmp11_ = _tmp10_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch16_g_key_file_error; + goto __catch17_g_key_file_error; } 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_); @@ -2743,8 +2859,8 @@ lxsession_lxsession_config_set_window_manager_program ((LxsessionLxsessionConfig*) self, _tmp12_); _g_free0 (_tmp12_); } - goto __finally16; - __catch16_g_key_file_error: + goto __finally17; + __catch17_g_key_file_error: { GError* err = NULL; GError* _tmp13_; @@ -2753,10 +2869,10 @@ _inner_error_ = NULL; _tmp13_ = err; _tmp14_ = _tmp13_->message; - g_message ("settings.vala:215: %s", _tmp14_); + g_message ("settings.vala:252: %s", _tmp14_); _g_error_free0 (err); } - __finally16: + __finally17: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2772,7 +2888,7 @@ _tmp17_ = _tmp16_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch17_g_key_file_error; + goto __catch18_g_key_file_error; } 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_); @@ -2782,8 +2898,8 @@ lxsession_lxsession_config_set_window_manager_session ((LxsessionLxsessionConfig*) self, _tmp18_); _g_free0 (_tmp18_); } - goto __finally17; - __catch17_g_key_file_error: + goto __finally18; + __catch18_g_key_file_error: { GError* err = NULL; GError* _tmp19_; @@ -2792,10 +2908,10 @@ _inner_error_ = NULL; _tmp19_ = err; _tmp20_ = _tmp19_->message; - g_message ("settings.vala:224: %s", _tmp20_); + g_message ("settings.vala:261: %s", _tmp20_); _g_error_free0 (err); } - __finally17: + __finally18: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2811,7 +2927,7 @@ _tmp23_ = _tmp22_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch18_g_key_file_error; + goto __catch19_g_key_file_error; } 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_); @@ -2821,8 +2937,8 @@ lxsession_lxsession_config_set_window_manager_extras ((LxsessionLxsessionConfig*) self, _tmp24_); _g_free0 (_tmp24_); } - goto __finally18; - __catch18_g_key_file_error: + goto __finally19; + __catch19_g_key_file_error: { GError* err = NULL; GError* _tmp25_; @@ -2831,10 +2947,10 @@ _inner_error_ = NULL; _tmp25_ = err; _tmp26_ = _tmp25_->message; - g_message ("settings.vala:233: %s", _tmp26_); + g_message ("settings.vala:270: %s", _tmp26_); _g_error_free0 (err); } - __finally18: + __finally19: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2852,7 +2968,7 @@ _tmp29_ = _tmp28_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch19_g_key_file_error; + goto __catch20_g_key_file_error; } 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_); @@ -2874,7 +2990,7 @@ _tmp35_ = _tmp34_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch20_g_key_file_error; + goto __catch21_g_key_file_error; } 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_); @@ -2884,8 +3000,8 @@ lxsession_lxsession_config_set_panel_session ((LxsessionLxsessionConfig*) self, _tmp36_); _g_free0 (_tmp36_); } - goto __finally20; - __catch20_g_key_file_error: + goto __finally21; + __catch21_g_key_file_error: { GError* err = NULL; GError* _tmp37_; @@ -2894,13 +3010,13 @@ _inner_error_ = NULL; _tmp37_ = err; _tmp38_ = _tmp37_->message; - g_message ("settings.vala:248: %s", _tmp38_); + g_message ("settings.vala:285: %s", _tmp38_); _g_error_free0 (err); } - __finally20: + __finally21: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch19_g_key_file_error; + goto __catch20_g_key_file_error; } 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_); @@ -2908,8 +3024,8 @@ } } } - goto __finally19; - __catch19_g_key_file_error: + goto __finally20; + __catch20_g_key_file_error: { GError* err = NULL; GError* _tmp39_; @@ -2918,10 +3034,10 @@ _inner_error_ = NULL; _tmp39_ = err; _tmp40_ = _tmp39_->message; - g_message ("settings.vala:254: %s", _tmp40_); + g_message ("settings.vala:291: %s", _tmp40_); _g_error_free0 (err); } - __finally19: + __finally20: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2937,7 +3053,7 @@ _tmp43_ = _tmp42_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch21_g_key_file_error; + goto __catch22_g_key_file_error; } 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_); @@ -2947,8 +3063,8 @@ lxsession_lxsession_config_set_screensaver_program ((LxsessionLxsessionConfig*) self, _tmp44_); _g_free0 (_tmp44_); } - goto __finally21; - __catch21_g_key_file_error: + goto __finally22; + __catch22_g_key_file_error: { GError* err = NULL; GError* _tmp45_; @@ -2957,10 +3073,10 @@ _inner_error_ = NULL; _tmp45_ = err; _tmp46_ = _tmp45_->message; - g_message ("settings.vala:264: %s", _tmp46_); + g_message ("settings.vala:301: %s", _tmp46_); _g_error_free0 (err); } - __finally21: + __finally22: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -2976,7 +3092,7 @@ _tmp49_ = _tmp48_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch22_g_key_file_error; + goto __catch23_g_key_file_error; } 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_); @@ -2986,8 +3102,8 @@ lxsession_lxsession_config_set_power_manager_program ((LxsessionLxsessionConfig*) self, _tmp50_); _g_free0 (_tmp50_); } - goto __finally22; - __catch22_g_key_file_error: + goto __finally23; + __catch23_g_key_file_error: { GError* err = NULL; GError* _tmp51_; @@ -2996,10 +3112,10 @@ _inner_error_ = NULL; _tmp51_ = err; _tmp52_ = _tmp51_->message; - g_message ("settings.vala:274: %s", _tmp52_); + g_message ("settings.vala:311: %s", _tmp52_); _g_error_free0 (err); } - __finally22: + __finally23: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3017,7 +3133,7 @@ _tmp55_ = _tmp54_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch23_g_key_file_error; + goto __catch24_g_key_file_error; } 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_); @@ -3039,7 +3155,7 @@ _tmp61_ = _tmp60_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch24_g_key_file_error; + goto __catch25_g_key_file_error; } 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_); @@ -3049,8 +3165,8 @@ lxsession_lxsession_config_set_file_manager_session ((LxsessionLxsessionConfig*) self, _tmp62_); _g_free0 (_tmp62_); } - goto __finally24; - __catch24_g_key_file_error: + goto __finally25; + __catch25_g_key_file_error: { GError* err = NULL; GError* _tmp63_; @@ -3059,13 +3175,13 @@ _inner_error_ = NULL; _tmp63_ = err; _tmp64_ = _tmp63_->message; - g_message ("settings.vala:289: %s", _tmp64_); + g_message ("settings.vala:326: %s", _tmp64_); _g_error_free0 (err); } - __finally24: + __finally25: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch23_g_key_file_error; + goto __catch24_g_key_file_error; } 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_); @@ -3081,7 +3197,7 @@ _tmp67_ = _tmp66_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch25_g_key_file_error; + goto __catch26_g_key_file_error; } 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_); @@ -3091,8 +3207,8 @@ lxsession_lxsession_config_set_file_manager_extras ((LxsessionLxsessionConfig*) self, _tmp68_); _g_free0 (_tmp68_); } - goto __finally25; - __catch25_g_key_file_error: + goto __finally26; + __catch26_g_key_file_error: { GError* err = NULL; GError* _tmp69_; @@ -3101,13 +3217,13 @@ _inner_error_ = NULL; _tmp69_ = err; _tmp70_ = _tmp69_->message; - g_message ("settings.vala:298: %s", _tmp70_); + g_message ("settings.vala:335: %s", _tmp70_); _g_error_free0 (err); } - __finally25: + __finally26: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch23_g_key_file_error; + goto __catch24_g_key_file_error; } 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_); @@ -3115,8 +3231,8 @@ } } } - goto __finally23; - __catch23_g_key_file_error: + goto __finally24; + __catch24_g_key_file_error: { GError* err = NULL; GError* _tmp71_; @@ -3125,10 +3241,10 @@ _inner_error_ = NULL; _tmp71_ = err; _tmp72_ = _tmp71_->message; - g_message ("settings.vala:304: %s", _tmp72_); + g_message ("settings.vala:341: %s", _tmp72_); _g_error_free0 (err); } - __finally23: + __finally24: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3144,7 +3260,7 @@ _tmp75_ = _tmp74_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch26_g_key_file_error; + goto __catch27_g_key_file_error; } 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_); @@ -3154,8 +3270,8 @@ lxsession_lxsession_config_set_polkit ((LxsessionLxsessionConfig*) self, _tmp76_); _g_free0 (_tmp76_); } - goto __finally26; - __catch26_g_key_file_error: + goto __finally27; + __catch27_g_key_file_error: { GError* err = NULL; GError* _tmp77_; @@ -3164,10 +3280,10 @@ _inner_error_ = NULL; _tmp77_ = err; _tmp78_ = _tmp77_->message; - g_message ("settings.vala:314: %s", _tmp78_); + g_message ("settings.vala:351: %s", _tmp78_); _g_error_free0 (err); } - __finally26: + __finally27: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3183,7 +3299,7 @@ _tmp81_ = _tmp80_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch27_g_key_file_error; + goto __catch28_g_key_file_error; } 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_); @@ -3193,8 +3309,8 @@ lxsession_lxsession_config_set_network_gui ((LxsessionLxsessionConfig*) self, _tmp82_); _g_free0 (_tmp82_); } - goto __finally27; - __catch27_g_key_file_error: + goto __finally28; + __catch28_g_key_file_error: { GError* err = NULL; GError* _tmp83_; @@ -3203,10 +3319,10 @@ _inner_error_ = NULL; _tmp83_ = err; _tmp84_ = _tmp83_->message; - g_message ("settings.vala:324: %s", _tmp84_); + g_message ("settings.vala:361: %s", _tmp84_); _g_error_free0 (err); } - __finally27: + __finally28: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3222,7 +3338,7 @@ _tmp87_ = _tmp86_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch28_g_key_file_error; + goto __catch29_g_key_file_error; } 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_); @@ -3232,8 +3348,8 @@ lxsession_lxsession_config_set_audio_manager ((LxsessionLxsessionConfig*) self, _tmp88_); _g_free0 (_tmp88_); } - goto __finally28; - __catch28_g_key_file_error: + goto __finally29; + __catch29_g_key_file_error: { GError* err = NULL; GError* _tmp89_; @@ -3242,10 +3358,10 @@ _inner_error_ = NULL; _tmp89_ = err; _tmp90_ = _tmp89_->message; - g_message ("settings.vala:334: %s", _tmp90_); + g_message ("settings.vala:371: %s", _tmp90_); _g_error_free0 (err); } - __finally28: + __finally29: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3261,7 +3377,7 @@ _tmp93_ = _tmp92_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch29_g_key_file_error; + goto __catch30_g_key_file_error; } 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_); @@ -3271,8 +3387,8 @@ lxsession_lxsession_config_set_quit_manager ((LxsessionLxsessionConfig*) self, _tmp94_); _g_free0 (_tmp94_); } - goto __finally29; - __catch29_g_key_file_error: + goto __finally30; + __catch30_g_key_file_error: { GError* err = NULL; GError* _tmp95_; @@ -3281,10 +3397,10 @@ _inner_error_ = NULL; _tmp95_ = err; _tmp96_ = _tmp95_->message; - g_message ("settings.vala:344: %s", _tmp96_); + g_message ("settings.vala:381: %s", _tmp96_); _g_error_free0 (err); } - __finally29: + __finally30: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3300,7 +3416,7 @@ _tmp99_ = _tmp98_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch30_g_key_file_error; + goto __catch31_g_key_file_error; } 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_); @@ -3310,8 +3426,8 @@ lxsession_lxsession_config_set_workspace_manager ((LxsessionLxsessionConfig*) self, _tmp100_); _g_free0 (_tmp100_); } - goto __finally30; - __catch30_g_key_file_error: + goto __finally31; + __catch31_g_key_file_error: { GError* err = NULL; GError* _tmp101_; @@ -3320,10 +3436,10 @@ _inner_error_ = NULL; _tmp101_ = err; _tmp102_ = _tmp101_->message; - g_message ("settings.vala:354: %s", _tmp102_); + g_message ("settings.vala:391: %s", _tmp102_); _g_error_free0 (err); } - __finally30: + __finally31: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3339,7 +3455,7 @@ _tmp105_ = _tmp104_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch31_g_key_file_error; + goto __catch32_g_key_file_error; } 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_); @@ -3349,8 +3465,8 @@ lxsession_lxsession_config_set_launcher_manager ((LxsessionLxsessionConfig*) self, _tmp106_); _g_free0 (_tmp106_); } - goto __finally31; - __catch31_g_key_file_error: + goto __finally32; + __catch32_g_key_file_error: { GError* err = NULL; GError* _tmp107_; @@ -3359,10 +3475,10 @@ _inner_error_ = NULL; _tmp107_ = err; _tmp108_ = _tmp107_->message; - g_message ("settings.vala:364: %s", _tmp108_); + g_message ("settings.vala:401: %s", _tmp108_); _g_error_free0 (err); } - __finally31: + __finally32: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3378,7 +3494,7 @@ _tmp111_ = _tmp110_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch32_g_key_file_error; + goto __catch33_g_key_file_error; } 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_); @@ -3388,8 +3504,8 @@ lxsession_lxsession_config_set_terminal_manager ((LxsessionLxsessionConfig*) self, _tmp112_); _g_free0 (_tmp112_); } - goto __finally32; - __catch32_g_key_file_error: + goto __finally33; + __catch33_g_key_file_error: { GError* err = NULL; GError* _tmp113_; @@ -3398,10 +3514,10 @@ _inner_error_ = NULL; _tmp113_ = err; _tmp114_ = _tmp113_->message; - g_message ("settings.vala:374: %s", _tmp114_); + g_message ("settings.vala:411: %s", _tmp114_); _g_error_free0 (err); } - __finally32: + __finally33: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3417,7 +3533,7 @@ _tmp117_ = _tmp116_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch33_g_key_file_error; + goto __catch34_g_key_file_error; } 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_); @@ -3427,8 +3543,8 @@ lxsession_lxsession_config_set_clipboard_command ((LxsessionLxsessionConfig*) self, _tmp118_); _g_free0 (_tmp118_); } - goto __finally33; - __catch33_g_key_file_error: + goto __finally34; + __catch34_g_key_file_error: { GError* err = NULL; GError* _tmp119_; @@ -3437,10 +3553,10 @@ _inner_error_ = NULL; _tmp119_ = err; _tmp120_ = _tmp119_->message; - g_message ("settings.vala:384: %s", _tmp120_); + g_message ("settings.vala:421: %s", _tmp120_); _g_error_free0 (err); } - __finally33: + __finally34: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3456,7 +3572,7 @@ _tmp123_ = _tmp122_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch34_g_key_file_error; + goto __catch35_g_key_file_error; } 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_); @@ -3466,8 +3582,8 @@ lxsession_lxsession_config_set_disable_autostart ((LxsessionLxsessionConfig*) self, _tmp124_); _g_free0 (_tmp124_); } - goto __finally34; - __catch34_g_key_file_error: + goto __finally35; + __catch35_g_key_file_error: { GError* err = NULL; GError* _tmp125_; @@ -3476,10 +3592,10 @@ _inner_error_ = NULL; _tmp125_ = err; _tmp126_ = _tmp125_->message; - g_message ("settings.vala:394: %s", _tmp126_); + g_message ("settings.vala:431: %s", _tmp126_); _g_error_free0 (err); } - __finally34: + __finally35: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3495,7 +3611,7 @@ _tmp129_ = _tmp128_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch35_g_key_file_error; + goto __catch36_g_key_file_error; } 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_); @@ -3505,8 +3621,8 @@ lxsession_lxsession_config_set_laptop_mode ((LxsessionLxsessionConfig*) self, _tmp130_); _g_free0 (_tmp130_); } - goto __finally35; - __catch35_g_key_file_error: + goto __finally36; + __catch36_g_key_file_error: { GError* err = NULL; GError* _tmp131_; @@ -3515,10 +3631,10 @@ _inner_error_ = NULL; _tmp131_ = err; _tmp132_ = _tmp131_->message; - g_message ("settings.vala:404: %s", _tmp132_); + g_message ("settings.vala:441: %s", _tmp132_); _g_error_free0 (err); } - __finally35: + __finally36: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3534,7 +3650,7 @@ _tmp135_ = _tmp134_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch36_g_key_file_error; + goto __catch37_g_key_file_error; } 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_); @@ -3544,8 +3660,8 @@ lxsession_lxsession_config_set_dbus_lxde ((LxsessionLxsessionConfig*) self, _tmp136_); _g_free0 (_tmp136_); } - goto __finally36; - __catch36_g_key_file_error: + goto __finally37; + __catch37_g_key_file_error: { GError* err = NULL; GError* _tmp137_; @@ -3554,10 +3670,10 @@ _inner_error_ = NULL; _tmp137_ = err; _tmp138_ = _tmp137_->message; - g_message ("settings.vala:414: %s", _tmp138_); + g_message ("settings.vala:451: %s", _tmp138_); _g_error_free0 (err); } - __finally36: + __finally37: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3573,7 +3689,7 @@ _tmp141_ = _tmp140_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch37_g_key_file_error; + goto __catch38_g_key_file_error; } 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_); @@ -3583,8 +3699,8 @@ lxsession_lxsession_config_set_dbus_gnome ((LxsessionLxsessionConfig*) self, _tmp142_); _g_free0 (_tmp142_); } - goto __finally37; - __catch37_g_key_file_error: + goto __finally38; + __catch38_g_key_file_error: { GError* err = NULL; GError* _tmp143_; @@ -3593,10 +3709,10 @@ _inner_error_ = NULL; _tmp143_ = err; _tmp144_ = _tmp143_->message; - g_message ("settings.vala:423: %s", _tmp144_); + g_message ("settings.vala:460: %s", _tmp144_); _g_error_free0 (err); } - __finally37: + __finally38: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3614,7 +3730,7 @@ _tmp147_ = _tmp146_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch38_g_key_file_error; + goto __catch39_g_key_file_error; } 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_); @@ -3636,7 +3752,7 @@ _tmp153_ = _tmp152_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch39_g_key_file_error; + goto __catch40_g_key_file_error; } 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_); @@ -3646,8 +3762,8 @@ lxsession_lxsession_config_set_keymap_model ((LxsessionLxsessionConfig*) self, _tmp154_); _g_free0 (_tmp154_); } - goto __finally39; - __catch39_g_key_file_error: + goto __finally40; + __catch40_g_key_file_error: { GError* err = NULL; GError* _tmp155_; @@ -3656,13 +3772,13 @@ _inner_error_ = NULL; _tmp155_ = err; _tmp156_ = _tmp155_->message; - g_message ("settings.vala:438: %s", _tmp156_); + g_message ("settings.vala:475: %s", _tmp156_); _g_error_free0 (err); } - __finally39: + __finally40: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch38_g_key_file_error; + goto __catch39_g_key_file_error; } 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_); @@ -3678,7 +3794,7 @@ _tmp159_ = _tmp158_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch40_g_key_file_error; + goto __catch41_g_key_file_error; } 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_); @@ -3688,8 +3804,8 @@ lxsession_lxsession_config_set_keymap_layout ((LxsessionLxsessionConfig*) self, _tmp160_); _g_free0 (_tmp160_); } - goto __finally40; - __catch40_g_key_file_error: + goto __finally41; + __catch41_g_key_file_error: { GError* err = NULL; GError* _tmp161_; @@ -3698,13 +3814,13 @@ _inner_error_ = NULL; _tmp161_ = err; _tmp162_ = _tmp161_->message; - g_message ("settings.vala:446: %s", _tmp162_); + g_message ("settings.vala:483: %s", _tmp162_); _g_error_free0 (err); } - __finally40: + __finally41: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch38_g_key_file_error; + goto __catch39_g_key_file_error; } 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_); @@ -3720,7 +3836,7 @@ _tmp165_ = _tmp164_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch41_g_key_file_error; + goto __catch42_g_key_file_error; } 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_); @@ -3730,8 +3846,8 @@ lxsession_lxsession_config_set_keymap_variant ((LxsessionLxsessionConfig*) self, _tmp166_); _g_free0 (_tmp166_); } - goto __finally41; - __catch41_g_key_file_error: + goto __finally42; + __catch42_g_key_file_error: { GError* err = NULL; GError* _tmp167_; @@ -3740,13 +3856,13 @@ _inner_error_ = NULL; _tmp167_ = err; _tmp168_ = _tmp167_->message; - g_message ("settings.vala:454: %s", _tmp168_); + g_message ("settings.vala:491: %s", _tmp168_); _g_error_free0 (err); } - __finally41: + __finally42: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch38_g_key_file_error; + goto __catch39_g_key_file_error; } 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_); @@ -3762,7 +3878,7 @@ _tmp171_ = _tmp170_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch42_g_key_file_error; + goto __catch43_g_key_file_error; } 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_); @@ -3772,8 +3888,8 @@ lxsession_lxsession_config_set_keymap_options ((LxsessionLxsessionConfig*) self, _tmp172_); _g_free0 (_tmp172_); } - goto __finally42; - __catch42_g_key_file_error: + goto __finally43; + __catch43_g_key_file_error: { GError* err = NULL; GError* _tmp173_; @@ -3782,13 +3898,13 @@ _inner_error_ = NULL; _tmp173_ = err; _tmp174_ = _tmp173_->message; - g_message ("settings.vala:462: %s", _tmp174_); + g_message ("settings.vala:499: %s", _tmp174_); _g_error_free0 (err); } - __finally42: + __finally43: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch38_g_key_file_error; + goto __catch39_g_key_file_error; } 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_); @@ -3796,8 +3912,8 @@ } } } - goto __finally38; - __catch38_g_key_file_error: + goto __finally39; + __catch39_g_key_file_error: { GError* err = NULL; GError* _tmp175_; @@ -3806,10 +3922,10 @@ _inner_error_ = NULL; _tmp175_ = err; _tmp176_ = _tmp175_->message; - g_message ("settings.vala:469: %s", _tmp176_); + g_message ("settings.vala:506: %s", _tmp176_); _g_error_free0 (err); } - __finally38: + __finally39: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3827,7 +3943,7 @@ _tmp179_ = _tmp178_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch43_g_key_file_error; + goto __catch44_g_key_file_error; } 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_); @@ -3849,7 +3965,7 @@ _tmp185_ = _tmp184_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch44_g_key_file_error; + goto __catch45_g_key_file_error; } 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_); @@ -3859,8 +3975,8 @@ lxsession_lxsession_config_set_xrandr_command ((LxsessionLxsessionConfig*) self, _tmp186_); _g_free0 (_tmp186_); } - goto __finally44; - __catch44_g_key_file_error: + goto __finally45; + __catch45_g_key_file_error: { GError* err = NULL; GError* _tmp187_; @@ -3869,13 +3985,13 @@ _inner_error_ = NULL; _tmp187_ = err; _tmp188_ = _tmp187_->message; - g_message ("settings.vala:484: %s", _tmp188_); + g_message ("settings.vala:521: %s", _tmp188_); _g_error_free0 (err); } - __finally44: + __finally45: if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch43_g_key_file_error; + goto __catch44_g_key_file_error; } 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_); @@ -3883,8 +3999,8 @@ } } } - goto __finally43; - __catch43_g_key_file_error: + goto __finally44; + __catch44_g_key_file_error: { GError* err = NULL; GError* _tmp189_; @@ -3893,10 +4009,10 @@ _inner_error_ = NULL; _tmp189_ = err; _tmp190_ = _tmp189_->message; - g_message ("settings.vala:490: %s", _tmp190_); + g_message ("settings.vala:527: %s", _tmp190_); _g_error_free0 (err); } - __finally43: + __finally44: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3912,7 +4028,7 @@ _tmp193_ = _tmp192_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch45_g_key_file_error; + goto __catch46_g_key_file_error; } 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_); @@ -3922,8 +4038,8 @@ lxsession_lxsession_config_set_security_keyring ((LxsessionLxsessionConfig*) self, _tmp194_); _g_free0 (_tmp194_); } - goto __finally45; - __catch45_g_key_file_error: + goto __finally46; + __catch46_g_key_file_error: { GError* err = NULL; GError* _tmp195_; @@ -3932,10 +4048,10 @@ _inner_error_ = NULL; _tmp195_ = err; _tmp196_ = _tmp195_->message; - g_warning ("settings.vala:500: %s", _tmp196_); + g_warning ("settings.vala:537: %s", _tmp196_); _g_error_free0 (err); } - __finally45: + __finally46: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3951,7 +4067,7 @@ _tmp199_ = _tmp198_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch46_g_key_file_error; + goto __catch47_g_key_file_error; } 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_); @@ -3961,8 +4077,8 @@ lxsession_lxsession_config_set_gtk_theme_name ((LxsessionLxsessionConfig*) self, _tmp200_); _g_free0 (_tmp200_); } - goto __finally46; - __catch46_g_key_file_error: + goto __finally47; + __catch47_g_key_file_error: { GError* err = NULL; GError* _tmp201_; @@ -3971,10 +4087,10 @@ _inner_error_ = NULL; _tmp201_ = err; _tmp202_ = _tmp201_->message; - g_warning ("settings.vala:510: %s", _tmp202_); + g_warning ("settings.vala:547: %s", _tmp202_); _g_error_free0 (err); } - __finally46: + __finally47: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -3990,7 +4106,7 @@ _tmp205_ = _tmp204_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch47_g_key_file_error; + goto __catch48_g_key_file_error; } 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_); @@ -4000,8 +4116,8 @@ lxsession_lxsession_config_set_gtk_icon_theme_name ((LxsessionLxsessionConfig*) self, _tmp206_); _g_free0 (_tmp206_); } - goto __finally47; - __catch47_g_key_file_error: + goto __finally48; + __catch48_g_key_file_error: { GError* err = NULL; GError* _tmp207_; @@ -4010,10 +4126,10 @@ _inner_error_ = NULL; _tmp207_ = err; _tmp208_ = _tmp207_->message; - g_warning ("settings.vala:518: %s", _tmp208_); + g_warning ("settings.vala:555: %s", _tmp208_); _g_error_free0 (err); } - __finally47: + __finally48: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4029,7 +4145,7 @@ _tmp211_ = _tmp210_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch48_g_key_file_error; + goto __catch49_g_key_file_error; } 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_); @@ -4039,8 +4155,8 @@ lxsession_lxsession_config_set_gtk_font_name ((LxsessionLxsessionConfig*) self, _tmp212_); _g_free0 (_tmp212_); } - goto __finally48; - __catch48_g_key_file_error: + goto __finally49; + __catch49_g_key_file_error: { GError* err = NULL; GError* _tmp213_; @@ -4049,10 +4165,10 @@ _inner_error_ = NULL; _tmp213_ = err; _tmp214_ = _tmp213_->message; - g_warning ("settings.vala:526: %s", _tmp214_); + g_warning ("settings.vala:563: %s", _tmp214_); _g_error_free0 (err); } - __finally48: + __finally49: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4067,7 +4183,7 @@ _tmp217_ = _tmp216_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch49_g_key_file_error; + goto __catch50_g_key_file_error; } 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_); @@ -4075,8 +4191,8 @@ } lxsession_lxsession_config_set_gtk_toolbar_style ((LxsessionLxsessionConfig*) self, _tmp217_); } - goto __finally49; - __catch49_g_key_file_error: + goto __finally50; + __catch50_g_key_file_error: { GError* err = NULL; GError* _tmp218_; @@ -4085,10 +4201,10 @@ _inner_error_ = NULL; _tmp218_ = err; _tmp219_ = _tmp218_->message; - g_warning ("settings.vala:534: %s", _tmp219_); + g_warning ("settings.vala:571: %s", _tmp219_); _g_error_free0 (err); } - __finally49: + __finally50: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4103,7 +4219,7 @@ _tmp222_ = _tmp221_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch50_g_key_file_error; + goto __catch51_g_key_file_error; } 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_); @@ -4111,8 +4227,8 @@ } lxsession_lxsession_config_set_gtk_button_images ((LxsessionLxsessionConfig*) self, _tmp222_); } - goto __finally50; - __catch50_g_key_file_error: + goto __finally51; + __catch51_g_key_file_error: { GError* err = NULL; GError* _tmp223_; @@ -4121,10 +4237,10 @@ _inner_error_ = NULL; _tmp223_ = err; _tmp224_ = _tmp223_->message; - g_warning ("settings.vala:542: %s", _tmp224_); + g_warning ("settings.vala:579: %s", _tmp224_); _g_error_free0 (err); } - __finally50: + __finally51: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4139,7 +4255,7 @@ _tmp227_ = _tmp226_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch51_g_key_file_error; + goto __catch52_g_key_file_error; } 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_); @@ -4147,8 +4263,8 @@ } lxsession_lxsession_config_set_gtk_menu_images ((LxsessionLxsessionConfig*) self, _tmp227_); } - goto __finally51; - __catch51_g_key_file_error: + goto __finally52; + __catch52_g_key_file_error: { GError* err = NULL; GError* _tmp228_; @@ -4157,10 +4273,10 @@ _inner_error_ = NULL; _tmp228_ = err; _tmp229_ = _tmp228_->message; - g_warning ("settings.vala:550: %s", _tmp229_); + g_warning ("settings.vala:587: %s", _tmp229_); _g_error_free0 (err); } - __finally51: + __finally52: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4175,7 +4291,7 @@ _tmp232_ = _tmp231_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch52_g_key_file_error; + goto __catch53_g_key_file_error; } 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_); @@ -4183,8 +4299,8 @@ } lxsession_lxsession_config_set_gtk_cursor_theme_size ((LxsessionLxsessionConfig*) self, _tmp232_); } - goto __finally52; - __catch52_g_key_file_error: + goto __finally53; + __catch53_g_key_file_error: { GError* err = NULL; GError* _tmp233_; @@ -4193,10 +4309,10 @@ _inner_error_ = NULL; _tmp233_ = err; _tmp234_ = _tmp233_->message; - g_warning ("settings.vala:558: %s", _tmp234_); + g_warning ("settings.vala:595: %s", _tmp234_); _g_error_free0 (err); } - __finally52: + __finally53: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4211,7 +4327,7 @@ _tmp237_ = _tmp236_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch53_g_key_file_error; + goto __catch54_g_key_file_error; } 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_); @@ -4219,8 +4335,8 @@ } lxsession_lxsession_config_set_gtk_antialias ((LxsessionLxsessionConfig*) self, _tmp237_); } - goto __finally53; - __catch53_g_key_file_error: + goto __finally54; + __catch54_g_key_file_error: { GError* err = NULL; GError* _tmp238_; @@ -4229,10 +4345,10 @@ _inner_error_ = NULL; _tmp238_ = err; _tmp239_ = _tmp238_->message; - g_warning ("settings.vala:566: %s", _tmp239_); + g_warning ("settings.vala:603: %s", _tmp239_); _g_error_free0 (err); } - __finally53: + __finally54: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4247,7 +4363,7 @@ _tmp242_ = _tmp241_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch54_g_key_file_error; + goto __catch55_g_key_file_error; } 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_); @@ -4255,8 +4371,8 @@ } lxsession_lxsession_config_set_gtk_hinting ((LxsessionLxsessionConfig*) self, _tmp242_); } - goto __finally54; - __catch54_g_key_file_error: + goto __finally55; + __catch55_g_key_file_error: { GError* err = NULL; GError* _tmp243_; @@ -4265,10 +4381,10 @@ _inner_error_ = NULL; _tmp243_ = err; _tmp244_ = _tmp243_->message; - g_warning ("settings.vala:574: %s", _tmp244_); + g_warning ("settings.vala:611: %s", _tmp244_); _g_error_free0 (err); } - __finally54: + __finally55: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4284,7 +4400,7 @@ _tmp247_ = _tmp246_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch55_g_key_file_error; + goto __catch56_g_key_file_error; } 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_); @@ -4294,8 +4410,8 @@ lxsession_lxsession_config_set_gtk_hint_style ((LxsessionLxsessionConfig*) self, _tmp248_); _g_free0 (_tmp248_); } - goto __finally55; - __catch55_g_key_file_error: + goto __finally56; + __catch56_g_key_file_error: { GError* err = NULL; GError* _tmp249_; @@ -4304,10 +4420,10 @@ _inner_error_ = NULL; _tmp249_ = err; _tmp250_ = _tmp249_->message; - g_warning ("settings.vala:582: %s", _tmp250_); + g_warning ("settings.vala:619: %s", _tmp250_); _g_error_free0 (err); } - __finally55: + __finally56: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4323,7 +4439,7 @@ _tmp253_ = _tmp252_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch56_g_key_file_error; + goto __catch57_g_key_file_error; } 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_); @@ -4333,8 +4449,8 @@ lxsession_lxsession_config_set_gtk_rgba ((LxsessionLxsessionConfig*) self, _tmp254_); _g_free0 (_tmp254_); } - goto __finally56; - __catch56_g_key_file_error: + goto __finally57; + __catch57_g_key_file_error: { GError* err = NULL; GError* _tmp255_; @@ -4343,10 +4459,10 @@ _inner_error_ = NULL; _tmp255_ = err; _tmp256_ = _tmp255_->message; - g_warning ("settings.vala:590: %s", _tmp256_); + g_warning ("settings.vala:627: %s", _tmp256_); _g_error_free0 (err); } - __finally56: + __finally57: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4362,7 +4478,7 @@ _tmp259_ = _tmp258_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch57_g_key_file_error; + goto __catch58_g_key_file_error; } 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_); @@ -4372,8 +4488,8 @@ lxsession_lxsession_config_set_gtk_color_scheme ((LxsessionLxsessionConfig*) self, _tmp260_); _g_free0 (_tmp260_); } - goto __finally57; - __catch57_g_key_file_error: + goto __finally58; + __catch58_g_key_file_error: { GError* err = NULL; GError* _tmp261_; @@ -4382,10 +4498,10 @@ _inner_error_ = NULL; _tmp261_ = err; _tmp262_ = _tmp261_->message; - g_warning ("settings.vala:598: %s", _tmp262_); + g_warning ("settings.vala:635: %s", _tmp262_); _g_error_free0 (err); } - __finally57: + __finally58: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4401,7 +4517,7 @@ _tmp265_ = _tmp264_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch58_g_key_file_error; + goto __catch59_g_key_file_error; } 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_); @@ -4411,8 +4527,8 @@ lxsession_lxsession_config_set_gtk_cursor_theme_name ((LxsessionLxsessionConfig*) self, _tmp266_); _g_free0 (_tmp266_); } - goto __finally58; - __catch58_g_key_file_error: + goto __finally59; + __catch59_g_key_file_error: { GError* err = NULL; GError* _tmp267_; @@ -4421,10 +4537,10 @@ _inner_error_ = NULL; _tmp267_ = err; _tmp268_ = _tmp267_->message; - g_warning ("settings.vala:606: %s", _tmp268_); + g_warning ("settings.vala:643: %s", _tmp268_); _g_error_free0 (err); } - __finally58: + __finally59: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4439,7 +4555,7 @@ _tmp271_ = _tmp270_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch59_g_key_file_error; + goto __catch60_g_key_file_error; } 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_); @@ -4447,8 +4563,8 @@ } lxsession_lxsession_config_set_gtk_toolbar_icon_size ((LxsessionLxsessionConfig*) self, _tmp271_); } - goto __finally59; - __catch59_g_key_file_error: + goto __finally60; + __catch60_g_key_file_error: { GError* err = NULL; GError* _tmp272_; @@ -4457,10 +4573,10 @@ _inner_error_ = NULL; _tmp272_ = err; _tmp273_ = _tmp272_->message; - g_warning ("settings.vala:614: %s", _tmp273_); + g_warning ("settings.vala:651: %s", _tmp273_); _g_error_free0 (err); } - __finally59: + __finally60: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4475,7 +4591,7 @@ _tmp276_ = _tmp275_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch60_g_key_file_error; + goto __catch61_g_key_file_error; } 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_); @@ -4483,8 +4599,8 @@ } lxsession_lxsession_config_set_gtk_enable_event_sounds ((LxsessionLxsessionConfig*) self, _tmp276_); } - goto __finally60; - __catch60_g_key_file_error: + goto __finally61; + __catch61_g_key_file_error: { GError* err = NULL; GError* _tmp277_; @@ -4493,10 +4609,10 @@ _inner_error_ = NULL; _tmp277_ = err; _tmp278_ = _tmp277_->message; - g_warning ("settings.vala:622: %s", _tmp278_); + g_warning ("settings.vala:659: %s", _tmp278_); _g_error_free0 (err); } - __finally60: + __finally61: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4511,7 +4627,7 @@ _tmp281_ = _tmp280_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch61_g_key_file_error; + goto __catch62_g_key_file_error; } 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_); @@ -4519,8 +4635,8 @@ } lxsession_lxsession_config_set_gtk_enable_input_feedback_sounds ((LxsessionLxsessionConfig*) self, _tmp281_); } - goto __finally61; - __catch61_g_key_file_error: + goto __finally62; + __catch62_g_key_file_error: { GError* err = NULL; GError* _tmp282_; @@ -4529,10 +4645,10 @@ _inner_error_ = NULL; _tmp282_ = err; _tmp283_ = _tmp282_->message; - g_warning ("settings.vala:630: %s", _tmp283_); + g_warning ("settings.vala:667: %s", _tmp283_); _g_error_free0 (err); } - __finally61: + __finally62: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4547,7 +4663,7 @@ _tmp286_ = _tmp285_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch62_g_key_file_error; + goto __catch63_g_key_file_error; } 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_); @@ -4555,8 +4671,8 @@ } lxsession_lxsession_config_set_mouse_acc_factor ((LxsessionLxsessionConfig*) self, _tmp286_); } - goto __finally62; - __catch62_g_key_file_error: + goto __finally63; + __catch63_g_key_file_error: { GError* err = NULL; GError* _tmp287_; @@ -4565,10 +4681,10 @@ _inner_error_ = NULL; _tmp287_ = err; _tmp288_ = _tmp287_->message; - g_warning ("settings.vala:640: %s", _tmp288_); + g_warning ("settings.vala:677: %s", _tmp288_); _g_error_free0 (err); } - __finally62: + __finally63: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4583,7 +4699,7 @@ _tmp291_ = _tmp290_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch63_g_key_file_error; + goto __catch64_g_key_file_error; } 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_); @@ -4591,8 +4707,8 @@ } lxsession_lxsession_config_set_mouse_acc_threshold ((LxsessionLxsessionConfig*) self, _tmp291_); } - goto __finally63; - __catch63_g_key_file_error: + goto __finally64; + __catch64_g_key_file_error: { GError* err = NULL; GError* _tmp292_; @@ -4601,10 +4717,10 @@ _inner_error_ = NULL; _tmp292_ = err; _tmp293_ = _tmp292_->message; - g_warning ("settings.vala:648: %s", _tmp293_); + g_warning ("settings.vala:685: %s", _tmp293_); _g_error_free0 (err); } - __finally63: + __finally64: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4619,7 +4735,7 @@ _tmp296_ = _tmp295_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch64_g_key_file_error; + goto __catch65_g_key_file_error; } 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_); @@ -4627,8 +4743,8 @@ } lxsession_lxsession_config_set_mouse_left_handed ((LxsessionLxsessionConfig*) self, _tmp296_); } - goto __finally64; - __catch64_g_key_file_error: + goto __finally65; + __catch65_g_key_file_error: { GError* err = NULL; GError* _tmp297_; @@ -4637,10 +4753,10 @@ _inner_error_ = NULL; _tmp297_ = err; _tmp298_ = _tmp297_->message; - g_warning ("settings.vala:656: %s", _tmp298_); + g_warning ("settings.vala:693: %s", _tmp298_); _g_error_free0 (err); } - __finally64: + __finally65: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4655,7 +4771,7 @@ _tmp301_ = _tmp300_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch65_g_key_file_error; + goto __catch66_g_key_file_error; } 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_); @@ -4663,8 +4779,8 @@ } lxsession_lxsession_config_set_keyboard_delay ((LxsessionLxsessionConfig*) self, _tmp301_); } - goto __finally65; - __catch65_g_key_file_error: + goto __finally66; + __catch66_g_key_file_error: { GError* err = NULL; GError* _tmp302_; @@ -4673,10 +4789,10 @@ _inner_error_ = NULL; _tmp302_ = err; _tmp303_ = _tmp302_->message; - g_warning ("settings.vala:666: %s", _tmp303_); + g_warning ("settings.vala:703: %s", _tmp303_); _g_error_free0 (err); } - __finally65: + __finally66: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4691,7 +4807,7 @@ _tmp306_ = _tmp305_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch66_g_key_file_error; + goto __catch67_g_key_file_error; } 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_); @@ -4699,8 +4815,8 @@ } lxsession_lxsession_config_set_keyboard_interval ((LxsessionLxsessionConfig*) self, _tmp306_); } - goto __finally66; - __catch66_g_key_file_error: + goto __finally67; + __catch67_g_key_file_error: { GError* err = NULL; GError* _tmp307_; @@ -4709,10 +4825,10 @@ _inner_error_ = NULL; _tmp307_ = err; _tmp308_ = _tmp307_->message; - g_warning ("settings.vala:674: %s", _tmp308_); + g_warning ("settings.vala:711: %s", _tmp308_); _g_error_free0 (err); } - __finally66: + __finally67: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4727,7 +4843,7 @@ _tmp311_ = _tmp310_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch67_g_key_file_error; + goto __catch68_g_key_file_error; } 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_); @@ -4735,8 +4851,8 @@ } lxsession_lxsession_config_set_keyboard_beep ((LxsessionLxsessionConfig*) self, _tmp311_); } - goto __finally67; - __catch67_g_key_file_error: + goto __finally68; + __catch68_g_key_file_error: { GError* err = NULL; GError* _tmp312_; @@ -4745,10 +4861,10 @@ _inner_error_ = NULL; _tmp312_ = err; _tmp313_ = _tmp312_->message; - g_warning ("settings.vala:682: %s", _tmp313_); + g_warning ("settings.vala:719: %s", _tmp313_); _g_error_free0 (err); } - __finally67: + __finally68: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -4763,7 +4879,7 @@ gchar* str; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); - g_message ("settings.vala:688: Saving desktop file"); + g_message ("settings.vala:725: Saving desktop file"); _tmp0_ = self->kf; _tmp1_ = g_key_file_to_data (_tmp0_, NULL, NULL); str = _tmp1_; @@ -4777,7 +4893,7 @@ g_file_set_contents (_tmp2_, str, (gssize) _tmp4_, &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_FILE_ERROR) { - goto __catch68_g_file_error; + goto __catch69_g_file_error; } _g_free0 (str); 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); @@ -4785,8 +4901,8 @@ return; } } - goto __finally68; - __catch68_g_file_error: + goto __finally69; + __catch69_g_file_error: { GError* err = NULL; GError* _tmp5_; @@ -4795,7 +4911,7 @@ _inner_error_ = NULL; _tmp5_ = err; _tmp6_ = _tmp5_->message; - g_warning ("settings.vala:693: %s", _tmp6_); + g_warning ("settings.vala:730: %s", _tmp6_); { const gchar* _tmp7_ = NULL; const gchar* _tmp8_; @@ -4816,7 +4932,7 @@ if (_inner_error_ != NULL) { _g_free0 (user_config_dir); if (_inner_error_->domain == G_FILE_ERROR) { - goto __catch69_g_file_error; + goto __catch70_g_file_error; } _g_free0 (user_config_dir); _g_error_free0 (err); @@ -4830,8 +4946,8 @@ lxsession_lxsession_config_key_file_setup_monitor_desktop_file (self); _g_free0 (user_config_dir); } - goto __finally69; - __catch69_g_file_error: + goto __finally70; + __catch70_g_file_error: { GError* err = NULL; GError* _tmp14_; @@ -4840,10 +4956,10 @@ _inner_error_ = NULL; _tmp14_ = err; _tmp15_ = _tmp14_->message; - g_warning ("settings.vala:705: %s", _tmp15_); + g_warning ("settings.vala:742: %s", _tmp15_); _g_error_free0 (err); } - __finally69: + __finally70: if (_inner_error_ != NULL) { _g_error_free0 (err); _g_error_free0 (err); @@ -4854,7 +4970,7 @@ } _g_error_free0 (err); } - __finally68: + __finally69: if (_inner_error_ != NULL) { _g_free0 (str); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -4874,7 +4990,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:713: Changing window manager: %s", _tmp0_); + g_message ("settings.vala:750: Changing window manager: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_window_manager ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4894,7 +5010,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:721: Changing window manager program: %s", _tmp0_); + g_message ("settings.vala:758: Changing window manager program: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_window_manager_program ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4914,7 +5030,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:729: Changing window manager session: %s", _tmp0_); + g_message ("settings.vala:766: Changing window manager session: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_window_manager_session ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4934,7 +5050,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:737: Changing window manager extras: %s", _tmp0_); + g_message ("settings.vala:774: Changing window manager extras: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_window_manager_extras ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4954,7 +5070,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:745: Changing disable autostart option: %s", _tmp0_); + g_message ("settings.vala:782: Changing disable autostart option: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_disable_autostart ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4974,7 +5090,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:753: Changing keymap mode: %s", _tmp0_); + g_message ("settings.vala:790: Changing keymap mode: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keymap_mode ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -4994,7 +5110,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:761: Changing keymap model: %s", _tmp0_); + g_message ("settings.vala:798: Changing keymap model: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keymap_model ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5014,7 +5130,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:769: Changing keymap layout: %s", _tmp0_); + g_message ("settings.vala:806: Changing keymap layout: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keymap_layout ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5034,7 +5150,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:777: Changing keymap variant: %s", _tmp0_); + g_message ("settings.vala:814: Changing keymap variant: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keymap_variant ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5054,7 +5170,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:785: Changing keymap options: %s", _tmp0_); + g_message ("settings.vala:822: Changing keymap options: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keymap_options ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5074,7 +5190,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:793: Changing xrandr mode: %s", _tmp0_); + g_message ("settings.vala:830: Changing xrandr mode: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_xrandr_mode ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5094,7 +5210,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:801: Changing xrandr command: %s", _tmp0_); + g_message ("settings.vala:838: Changing xrandr command: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_xrandr_command ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5114,7 +5230,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:809: Changing gtk_theme_name: %s", _tmp0_); + g_message ("settings.vala:846: Changing gtk_theme_name: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_theme_name ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5134,7 +5250,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:818: Changing gtk_icon_theme_name: %s", _tmp0_); + g_message ("settings.vala:855: Changing gtk_icon_theme_name: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_icon_theme_name ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5154,7 +5270,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:826: Changing gtk_font_name: %s", _tmp0_); + g_message ("settings.vala:863: Changing gtk_font_name: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_font_name ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5173,7 +5289,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:834: Changing gtk_font_name: %i", _tmp0_); + g_message ("settings.vala:871: Changing gtk_font_name: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_toolbar_style ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5192,7 +5308,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:842: Changing gtk_button_images: %i", _tmp0_); + g_message ("settings.vala:879: Changing gtk_button_images: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_button_images ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5211,7 +5327,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:850: Changing gtk_menu_images: %i", _tmp0_); + g_message ("settings.vala:887: Changing gtk_menu_images: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_menu_images ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5230,7 +5346,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:858: Changing gtk_cursor_theme_size: %i", _tmp0_); + g_message ("settings.vala:895: Changing gtk_cursor_theme_size: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_cursor_theme_size ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5249,7 +5365,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:866: Changing gtk_antialias: %i", _tmp0_); + g_message ("settings.vala:903: Changing gtk_antialias: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_antialias ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5268,7 +5384,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:874: Changing gtk_hinting: %i", _tmp0_); + g_message ("settings.vala:911: Changing gtk_hinting: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_hinting ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5288,7 +5404,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:882: Changing gtk_hint_style: %s", _tmp0_); + g_message ("settings.vala:919: Changing gtk_hint_style: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_hint_style ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5308,7 +5424,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:890: Changing gtk_rgba: %s", _tmp0_); + g_message ("settings.vala:927: Changing gtk_rgba: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_rgba ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5328,7 +5444,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:898: Changing gtk_color_scheme: %s", _tmp0_); + g_message ("settings.vala:935: Changing gtk_color_scheme: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_color_scheme ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5348,7 +5464,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (dbus_arg != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:906: Changing gtk_cursor_theme_name: %s", _tmp0_); + g_message ("settings.vala:943: Changing gtk_cursor_theme_name: %s", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_cursor_theme_name ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5367,7 +5483,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:914: Changing gtk_cursor_theme_name: %i", _tmp0_); + g_message ("settings.vala:951: Changing gtk_cursor_theme_name: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_toolbar_icon_size ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5386,7 +5502,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:922: Changing gtk_enable_event_sounds: %i", _tmp0_); + g_message ("settings.vala:959: Changing gtk_enable_event_sounds: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_enable_event_sounds ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5405,7 +5521,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:930: Changing gtk_enable_input_feedback_sounds: %i", _tmp0_); + g_message ("settings.vala:967: Changing gtk_enable_input_feedback_sounds: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_gtk_enable_input_feedback_sounds ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5424,7 +5540,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:938: Changing mouse_acc_factor: %i", _tmp0_); + g_message ("settings.vala:975: Changing mouse_acc_factor: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_mouse_acc_factor ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5443,7 +5559,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:946: Changing mouse_acc_threshold: %i", _tmp0_); + g_message ("settings.vala:983: Changing mouse_acc_threshold: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_mouse_acc_threshold ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5462,7 +5578,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:954: Changing mouse_left_handed: %i", _tmp0_); + g_message ("settings.vala:991: Changing mouse_left_handed: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_mouse_left_handed ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5481,7 +5597,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:962: Changing keyboard_delay: %i", _tmp0_); + g_message ("settings.vala:999: Changing keyboard_delay: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keyboard_delay ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5500,7 +5616,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:970: Changing keyboard_interval: %i", _tmp0_); + g_message ("settings.vala:1007: Changing keyboard_interval: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keyboard_interval ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5519,7 +5635,7 @@ gint _tmp4_; g_return_if_fail (self != NULL); _tmp0_ = dbus_arg; - g_message ("settings.vala:978: Changing keyboard_beep: %i", _tmp0_); + g_message ("settings.vala:1015: Changing keyboard_beep: %i", _tmp0_); _tmp1_ = dbus_arg; lxsession_lxsession_config_set_keyboard_beep ((LxsessionLxsessionConfig*) self, _tmp1_); _tmp2_ = self->kf; @@ -5537,7 +5653,7 @@ const gchar* _tmp3_; g_return_if_fail (self != NULL); g_return_if_fail (mode != NULL); - g_message ("settings.vala:986: Changing laptop mode"); + g_message ("settings.vala:1023: Changing laptop mode"); _tmp0_ = mode; lxsession_lxsession_config_set_laptop_mode ((LxsessionLxsessionConfig*) self, _tmp0_); _tmp1_ = self->kf; @@ -5551,7 +5667,7 @@ void lxsession_lxsession_config_key_file_on_reload_settings_daemon (LxsessionLxsessionConfigKeyFile* self) { GKeyFile* _tmp0_; g_return_if_fail (self != NULL); - g_message ("settings.vala:994: Reloading XSettings daemon"); + g_message ("settings.vala:1031: Reloading XSettings daemon"); _tmp0_ = self->kf; settings_daemon_reload (_tmp0_); } @@ -5563,7 +5679,7 @@ LxsessionAudioManagerApp* _tmp2_; LxsessionAudioManagerApp* audio; g_return_if_fail (self != NULL); - g_message ("settings.vala:1000: Start Audio Manager"); + g_message ("settings.vala:1037: Start Audio Manager"); _tmp0_ = lxsession_lxsession_config_get_audio_manager ((LxsessionLxsessionConfig*) self); _tmp1_ = _tmp0_; _tmp2_ = lxsession_audio_manager_app_new (_tmp1_); @@ -5579,7 +5695,7 @@ LxsessionQuitManagerApp* _tmp2_; LxsessionQuitManagerApp* quit; g_return_if_fail (self != NULL); - g_message ("settings.vala:1007: Start Audio Manager"); + g_message ("settings.vala:1044: Start Audio Manager"); _tmp0_ = lxsession_lxsession_config_get_quit_manager ((LxsessionLxsessionConfig*) self); _tmp1_ = _tmp0_; _tmp2_ = lxsession_quit_manager_app_new (_tmp1_); @@ -5595,7 +5711,7 @@ LxsessionWorkspaceManagerApp* _tmp2_; LxsessionWorkspaceManagerApp* workspace; g_return_if_fail (self != NULL); - g_message ("settings.vala:1014: Start Workspace Manager"); + g_message ("settings.vala:1051: Start Workspace Manager"); _tmp0_ = lxsession_lxsession_config_get_workspace_manager ((LxsessionLxsessionConfig*) self); _tmp1_ = _tmp0_; _tmp2_ = lxsession_workspace_manager_app_new (_tmp1_); @@ -5611,7 +5727,7 @@ LxsessionLauncherManagerApp* _tmp2_; LxsessionLauncherManagerApp* launcher; g_return_if_fail (self != NULL); - g_message ("settings.vala:1021: Start Launcher Manager"); + g_message ("settings.vala:1058: Start Launcher Manager"); _tmp0_ = lxsession_lxsession_config_get_launcher_manager ((LxsessionLxsessionConfig*) self); _tmp1_ = _tmp0_; _tmp2_ = lxsession_launcher_manager_app_new (_tmp1_); @@ -5627,7 +5743,7 @@ LxsessionTerminalManagerApp* _tmp2_; LxsessionTerminalManagerApp* terminal; g_return_if_fail (self != NULL); - g_message ("settings.vala:1028: Start Terminal Manager"); + g_message ("settings.vala:1065: Start Terminal Manager"); _tmp0_ = lxsession_lxsession_config_get_terminal_manager ((LxsessionLxsessionConfig*) self); _tmp1_ = _tmp0_; _tmp2_ = lxsession_terminal_manager_app_new (_tmp1_); @@ -5681,7 +5797,10 @@ _g_key_file_free0 (self->kf); _g_free0 (self->priv->_desktop_config_path); _g_object_unref0 (self->desktop_file); + _g_object_unref0 (self->home_desktop_file); _g_object_unref0 (self->monitor_desktop_file); + _g_object_unref0 (self->monitor_home_desktop_file); + _g_object_unref0 (self->monitor_cancel); G_OBJECT_CLASS (lxsession_lxsession_config_key_file_parent_class)->finalize (obj); } diff -Nru lxsession-0.4.9.1~git20120708/lxsession/settings.vala lxsession-0.4.9.1~git20120828/lxsession/settings.vala --- lxsession-0.4.9.1~git20120708/lxsession/settings.vala 2012-07-04 19:31:28.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/settings.vala 2012-08-27 18:38:41.000000000 +0000 @@ -52,7 +52,7 @@ public string laptop_mode { get; set; default = null;} /* Clipboard */ - public string clipboard_command { get; set; default = null;} + public string clipboard_command { get; set; default = "lxclipboard";} /* Dbus */ public string dbus_lxde { get; set; default = "true";} @@ -108,7 +108,10 @@ public KeyFile kf; public string desktop_config_path { get; set; default = null;} public GLib.File desktop_file ; - public GLib.FileMonitor monitor_desktop_file; + public GLib.File home_desktop_file ; + public GLib.FileMonitor monitor_desktop_file ; + public GLib.FileMonitor monitor_home_desktop_file; + public GLib.Cancellable monitor_cancel; public LxsessionConfigKeyFile(string session_arg, string desktop_env_name_arg, LxSignals sig) { @@ -177,9 +180,32 @@ { try { desktop_file = File.new_for_path(desktop_config_path); - monitor_desktop_file = desktop_file.monitor_file(GLib.FileMonitorFlags.NONE); + monitor_desktop_file = desktop_file.monitor_file(GLib.FileMonitorFlags.NONE, monitor_cancel); monitor_desktop_file.changed.connect(on_desktop_file_change); message ("Monitoring: %s",desktop_config_path); + + if ( desktop_file.get_path() == get_config_home_path("desktop.conf")) + { + message ("Desktop file is already in config home, do nothing"); + } + else + { + message ("Desktop file is not in config home, monitoring creation of it"); + setup_creation_desktop_file(); + } + + } catch (GLib.Error err) { + message (err.message); + } + } + + public void setup_creation_desktop_file() + { + try { + home_desktop_file = File.new_for_path(get_config_home_path("desktop.conf")); + monitor_home_desktop_file = home_desktop_file.monitor_file(GLib.FileMonitorFlags.NONE); + monitor_home_desktop_file.changed.connect(on_desktop_file_creation); + message ("Monitoring home path: %s", home_desktop_file.get_path()); } catch (GLib.Error err) { message (err.message); } @@ -192,6 +218,17 @@ settings_daemon_reload(kf); } + public void on_desktop_file_creation () + { + message("Desktop file created in home directory, switch configuration to it"); + desktop_config_path = get_config_home_path("desktop.conf"); + monitor_cancel.cancel(); + + read_keyfile(); + settings_daemon_reload(kf); + setup_monitor_desktop_file(); + } + public void read_keyfile() { kf = load_keyfile (get_config_path ("desktop.conf")); diff -Nru lxsession-0.4.9.1~git20120708/lxsession/utils.c lxsession-0.4.9.1~git20120828/lxsession/utils.c --- lxsession-0.4.9.1~git20120708/lxsession/utils.c 2012-07-08 12:08:04.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/utils.c 2012-08-27 18:39:25.000000000 +0000 @@ -1,4 +1,4 @@ -/* utils.c generated by valac 0.16.1, the Vala compiler +/* utils.c generated by valac 0.14.2, the Vala compiler * generated from utils.vala, do not modify */ /* @@ -73,6 +73,7 @@ void lxsession_app_type_destroy (LxsessionAppType* self); static gchar** _vala_array_dup4 (gchar** self, int length); GKeyFile* lxsession_load_keyfile (const gchar* config_path); +gchar* lxsession_get_config_home_path (const gchar* conf_file); gchar* lxsession_get_config_path (const gchar* conf_file); static gchar** _vala_array_dup5 (gchar** self, int length); GType lxsession_lx_signals_get_type (void) G_GNUC_CONST; @@ -178,10 +179,10 @@ g_key_file_load_from_file (_tmp1_, _tmp2_, G_KEY_FILE_NONE, &_inner_error_); if (_inner_error_ != NULL) { if (_inner_error_->domain == G_KEY_FILE_ERROR) { - goto __catch70_g_key_file_error; + goto __catch71_g_key_file_error; } if (_inner_error_->domain == G_FILE_ERROR) { - goto __catch70_g_file_error; + goto __catch71_g_file_error; } _g_key_file_free0 (kf); 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); @@ -189,8 +190,8 @@ return NULL; } } - goto __finally70; - __catch70_g_key_file_error: + goto __finally71; + __catch71_g_key_file_error: { GError* err = NULL; GError* _tmp3_; @@ -202,8 +203,8 @@ g_warning ("utils.vala:38: %s", _tmp4_); _g_error_free0 (err); } - goto __finally70; - __catch70_g_file_error: + goto __finally71; + __catch71_g_file_error: { GError* err = NULL; GError* _tmp5_; @@ -215,7 +216,7 @@ g_warning ("utils.vala:40: %s", _tmp6_); _g_error_free0 (err); } - __finally70: + __finally71: if (_inner_error_ != NULL) { _g_key_file_free0 (kf); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -227,6 +228,24 @@ } +gchar* lxsession_get_config_home_path (const gchar* conf_file) { + gchar* result = NULL; + const gchar* _tmp0_ = NULL; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_ = NULL; + gchar* user_config_dir; + g_return_val_if_fail (conf_file != NULL, NULL); + _tmp0_ = g_get_user_config_dir (); + _tmp1_ = lxsession_session_global; + _tmp2_ = conf_file; + _tmp3_ = g_build_filename (_tmp0_, "lxsession", _tmp1_, _tmp2_, NULL); + user_config_dir = _tmp3_; + result = user_config_dir; + return result; +} + + static gchar** _vala_array_dup5 (gchar** self, int length) { gchar** result; int i; @@ -243,94 +262,90 @@ gchar* lxsession_get_config_path (const gchar* conf_file) { gchar* result = NULL; gchar* final_config_file = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_ = NULL; gchar* user_config_dir; - const gchar* _tmp4_; - gboolean _tmp5_ = FALSE; - const gchar* _tmp26_; + const gchar* _tmp2_; + gboolean _tmp3_ = FALSE; + const gchar* _tmp24_; g_return_val_if_fail (conf_file != NULL, NULL); - _tmp0_ = g_get_user_config_dir (); - _tmp1_ = lxsession_session_global; - _tmp2_ = conf_file; - _tmp3_ = g_build_filename (_tmp0_, "lxsession", _tmp1_, _tmp2_, NULL); - user_config_dir = _tmp3_; - _tmp4_ = user_config_dir; - _tmp5_ = g_file_test (_tmp4_, G_FILE_TEST_EXISTS); - if (_tmp5_) { - const gchar* _tmp6_; - const gchar* _tmp7_; - gchar* _tmp8_; - _tmp6_ = user_config_dir; - g_message ("utils.vala:58: User config used : %s", _tmp6_); - _tmp7_ = user_config_dir; - _tmp8_ = g_strdup (_tmp7_); + _tmp0_ = conf_file; + _tmp1_ = lxsession_get_config_home_path (_tmp0_); + user_config_dir = _tmp1_; + _tmp2_ = user_config_dir; + _tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS); + if (_tmp3_) { + const gchar* _tmp4_; + const gchar* _tmp5_; + gchar* _tmp6_; + _tmp4_ = user_config_dir; + g_message ("utils.vala:68: User config used : %s", _tmp4_); + _tmp5_ = user_config_dir; + _tmp6_ = g_strdup (_tmp5_); _g_free0 (final_config_file); - final_config_file = _tmp8_; + final_config_file = _tmp6_; } else { + gchar** _tmp7_; + gchar** _tmp8_ = NULL; gchar** _tmp9_; - gchar** _tmp10_ = NULL; - gchar** _tmp11_; - gint _tmp11__length1; + gint _tmp9__length1; gchar** system_config_dirs; gint system_config_dirs_length1; gint _system_config_dirs_size_; gchar* config_system_location; gchar* path_system_config_file; - gchar** _tmp12_; - gint _tmp12__length1; - const gchar* _tmp23_; - const gchar* _tmp24_; - gchar* _tmp25_; - _tmp10_ = _tmp9_ = g_get_system_config_dirs (); - _tmp11_ = (_tmp10_ != NULL) ? _vala_array_dup5 (_tmp10_, _vala_array_length (_tmp9_)) : ((gpointer) _tmp10_); - _tmp11__length1 = _vala_array_length (_tmp9_); - system_config_dirs = _tmp11_; - system_config_dirs_length1 = _tmp11__length1; + gchar** _tmp10_; + gint _tmp10__length1; + const gchar* _tmp21_; + const gchar* _tmp22_; + gchar* _tmp23_; + _tmp8_ = _tmp7_ = g_get_system_config_dirs (); + _tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup5 (_tmp8_, _vala_array_length (_tmp7_)) : ((gpointer) _tmp8_); + _tmp9__length1 = _vala_array_length (_tmp7_); + system_config_dirs = _tmp9_; + system_config_dirs_length1 = _tmp9__length1; _system_config_dirs_size_ = system_config_dirs_length1; config_system_location = NULL; path_system_config_file = NULL; - _tmp12_ = system_config_dirs; - _tmp12__length1 = system_config_dirs_length1; + _tmp10_ = system_config_dirs; + _tmp10__length1 = system_config_dirs_length1; { gchar** config_collection = NULL; gint config_collection_length1 = 0; gint _config_collection_size_ = 0; gint config_it = 0; - config_collection = _tmp12_; - config_collection_length1 = _tmp12__length1; - for (config_it = 0; config_it < _tmp12__length1; config_it = config_it + 1) { - gchar* _tmp13_; + config_collection = _tmp10_; + config_collection_length1 = _tmp10__length1; + for (config_it = 0; config_it < _tmp10__length1; config_it = config_it + 1) { + gchar* _tmp11_; gchar* config = NULL; - _tmp13_ = g_strdup (config_collection[config_it]); - config = _tmp13_; + _tmp11_ = g_strdup (config_collection[config_it]); + config = _tmp11_; { - const gchar* _tmp14_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_ = NULL; const gchar* _tmp15_; - gchar* _tmp16_ = NULL; - const gchar* _tmp17_; - const gchar* _tmp18_; - gboolean _tmp19_ = FALSE; - _tmp14_ = config; - _tmp15_ = lxsession_session_global; - _tmp16_ = g_build_filename (_tmp14_, "lxsession", _tmp15_, NULL); + const gchar* _tmp16_; + gboolean _tmp17_ = FALSE; + _tmp12_ = config; + _tmp13_ = lxsession_session_global; + _tmp14_ = g_build_filename (_tmp12_, "lxsession", _tmp13_, NULL); _g_free0 (config_system_location); - config_system_location = _tmp16_; - _tmp17_ = config_system_location; - g_message ("utils.vala:69: Config system location : %s", _tmp17_); - _tmp18_ = config_system_location; - _tmp19_ = g_file_test (_tmp18_, G_FILE_TEST_EXISTS); - if (_tmp19_) { - const gchar* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_ = NULL; - _tmp20_ = config_system_location; - _tmp21_ = conf_file; - _tmp22_ = g_build_filename (_tmp20_, _tmp21_, NULL); + config_system_location = _tmp14_; + _tmp15_ = config_system_location; + g_message ("utils.vala:79: Config system location : %s", _tmp15_); + _tmp16_ = config_system_location; + _tmp17_ = g_file_test (_tmp16_, G_FILE_TEST_EXISTS); + if (_tmp17_) { + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_ = NULL; + _tmp18_ = config_system_location; + _tmp19_ = conf_file; + _tmp20_ = g_build_filename (_tmp18_, _tmp19_, NULL); _g_free0 (path_system_config_file); - path_system_config_file = _tmp22_; + path_system_config_file = _tmp20_; _g_free0 (config); break; } @@ -338,18 +353,18 @@ } } } - _tmp23_ = path_system_config_file; - g_message ("utils.vala:75: System system path location : %s", _tmp23_); - _tmp24_ = path_system_config_file; - _tmp25_ = g_strdup (_tmp24_); + _tmp21_ = path_system_config_file; + g_message ("utils.vala:85: System system path location : %s", _tmp21_); + _tmp22_ = path_system_config_file; + _tmp23_ = g_strdup (_tmp22_); _g_free0 (final_config_file); - final_config_file = _tmp25_; + final_config_file = _tmp23_; _g_free0 (path_system_config_file); _g_free0 (config_system_location); system_config_dirs = (_vala_array_free (system_config_dirs, system_config_dirs_length1, (GDestroyNotify) g_free), NULL); } - _tmp26_ = final_config_file; - g_message ("utils.vala:79: Final file used : %s", _tmp26_); + _tmp24_ = final_config_file; + g_message ("utils.vala:89: Final file used : %s", _tmp24_); result = final_config_file; _g_free0 (user_config_dir); return result; @@ -456,7 +471,7 @@ exit_status = _tmp4_; if (_inner_error_ != NULL) { if (_inner_error_->domain == G_SPAWN_ERROR) { - goto __catch71_g_spawn_error; + goto __catch72_g_spawn_error; } _g_free0 (standard_error); _g_free0 (standard_output); @@ -467,14 +482,14 @@ } _tmp5_ = exit_status; if (_tmp5_ == 0) { - g_message ("utils.vala:150: Laptop detect return true"); + g_message ("utils.vala:160: Laptop detect return true"); result = TRUE; _g_free0 (standard_error); _g_free0 (standard_output); _g_free0 (test_laptop_detect); return result; } else { - g_message ("utils.vala:155: Laptop detect return false"); + g_message ("utils.vala:165: Laptop detect return false"); result = FALSE; _g_free0 (standard_error); _g_free0 (standard_output); @@ -482,8 +497,8 @@ return result; } } - goto __finally71; - __catch71_g_spawn_error: + goto __finally72; + __catch72_g_spawn_error: { GError* err = NULL; GError* _tmp6_; @@ -492,7 +507,7 @@ _inner_error_ = NULL; _tmp6_ = err; _tmp7_ = _tmp6_->message; - g_warning ("utils.vala:161: %s", _tmp7_); + g_warning ("utils.vala:171: %s", _tmp7_); result = FALSE; _g_error_free0 (err); _g_free0 (standard_error); @@ -500,7 +515,7 @@ _g_free0 (test_laptop_detect); return result; } - __finally71: + __finally72: _g_free0 (standard_error); _g_free0 (standard_output); _g_free0 (test_laptop_detect); @@ -508,7 +523,7 @@ g_clear_error (&_inner_error_); return FALSE; } else { - g_message ("utils.vala:167: Laptop detect not find"); + g_message ("utils.vala:177: Laptop detect not find"); result = FALSE; _g_free0 (test_laptop_detect); return result; diff -Nru lxsession-0.4.9.1~git20120708/lxsession/utils.vala lxsession-0.4.9.1~git20120828/lxsession/utils.vala --- lxsession-0.4.9.1~git20120708/lxsession/utils.vala 2012-07-04 19:31:28.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/lxsession/utils.vala 2012-08-26 12:46:30.000000000 +0000 @@ -43,9 +43,8 @@ return kf; } -public string get_config_path (string conf_file) { - - string final_config_file; +public string get_config_home_path (string conf_file) +{ string user_config_dir = Path.build_filename( Environment.get_user_config_dir (), @@ -53,6 +52,17 @@ session_global, conf_file); + return user_config_dir; + +} + + +public string get_config_path (string conf_file) { + + string final_config_file; + + string user_config_dir = get_config_home_path(conf_file); + if (FileUtils.test (user_config_dir, FileTest.EXISTS)) { message ("User config used : %s", user_config_dir); diff -Nru lxsession-0.4.9.1~git20120708/po/cs.po lxsession-0.4.9.1~git20120828/po/cs.po --- lxsession-0.4.9.1~git20120708/po/cs.po 2012-07-01 12:52:40.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/po/cs.po 2012-08-26 09:09:19.000000000 +0000 @@ -8,14 +8,15 @@ "Project-Id-Version: lxsession-lite 0.3.6\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-07-22 18:37+0200\n" -"PO-Revision-Date: 2009-01-09 01:21+0100\n" -"Last-Translator: Michal Várady \n" +"PO-Revision-Date: 2012-08-14 13:24+0200\n" +"Last-Translator: ALIUM \n" "Language-Team: Czech\n" -"Language: \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Pootle 2.0.5\n" #: ../lxsession-logout/lxsession-logout.c:48 msgid "Custom message to show on the dialog" @@ -54,7 +55,7 @@ #: ../lxsession-logout/lxsession-logout.c:547 msgid "Sh_utdown" -msgstr "_Vypnout" +msgstr "Vy_pnout" #: ../lxsession-logout/lxsession-logout.c:558 msgid "_Reboot" @@ -62,7 +63,7 @@ #: ../lxsession-logout/lxsession-logout.c:569 msgid "_Suspend" -msgstr "Režim _spánku" +msgstr "_Režim spánku" #: ../lxsession-logout/lxsession-logout.c:580 msgid "_Hibernate" @@ -70,7 +71,7 @@ #: ../lxsession-logout/lxsession-logout.c:591 msgid "S_witch User" -msgstr "_Přepnout uživatele" +msgstr "P_řepnout uživatele" #. Create the Logout button. #: ../lxsession-logout/lxsession-logout.c:600 diff -Nru lxsession-0.4.9.1~git20120708/po/hu.po lxsession-0.4.9.1~git20120828/po/hu.po --- lxsession-0.4.9.1~git20120708/po/hu.po 2012-07-01 12:52:41.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/po/hu.po 2012-08-26 09:09:19.000000000 +0000 @@ -9,13 +9,15 @@ "Project-Id-Version: lxsession\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-07-22 18:37+0200\n" -"PO-Revision-Date: 2010-01-27 17:13+0100\n" -"Last-Translator: Laszlo Dvornik \n" +"PO-Revision-Date: 2012-08-23 14:28+0200\n" +"Last-Translator: Bendegúz \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" #: ../lxsession-logout/lxsession-logout.c:48 msgid "Custom message to show on the dialog" @@ -50,7 +52,7 @@ #: ../lxsession-logout/lxsession-logout.c:539 #, c-format msgid "Logout %s session?" -msgstr "Kijelentkezel ebből a munkamenetből: %s?" +msgstr "Kijelentkezel az %s munkamenetből?" #: ../lxsession-logout/lxsession-logout.c:547 msgid "Sh_utdown" diff -Nru lxsession-0.4.9.1~git20120708/po/it.po lxsession-0.4.9.1~git20120828/po/it.po --- lxsession-0.4.9.1~git20120708/po/it.po 2012-07-01 12:52:41.000000000 +0000 +++ lxsession-0.4.9.1~git20120828/po/it.po 2012-08-26 09:09:19.000000000 +0000 @@ -2,16 +2,17 @@ # Copyright (C) 2009 Fabio Barone # This file is distributed under the same license as the lxsession-lite package # Fabio Barone , 2009 -# +# Andrea Florio , 2010 +# Daniele Forsi , 2012. msgid "" msgstr "" "Project-Id-Version: lxsession-lite 0.3.6\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-07-22 18:37+0200\n" "PO-Revision-Date: 2010-03-09 00:29+0100\n" -"Last-Translator: Andrea Florio \n" -"Language-Team: \n" -"Language: \n" +"Last-Translator: Daniele Forsi \n" +"Language-Team: Italian\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,17 +23,19 @@ msgid "Custom message to show on the dialog" msgstr "Messaggio personalizzato da mostrare nel dialogo" +# tutto maiuscolo perché è un parametro per la riga di comando #: ../lxsession-logout/lxsession-logout.c:48 msgid "message" -msgstr "Messaggio" +msgstr "MESSAGGIO" #: ../lxsession-logout/lxsession-logout.c:49 msgid "Banner to show on the dialog" msgstr "Immagine da mostrare nel dialogo" +# tutto maiuscolo perché è un parametro per la riga di comando #: ../lxsession-logout/lxsession-logout.c:49 msgid "image file" -msgstr "Immagine" +msgstr "FILE_IMMAGINE" #: ../lxsession-logout/lxsession-logout.c:50 msgid "Position of the banner" @@ -46,37 +49,38 @@ #: ../lxsession-logout/lxsession-logout.c:388 msgid "LXSession is not running." -msgstr "LXSession attualmente non è in operazione." +msgstr "LXSession attualmente non è in esecuzione." #: ../lxsession-logout/lxsession-logout.c:539 #, c-format msgid "Logout %s session?" -msgstr "Chiudere la sessione %s? " +msgstr "Chiudere la sessione %s?" +# Sono comandi e comunque l'infinito non torna con l'ultimo pulsante che è "Annulla" dallo stock #: ../lxsession-logout/lxsession-logout.c:547 msgid "Sh_utdown" -msgstr "_Arrestare" +msgstr "_Arresta" #: ../lxsession-logout/lxsession-logout.c:558 msgid "_Reboot" -msgstr "_Riavviare" +msgstr "_Riavvia" #: ../lxsession-logout/lxsession-logout.c:569 msgid "_Suspend" -msgstr "_Sospendere" +msgstr "_Sospendi" #: ../lxsession-logout/lxsession-logout.c:580 msgid "_Hibernate" -msgstr "_Ibernare" +msgstr "_Iberna" #: ../lxsession-logout/lxsession-logout.c:591 msgid "S_witch User" -msgstr "Cambiare _utente" +msgstr "Cambia _utente" #. Create the Logout button. #: ../lxsession-logout/lxsession-logout.c:600 msgid "_Logout" -msgstr "_Chiudere sessione" +msgstr "_Chiudi sessione" #~ msgid "Logout" #~ msgstr "Chiudere sessione"