[gnome-session] whitespace clean up
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-session] whitespace clean up
- Date: Fri, 12 Dec 2014 15:36:19 +0000 (UTC)
commit d8428e2bb6b53c240cadae5b1a9a68ba2daef01f
Author: Ray Strode <rstrode redhat com>
Date: Fri Dec 12 10:23:55 2014 -0500
whitespace clean up
Removes tabs everywhere
gnome-session/gsm-app.c | 4 +-
gnome-session/gsm-consolekit.c | 116 ++++++++++++++++----------------
gnome-session/gsm-fail-whale-dialog.c | 2 +-
gnome-session/gsm-manager.c | 42 ++++++------
gnome-session/gsm-presence.c | 2 +-
gnome-session/gsm-session-save.c | 2 +-
gnome-session/gsm-xsmp-client.c | 8 +-
gnome-session/main.c | 2 +-
8 files changed, 89 insertions(+), 89 deletions(-)
---
diff --git a/gnome-session/gsm-app.c b/gnome-session/gsm-app.c
index 1d4b4ff..d056597 100644
--- a/gnome-session/gsm-app.c
+++ b/gnome-session/gsm-app.c
@@ -93,8 +93,8 @@ gsm_app_get_app_id (GsmExportedApp *skeleton,
static gboolean
gsm_app_get_startup_id (GsmExportedApp *skeleton,
- GDBusMethodInvocation *invocation,
- GsmApp *app)
+ GDBusMethodInvocation *invocation,
+ GsmApp *app)
{
const gchar *id;
diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
index 62fa592..4de5c1e 100644
--- a/gnome-session/gsm-consolekit.c
+++ b/gnome-session/gsm-consolekit.c
@@ -271,7 +271,7 @@ gsm_consolekit_ensure_ck_connection (GsmConsolekit *manager,
is_connected = FALSE;
goto out;
}
- }
+ }
pid = getpid ();
ret = dbus_g_proxy_call (manager->priv->ck_proxy, "GetSessionForUnixProcess", &connection_error,
@@ -804,7 +804,7 @@ gsm_consolekit_can_restart (GsmSystem *system)
{
GsmConsolekit *manager = GSM_CONSOLEKIT (system);
gboolean res;
- gboolean can_restart;
+ gboolean can_restart;
GError *error;
error = NULL;
@@ -831,7 +831,7 @@ gsm_consolekit_can_restart (GsmSystem *system)
return FALSE;
}
- return can_restart;
+ return can_restart;
}
static gboolean
@@ -839,7 +839,7 @@ gsm_consolekit_can_stop (GsmSystem *system)
{
GsmConsolekit *manager = GSM_CONSOLEKIT (system);
gboolean res;
- gboolean can_stop;
+ gboolean can_stop;
GError *error;
error = NULL;
@@ -865,74 +865,74 @@ gsm_consolekit_can_stop (GsmSystem *system)
g_error_free (error);
return FALSE;
}
- return can_stop;
+ return can_stop;
}
static gchar *
gsm_consolekit_get_current_session_type (GsmConsolekit *manager)
{
GError *gerror;
- DBusConnection *connection;
- DBusError error;
- DBusMessage *message = NULL;
- DBusMessage *reply = NULL;
- gchar *session_id;
- gchar *ret;
- DBusMessageIter iter;
- const char *value;
-
- session_id = NULL;
- ret = NULL;
+ DBusConnection *connection;
+ DBusError error;
+ DBusMessage *message = NULL;
+ DBusMessage *reply = NULL;
+ gchar *session_id;
+ gchar *ret;
+ DBusMessageIter iter;
+ const char *value;
+
+ session_id = NULL;
+ ret = NULL;
gerror = NULL;
if (!gsm_consolekit_ensure_ck_connection (manager, &gerror)) {
g_warning ("Could not connect to ConsoleKit: %s",
gerror->message);
g_error_free (gerror);
- goto out;
+ goto out;
+ }
+
+ connection = dbus_g_connection_get_connection (manager->priv->dbus_connection);
+ if (!get_current_session_id (connection, &session_id)) {
+ goto out;
+ }
+
+ dbus_error_init (&error);
+ message = dbus_message_new_method_call (CK_NAME,
+ session_id,
+ CK_SESSION_INTERFACE,
+ "GetSessionType");
+ if (message == NULL) {
+ goto out;
}
- connection = dbus_g_connection_get_connection (manager->priv->dbus_connection);
- if (!get_current_session_id (connection, &session_id)) {
- goto out;
- }
-
- dbus_error_init (&error);
- message = dbus_message_new_method_call (CK_NAME,
- session_id,
- CK_SESSION_INTERFACE,
- "GetSessionType");
- if (message == NULL) {
- goto out;
- }
-
- reply = dbus_connection_send_with_reply_and_block (connection,
- message,
- -1,
- &error);
-
- if (reply == NULL) {
- if (dbus_error_is_set (&error)) {
- g_warning ("Unable to determine session type: %s", error.message);
- dbus_error_free (&error);
- }
- goto out;
- }
-
- dbus_message_iter_init (reply, &iter);
- dbus_message_iter_get_basic (&iter, &value);
- ret = g_strdup (value);
+ reply = dbus_connection_send_with_reply_and_block (connection,
+ message,
+ -1,
+ &error);
+
+ if (reply == NULL) {
+ if (dbus_error_is_set (&error)) {
+ g_warning ("Unable to determine session type: %s", error.message);
+ dbus_error_free (&error);
+ }
+ goto out;
+ }
+
+ dbus_message_iter_init (reply, &iter);
+ dbus_message_iter_get_basic (&iter, &value);
+ ret = g_strdup (value);
out:
- if (message != NULL) {
- dbus_message_unref (message);
- }
- if (reply != NULL) {
- dbus_message_unref (reply);
- }
- g_free (session_id);
-
- return ret;
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+ g_free (session_id);
+
+ return ret;
}
static gboolean
diff --git a/gnome-session/gsm-fail-whale-dialog.c b/gnome-session/gsm-fail-whale-dialog.c
index bc5aa8d..e484048 100644
--- a/gnome-session/gsm-fail-whale-dialog.c
+++ b/gnome-session/gsm-fail-whale-dialog.c
@@ -16,7 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors:
- * Colin Walters <walters verbum org>
+ * Colin Walters <walters verbum org>
*/
#include <config.h>
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 72b4379..1e6841e 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -1711,7 +1711,7 @@ gsm_manager_get_failsafe (GsmManager *manager)
{
g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
- return manager->priv->failsafe;
+ return manager->priv->failsafe;
}
static void
@@ -2506,40 +2506,40 @@ gsm_manager_setenv (GsmExportedManager *skeleton,
static gboolean
is_valid_category (int category)
{
- int categories[] = {
- LC_CTYPE,
- LC_NUMERIC,
- LC_TIME,
- LC_COLLATE,
- LC_MONETARY,
- LC_MESSAGES,
+ int categories[] = {
+ LC_CTYPE,
+ LC_NUMERIC,
+ LC_TIME,
+ LC_COLLATE,
+ LC_MONETARY,
+ LC_MESSAGES,
#if defined (LC_PAPER)
- LC_PAPER,
+ LC_PAPER,
#endif
#if defined (LC_NAME)
- LC_NAME,
+ LC_NAME,
#endif
#if defined (LC_ADDRESS)
- LC_ADDRESS,
+ LC_ADDRESS,
#endif
#if defined (LC_TELEPHONE)
- LC_TELEPHONE,
+ LC_TELEPHONE,
#endif
#if defined (LC_MEASUREMENT)
- LC_MEASUREMENT,
+ LC_MEASUREMENT,
#endif
#if defined (LC_IDENTIFICATION)
- LC_IDENTIFICATION,
+ LC_IDENTIFICATION,
#endif
- LC_ALL
- };
- guint i;
+ LC_ALL
+ };
+ guint i;
- for (i = 0; i < G_N_ELEMENTS(categories); i++)
- if (categories[i] == category)
- return TRUE;
+ for (i = 0; i < G_N_ELEMENTS(categories); i++)
+ if (categories[i] == category)
+ return TRUE;
- return FALSE;
+ return FALSE;
}
static gboolean
diff --git a/gnome-session/gsm-presence.c b/gnome-session/gsm-presence.c
index d796e0a..fa476ab 100644
--- a/gnome-session/gsm-presence.c
+++ b/gnome-session/gsm-presence.c
@@ -112,7 +112,7 @@ gsm_presence_set_status_text (GsmPresence *presence,
g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE);
g_free (presence->priv->status_text);
- presence->priv->status_text = NULL;
+ presence->priv->status_text = NULL;
/* check length */
if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) {
diff --git a/gnome-session/gsm-session-save.c b/gnome-session/gsm-session-save.c
index 025eeea..4a2735f 100644
--- a/gnome-session/gsm-session-save.c
+++ b/gnome-session/gsm-session-save.c
@@ -270,5 +270,5 @@ gsm_session_save_clear (void)
return;
}
- gsm_session_clear_saved_session (save_dir, NULL);
+ gsm_session_clear_saved_session (save_dir, NULL);
}
diff --git a/gnome-session/gsm-xsmp-client.c b/gnome-session/gsm-xsmp-client.c
index c256acb..9358f94 100644
--- a/gnome-session/gsm-xsmp-client.c
+++ b/gnome-session/gsm-xsmp-client.c
@@ -1249,10 +1249,10 @@ save_yourself_done_callback (SmsConn conn,
client->priv->description,
success ? "True" : "False");
- if (client->priv->current_save_yourself != -1) {
- SmsSaveComplete (client->priv->conn);
- client->priv->current_save_yourself = -1;
- }
+ if (client->priv->current_save_yourself != -1) {
+ SmsSaveComplete (client->priv->conn);
+ client->priv->current_save_yourself = -1;
+ }
/* If success is false then the application couldn't save data. Nothing
* the session manager can do about, though. FIXME: we could display a
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 3404c3b..d868e8a 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -192,7 +192,7 @@ require_dbus_session (int argc,
new_argv[1] = "--exit-with-session";
for (i = 0; i < argc; i++) {
new_argv[i + 2] = argv[i];
- }
+ }
new_argv[i + 2] = NULL;
if (!execvp ("dbus-launch", new_argv)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]