summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capplet/gsp-keyfile.c2
-rw-r--r--egg/eggsmclient.c2
-rw-r--r--mate-session/gsm-manager.c22
-rw-r--r--mate-session/gsm-manager.h2
-rw-r--r--mate-session/gsm-systemd.c30
-rw-r--r--mate-session/gsm-xsmp-server.c2
-rw-r--r--mate-session/main.c2
7 files changed, 31 insertions, 31 deletions
diff --git a/capplet/gsp-keyfile.c b/capplet/gsp-keyfile.c
index 74ce4a9..2fbf2b5 100644
--- a/capplet/gsp-keyfile.c
+++ b/capplet/gsp-keyfile.c
@@ -112,7 +112,7 @@ gsp_key_file_set_locale_string (GKeyFile *keyfile,
for (i = 0; langs_pointer[i] != NULL; i++) {
/* find first without encoding */
if (strchr (langs_pointer[i], '.') == NULL) {
- locale = langs_pointer[i];
+ locale = langs_pointer[i];
break;
}
}
diff --git a/egg/eggsmclient.c b/egg/eggsmclient.c
index 2d278df..7100897 100644
--- a/egg/eggsmclient.c
+++ b/egg/eggsmclient.c
@@ -112,7 +112,7 @@ egg_sm_client_class_init (EggSMClientClass *klass)
* handling this signal; if the user has requested that the session
* be saved when logging out, then ::save_state will be emitted
* separately.
- *
+ *
* If the application agrees to quit, it should then wait for either
* the ::quit_cancelled or ::quit signals to be emitted.
**/
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
index c9c4e29..5ce5158 100644
--- a/mate-session/gsm-manager.c
+++ b/mate-session/gsm-manager.c
@@ -708,7 +708,7 @@ _start_app (const char *id,
delay = gsm_app_peek_autostart_delay (app);
if (delay > 0) {
- g_timeout_add_seconds (delay,
+ g_timeout_add_seconds (delay,
(GSourceFunc)_autostart_delay_timeout,
g_object_ref (app));
g_debug ("GsmManager: %s is scheduled to start in %d seconds", id, delay);
@@ -1168,12 +1168,12 @@ manager_switch_user (GsmManager *manager)
command = g_strdup_printf ("%s %s",
GDM_FLEXISERVER_COMMAND,
GDM_FLEXISERVER_ARGS);
-
+
error = NULL;
res = g_spawn_command_line_sync (command, NULL, NULL, NULL, &error);
g_free (command);
-
+
if (! res) {
g_debug ("GsmManager: Unable to start GDM greeter: %s", error->message);
g_error_free (error);
@@ -3554,9 +3554,9 @@ gsm_manager_request_shutdown (GsmManager *manager,
{
GsmManagerPrivate *priv;
g_debug ("GsmManager: RequestShutdown called");
-
+
g_return_val_if_fail(GSM_IS_MANAGER (manager), FALSE);
-
+
priv = gsm_manager_get_instance_private (manager);
if (priv->phase != GSM_MANAGER_PHASE_RUNNING) {
g_set_error (error,
@@ -3565,9 +3565,9 @@ gsm_manager_request_shutdown (GsmManager *manager,
"RequestShutdown interface is only available during the Running phase");
return FALSE;
}
-
+
request_shutdown (manager);
-
+
return TRUE;
}
@@ -3578,9 +3578,9 @@ gsm_manager_request_reboot (GsmManager *manager,
GsmManagerPrivate *priv;
g_debug ("GsmManager: RequestReboot called");
-
+
g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
-
+
priv = gsm_manager_get_instance_private (manager);
if (priv->phase != GSM_MANAGER_PHASE_RUNNING) {
g_set_error (error,
@@ -3589,9 +3589,9 @@ gsm_manager_request_reboot (GsmManager *manager,
"RequestReboot interface is only available during the running phase");
return FALSE;
}
-
+
request_reboot (manager);
-
+
return TRUE;
}
diff --git a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
index 0c07a2f..36575ee 100644
--- a/mate-session/gsm-manager.h
+++ b/mate-session/gsm-manager.h
@@ -142,7 +142,7 @@ gboolean gsm_manager_request_shutdown (GsmManager *
gboolean gsm_manager_request_reboot (GsmManager *manager,
GError **error);
-
+
gboolean gsm_manager_shutdown (GsmManager *manager,
GError **error);
diff --git a/mate-session/gsm-systemd.c b/mate-session/gsm-systemd.c
index d03cafd..ac37d41 100644
--- a/mate-session/gsm-systemd.c
+++ b/mate-session/gsm-systemd.c
@@ -836,17 +836,17 @@ gsm_systemd_can_hibernate (GsmSystemd *manager)
gboolean can_hibernate;
GError *error;
GsmSystemdPrivate *priv;
-
+
error = NULL;
priv = gsm_systemd_get_instance_private (manager);
-
+
if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
g_warning ("Could not connect to Systemd: %s",
error->message);
g_error_free (error);
return FALSE;
}
-
+
res = dbus_g_proxy_call_with_timeout (priv->sd_proxy,
"CanHibernate",
INT_MAX,
@@ -860,7 +860,7 @@ gsm_systemd_can_hibernate (GsmSystemd *manager)
g_error_free (error);
return FALSE;
}
-
+
can_hibernate = g_strcmp0 (value, "yes") == 0 ||
g_strcmp0 (value, "challenge") == 0;
g_free (value);
@@ -875,17 +875,17 @@ gsm_systemd_can_suspend (GsmSystemd *manager)
gboolean can_suspend;
GError *error;
GsmSystemdPrivate *priv;
-
+
error = NULL;
priv = gsm_systemd_get_instance_private (manager);
-
+
if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
g_warning ("Could not connect to Systemd: %s",
error->message);
g_error_free (error);
return FALSE;
}
-
+
res = dbus_g_proxy_call_with_timeout (priv->sd_proxy,
"CanSuspend",
INT_MAX,
@@ -899,7 +899,7 @@ gsm_systemd_can_suspend (GsmSystemd *manager)
g_error_free (error);
return FALSE;
}
-
+
can_suspend = g_strcmp0 (value, "yes") == 0 ||
g_strcmp0 (value, "challenge") == 0;
g_free (value);
@@ -912,17 +912,17 @@ gsm_systemd_attempt_hibernate (GsmSystemd *manager)
gboolean res;
GError *error;
GsmSystemdPrivate *priv;
-
+
error = NULL;
priv = gsm_systemd_get_instance_private (manager);
-
+
if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
g_warning ("Could not connect to Systemd: %s",
error->message);
g_error_free (error);
return;
}
-
+
res = dbus_g_proxy_call_with_timeout (priv->sd_proxy,
"Hibernate",
INT_MAX,
@@ -936,7 +936,7 @@ gsm_systemd_attempt_hibernate (GsmSystemd *manager)
g_error_free (error);
return;
}
-
+
}
void
@@ -945,17 +945,17 @@ gsm_systemd_attempt_suspend (GsmSystemd *manager)
gboolean res;
GError *error;
GsmSystemdPrivate *priv;
-
+
error = NULL;
priv = gsm_systemd_get_instance_private (manager);
-
+
if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
g_warning ("Could not connect to Systemd: %s",
error->message);
g_error_free (error);
return;
}
-
+
res = dbus_g_proxy_call_with_timeout (priv->sd_proxy,
"Suspend",
INT_MAX,
diff --git a/mate-session/gsm-xsmp-server.c b/mate-session/gsm-xsmp-server.c
index 293ed7a..bb6f20e 100644
--- a/mate-session/gsm-xsmp-server.c
+++ b/mate-session/gsm-xsmp-server.c
@@ -697,7 +697,7 @@ gsm_xsmp_server_finalize (GObject *object)
xsmp_server = GSM_XSMP_SERVER (object);
- IceFreeListenObjs (xsmp_server->num_xsmp_sockets,
+ IceFreeListenObjs (xsmp_server->num_xsmp_sockets,
xsmp_server->xsmp_sockets);
if (xsmp_server->client_store != NULL) {
diff --git a/mate-session/main.c b/mate-session/main.c
index 2b1f012..56795ac 100644
--- a/mate-session/main.c
+++ b/mate-session/main.c
@@ -105,7 +105,7 @@ initialize_gsettings (void)
return ret;
}
-
+
static void on_bus_name_lost(DBusGProxy* bus_proxy, const char* name, gpointer data)
{
g_warning("Lost name on bus: %s, exiting", name);