20 files changed, 16 insertions, 51 deletions
diff --git a/mate-session/gs-idle-monitor.h b/mate-session/gs-idle-monitor.h
index d547d0d..0eb316b 100644
--- a/mate-session/gs-idle-monitor.h
+++ b/mate-session/gs-idle-monitor.h
@@ -47,7 +47,6 @@ void gs_idle_monitor_remove_watch (GSIdleMonitor *monitor,
 guint id);
 void gs_idle_monitor_reset (GSIdleMonitor *monitor);
 
-
 G_END_DECLS
 
 #endif /* __GS_IDLE_MONITOR_H */
diff --git a/mate-session/gsm-autostart-app.c b/mate-session/gsm-autostart-app.c
index 29d66f5..079bfa1 100644
--- a/mate-session/gsm-autostart-app.c
+++ b/mate-session/gsm-autostart-app.c
@@ -1054,7 +1054,6 @@ gsm_autostart_app_provides (GsmApp *app,
 GsmAutostartApp *aapp;
 GsmAutostartAppPrivate *priv;
 
-
 g_return_val_if_fail (GSM_IS_APP (app), FALSE);
 
 aapp = GSM_AUTOSTART_APP (app);
diff --git a/mate-session/gsm-client.c b/mate-session/gsm-client.c
index 87bdd37..8dc4005 100644
--- a/mate-session/gsm-client.c
+++ b/mate-session/gsm-client.c
@@ -526,7 +526,6 @@ gsm_client_cancel_end_session (GsmClient *client,
 return GSM_CLIENT_GET_CLASS (client)->impl_cancel_end_session (client, error);
 }
 
-
 gboolean
 gsm_client_query_end_session (GsmClient *client,
 guint flags,
diff --git a/mate-session/gsm-client.h b/mate-session/gsm-client.h
index 95e93be..ff3012f 100644
--- a/mate-session/gsm-client.h
+++ b/mate-session/gsm-client.h
@@ -97,13 +97,11 @@ GQuark gsm_client_error_quark (void);
 
 const char *gsm_client_peek_id (GsmClient *client);
 
-
 const char * gsm_client_peek_startup_id (GsmClient *client);
 const char * gsm_client_peek_app_id (GsmClient *client);
 guint gsm_client_peek_restart_style_hint (GsmClient *client);
 guint gsm_client_peek_status (GsmClient *client);
 
-
 char *gsm_client_get_app_name (GsmClient *client);
 void gsm_client_set_app_id (GsmClient *client,
 const char *app_id);
diff --git a/mate-session/gsm-consolekit.c b/mate-session/gsm-consolekit.c
index 5930269..45101c8 100644
--- a/mate-session/gsm-consolekit.c
+++ b/mate-session/gsm-consolekit.c
@@ -245,7 +245,7 @@ gsm_consolekit_ensure_ck_connection (GsmConsolekit *manager,
 
 out:
 if (priv->is_connected != is_connected) {
- priv->is_connected = is_connected;
+ priv->is_connected = (is_connected != FALSE);
 g_object_notify (G_OBJECT (manager), "is-connected");
 }
 
@@ -545,7 +545,6 @@ gsm_consolekit_attempt_hibernate (GsmConsolekit *manager)
 G_TYPE_INVALID,
 G_TYPE_INVALID);
 
-
 if (!res) {
 g_warning ("Unable to hibernate system: %s", error->message);
 g_error_free (error);
@@ -710,7 +709,6 @@ gsm_consolekit_set_session_idle (GsmConsolekit *manager,
 goto out;
 }
 
-
 g_debug ("Updating ConsoleKit idle status: %d", is_idle);
 message = dbus_message_new_method_call (CK_NAME,
 session_id,
@@ -1065,7 +1063,6 @@ out:
 return ret;
 }
 
-
 GsmConsolekit *
 gsm_get_consolekit (void)
 {
diff --git a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
index d6c0ef0..69d723a 100644
--- a/mate-session/gsm-dbus-client.c
+++ b/mate-session/gsm-dbus-client.c
@@ -190,7 +190,6 @@ handle_end_session_response (GsmDBusClient *client,
 gsm_client_end_session_response (GSM_CLIENT (client),
 is_ok, FALSE, FALSE, reason);
 
-
 if (! dbus_connection_send (client->connection, reply, NULL)) {
 g_error ("No memory");
 }
diff --git a/mate-session/gsm-inhibit-dialog.c b/mate-session/gsm-inhibit-dialog.c
index 73c322c..791a7b3 100644
--- a/mate-session/gsm-inhibit-dialog.c
+++ b/mate-session/gsm-inhibit-dialog.c
@@ -281,7 +281,6 @@ _load_icon (GtkIconTheme *icon_theme,
 return retval;
 }
 
-
 static GdkPixbuf *
 scale_pixbuf (GdkPixbuf *pixbuf,
 int max_width,
@@ -309,8 +308,8 @@ scale_pixbuf (GdkPixbuf *pixbuf,
 
 /* always scale down, allow to disable scaling up */
 if (scale_factor < 1.0 || !no_stretch_hint) {
- int scale_x = (int) (pw * scale_factor);
- int scale_y = (int) (ph * scale_factor);
+ int scale_x = (int) (scale_factor * (float) pw);
+ int scale_y = (int) (scale_factor * (float) ph);
 g_debug ("Scaling to %dx%d", scale_x, scale_y);
 return gdk_pixbuf_scale_simple (pixbuf,
 scale_x,
@@ -734,7 +733,6 @@ gsm_inhibit_dialog_set_inhibitor_store (GsmInhibitDialog *dialog,
 g_object_unref (dialog->inhibitors);
 }
 
-
 g_debug ("GsmInhibitDialog: setting store %p", store);
 
 dialog->inhibitors = store;
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index 9b5374e..37ca39d 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -83,7 +83,6 @@
 #define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
 #define GDM_FLEXISERVER_ARGS "--startnew Standard"
 
-
 #define LOCKDOWN_SCHEMA "org.mate.lockdown"
 #define KEY_LOCK_DISABLE "disable-lock-screen"
 #define KEY_LOG_OUT_DISABLE "disable-log-out"
@@ -145,7 +144,7 @@ typedef struct {
 GSettings *settings_lockdown;
 GSettings *settings_screensaver;
 
- const char *renderer;
+ char *renderer;
 
 DBusGProxy *bus_proxy;
 DBusGConnection *connection;
@@ -768,7 +767,6 @@ typedef struct {
 guint flags;
 } ClientEndSessionData;
 
-
 static gboolean
 _client_end_session (GsmClient *client,
 ClientEndSessionData *data)
@@ -1697,7 +1695,8 @@ _gsm_manager_set_renderer (GsmManager *manager,
 {
 GsmManagerPrivate *priv;
 priv = gsm_manager_get_instance_private (manager);
- priv->renderer = renderer;
+ g_free (priv->renderer);
+ priv->renderer = g_strdup (renderer);
 }
 
 static gboolean
@@ -1877,7 +1876,6 @@ _disconnect_client (GsmManager *manager,
 goto out;
 }
 
-
 if (app == NULL) {
 g_debug ("GsmManager: unable to find application for client - not restarting");
 goto out;
@@ -2494,7 +2492,6 @@ gsm_manager_set_client_store (GsmManager *manager,
 g_object_unref (priv->clients);
 }
 
-
 g_debug ("GsmManager: setting client store %p", store);
 
 priv->clients = store;
@@ -2660,6 +2657,9 @@ gsm_manager_dispose (GObject *object)
 g_object_unref (priv->settings_screensaver);
 priv->settings_screensaver = NULL;
 }
+
+ g_clear_pointer (&priv->renderer, g_free);
+
 G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
 }
 
@@ -3349,7 +3349,6 @@ request_hibernate (GsmManager *manager)
 gtk_widget_show (priv->inhibit_dialog);
 }
 
-
 static void
 request_logout (GsmManager *manager,
 GsmManagerLogoutMode mode)
@@ -4093,7 +4092,6 @@ gsm_manager_get_inhibitors (GsmManager *manager,
 return TRUE;
 }
 
-
 static gboolean
 _app_has_autostart_condition (const char *id,
 GsmApp *app,
diff --git a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
index db9743c..4c0cb54 100644
--- a/mate-session/gsm-manager.h
+++ b/mate-session/gsm-manager.h
@@ -19,7 +19,6 @@
 *
 */
 
-
 #ifndef __GSM_MANAGER_H
 #define __GSM_MANAGER_H
 
@@ -113,7 +112,6 @@ gboolean gsm_manager_add_legacy_session_apps (GsmManager *
 
 void gsm_manager_start (GsmManager *manager);
 
-
 /* exported methods */
 
 gboolean gsm_manager_register_client (GsmManager *manager,
diff --git a/mate-session/gsm-store.c b/mate-session/gsm-store.c
index de13a33..6a62805 100644
--- a/mate-session/gsm-store.c
+++ b/mate-session/gsm-store.c
@@ -156,7 +156,6 @@ gsm_store_lookup (GsmStore *store,
 return object;
 }
 
-
 typedef struct
 {
 GsmStoreFunc func;
diff --git a/mate-session/gsm-store.h b/mate-session/gsm-store.h
index 0474f77..fe1b1a5 100644
--- a/mate-session/gsm-store.h
+++ b/mate-session/gsm-store.h
@@ -19,7 +19,6 @@
 *
 */
 
-
 #ifndef __GSM_STORE_H
 #define __GSM_STORE_H
 
diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
index b463bbe..74def27 100644
--- a/mate-session/gsm-systemd.c
+++ b/mate-session/gsm-systemd.c
@@ -245,7 +245,7 @@ gsm_systemd_ensure_sd_connection (GsmSystemd *manager,
 
 out:
 if (priv->is_connected != is_connected) {
- priv->is_connected = is_connected;
+ priv->is_connected = (is_connected != FALSE);
 g_object_notify (G_OBJECT (manager), "is-connected");
 }
 
@@ -633,7 +633,6 @@ out:
 }
 }
 
-
 void
 gsm_systemd_set_session_idle (GsmSystemd *manager,
 gboolean is_idle)
@@ -1009,7 +1008,6 @@ gsm_systemd_get_current_session_type (GsmSystemd *manager)
 return session_class;
 }
 
-
 GsmSystemd *
 gsm_get_systemd (void)
 {
diff --git a/mate-session/gsm-util.c b/mate-session/gsm-util.c
index 6799cd0..a760fc3 100644
--- a/mate-session/gsm-util.c
+++ b/mate-session/gsm-util.c
@@ -235,7 +235,6 @@ gsm_util_get_saved_session_dir (void)
 return _saved_session_dir;
 }
 
-
 char **
 gsm_util_get_autostart_dirs ()
 {
diff --git a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
index 8db3390..bffecac 100644
--- a/mate-session/gsm-xsmp-client.c
+++ b/mate-session/gsm-xsmp-client.c
@@ -215,7 +215,6 @@ gsm_xsmp_client_init (GsmXSMPClient *client)
 priv->next_save_yourself_allow_interact = FALSE;
 }
 
-
 static void
 delete_property (GsmXSMPClient *client,
 const char *name)
@@ -248,7 +247,6 @@ delete_property (GsmXSMPClient *client,
 SmFreeProperty (prop);
 }
 
-
 static void
 debug_print_property (SmProp *prop)
 {
@@ -280,7 +278,6 @@ debug_print_property (SmProp *prop)
 }
 }
 
-
 static void
 set_properties_callback (SmsConn conn,
 SmPointer manager_data,
@@ -442,7 +439,7 @@ do_save_yourself (GsmXSMPClient *client,
 g_debug ("GsmXSMPClient: queuing new SaveYourself for '%s'",
 priv->description);
 priv->next_save_yourself = save_type;
- priv->next_save_yourself_allow_interact = allow_interact;
+ priv->next_save_yourself_allow_interact = (allow_interact != FALSE);
 } else {
 priv->current_save_yourself = save_type;
 /* make sure we don't have anything queued */
@@ -1106,7 +1103,6 @@ register_client_callback (SmsConn conn,
 priv->description,
 previous_id ? previous_id : "NULL");
 
-
 /* There are three cases:
 * 1. id is NULL - we'll use a new one
 * 2. id is known - we'll use known one
@@ -1153,7 +1149,6 @@ register_client_callback (SmsConn conn,
 return TRUE;
 }
 
-
 static void
 save_yourself_request_callback (SmsConn conn,
 SmPointer manager_data,
diff --git a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
index c9ec9b8..917cf91 100644
--- a/mate-session/gsm-xsmp-client.h
+++ b/mate-session/gsm-xsmp-client.h
@@ -41,7 +41,6 @@ struct _GsmXSMPClientClass
 gboolean (*logout_request) (GsmXSMPClient *client,
 gboolean prompt);
 
-
 void (*saved_state) (GsmXSMPClient *client);
 
 void (*request_phase2) (GsmXSMPClient *client);
diff --git a/mate-session/gsm-xsmp-server.c b/mate-session/gsm-xsmp-server.c
index b908fb7..719d65c 100644
--- a/mate-session/gsm-xsmp-server.c
+++ b/mate-session/gsm-xsmp-server.c
@@ -529,7 +529,6 @@ update_iceauthority (GsmXsmpServer *server,
 return ok;
 }
 
-
 static void
 setup_listener (GsmXsmpServer *server)
 {
diff --git a/mate-session/gsm-xsmp-server.h b/mate-session/gsm-xsmp-server.h
index a82bc17..2e1f934 100644
--- a/mate-session/gsm-xsmp-server.h
+++ b/mate-session/gsm-xsmp-server.h
@@ -19,7 +19,6 @@
 *
 */
 
-
 #ifndef __GSM_XSMP_SERVER_H
 #define __GSM_XSMP_SERVER_H
 
diff --git a/mate-session/main.c b/mate-session/main.c
index 96c1092..68e3864 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -83,7 +83,6 @@ static gboolean failsafe = FALSE;
 static gboolean show_version = FALSE;
 static gboolean debug = FALSE;
 static gboolean disable_acceleration_check = FALSE;
-static char *gl_renderer = NULL;
 
 static gboolean
 initialize_gsettings (void)
@@ -575,7 +574,7 @@ static void set_overlay_scroll (void)
 }
 
 static gboolean
-check_gl (GError **error)
+check_gl (gchar **gl_renderer, GError **error)
 {
 int status;
 char *argv[] = { LIBEXECDIR "/mate-session-check-accelerated", NULL };
@@ -585,7 +584,7 @@ check_gl (GError **error)
 return TRUE;
 }
 
- if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, &gl_renderer, NULL,
+ if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, gl_renderer, NULL,
 &status, error)) {
 return FALSE;
 }
@@ -605,6 +604,7 @@ int main(int argc, char** argv)
 GSettings* accessibility_settings;
 MdmSignalHandler* signal_handler;
 static char** override_autostart_dirs = NULL;
+ char* gl_renderer = NULL;
 gboolean gl_failed = FALSE;
 
 static GOptionEntry entries[] = {
@@ -670,7 +670,7 @@ int main(int argc, char** argv)
 g_debug ("hardware acceleration check is disabled");
 } else {
 /* Check GL, if it doesn't work out then force software fallback */
- if (!check_gl (&error)) {
+ if (!check_gl (&gl_renderer, &error)) {
 gl_failed = TRUE;
 
 g_debug ("hardware acceleration check failed: %s",
@@ -678,7 +678,7 @@ int main(int argc, char** argv)
 g_clear_error (&error);
 if (g_getenv ("LIBGL_ALWAYS_SOFTWARE") == NULL) {
 g_setenv ("LIBGL_ALWAYS_SOFTWARE", "1", TRUE);
- if (!check_gl (&error)) {
+ if (!check_gl (&gl_renderer, &error)) {
 g_warning ("software acceleration check failed: %s",
 error? error->message : "");
 g_clear_error (&error);
diff --git a/mate-session/mdm-signal-handler.c b/mate-session/mdm-signal-handler.c
index b2b00ac..dd03087 100644
--- a/mate-session/mdm-signal-handler.c
+++ b/mate-session/mdm-signal-handler.c
@@ -233,7 +233,6 @@ static gboolean crashlogger_get_backtrace(void)
 return success;
 }
 
-
 static void mdm_signal_handler_backtrace(void)
 {
 struct stat s;
diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
index db5a153..ce47b72 100644
--- a/mate-session/msm-gnome.c
+++ b/mate-session/msm-gnome.c
@@ -47,7 +47,6 @@
 
 #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
 
-
 static gboolean gnome_compat_started = FALSE;
 static Window gnome_smproxy_window = None;
 
@@ -91,8 +90,6 @@ gnome_keyring_daemon_startup (void)
 g_child_watch_add (pid, gnome_keyring_daemon_finished, NULL);
 }
 
-
-
 static void
 msm_compat_gnome_smproxy_startup (void)
 {
@@ -129,7 +126,6 @@ msm_compat_gnome_smproxy_startup (void)
 gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
 }
 
-
 static void
 msm_compat_gnome_smproxy_shutdown (void)
 {
@@ -147,7 +143,6 @@ msm_compat_gnome_smproxy_shutdown (void)
 gdk_x11_display_error_trap_pop_ignored (gdkdisplay);
 }
 
-
 void
 msm_gnome_start (void)
 {
@@ -182,7 +177,6 @@ msm_gnome_start (void)
 g_object_unref (settings);
 }
 
-
 void
 msm_gnome_stop (void)
 {