diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-08-28 13:20:35 -0400 |
---|---|---|
committer | William Jon McCann <mccann@jhu.edu> | 2007-08-28 13:20:35 -0400 |
commit | b508cf9b49ecd1f4810f69e785ebf40a2e5d5677 (patch) | |
tree | 5b56738dce36bb75fdcefba0c6807cf8b20451d4 | |
parent | 1523b599eeba119c1258e887b7df9b018ce10351 (diff) |
untabify
-rw-r--r-- | src/ck-file-monitor-inotify.c | 2 | ||||
-rw-r--r-- | src/ck-manager.c | 16 | ||||
-rw-r--r-- | src/ck-session.c | 8 | ||||
-rw-r--r-- | src/ck-sysdeps-unix.c | 6 | ||||
-rw-r--r-- | src/main.c | 12 |
5 files changed, 22 insertions, 22 deletions
diff --git a/src/ck-file-monitor-inotify.c b/src/ck-file-monitor-inotify.c index 6e775e2..4fdd6aa 100644 --- a/src/ck-file-monitor-inotify.c +++ b/src/ck-file-monitor-inotify.c @@ -407,7 +407,7 @@ handle_inotify_event (CkFileMonitor *monitor, static gboolean inotify_data_pending (GIOChannel *source, - GIOCondition condition, + GIOCondition condition, CkFileMonitor *monitor) { int len; diff --git a/src/ck-manager.c b/src/ck-manager.c index 506249b..377cef0 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -54,11 +54,11 @@ #define CK_MANAGER_DBUS_NAME "org.freedesktop.ConsoleKit.Manager" #define CK_TYPE_PARAMETER_STRUCT (dbus_g_type_get_struct ("GValueArray", \ - G_TYPE_STRING, \ - G_TYPE_VALUE, \ - G_TYPE_INVALID)) + G_TYPE_STRING, \ + G_TYPE_VALUE, \ + G_TYPE_INVALID)) #define CK_TYPE_PARAMETER_LIST (dbus_g_type_get_collection ("GPtrArray", \ - CK_TYPE_PARAMETER_STRUCT)) + CK_TYPE_PARAMETER_STRUCT)) struct CkManagerPrivate { GHashTable *seats; @@ -516,13 +516,13 @@ _g_time_val_to_iso8601 (GTimeVal *time_) g_return_val_if_fail (time_->tv_usec >= 0 && time_->tv_usec < G_USEC_PER_SEC, NULL); -#define ISO_8601_LEN 21 +#define ISO_8601_LEN 21 #define ISO_8601_FORMAT "%Y-%m-%dT%H:%M:%SZ" retval = g_new0 (gchar, ISO_8601_LEN + 1); strftime (retval, ISO_8601_LEN, - ISO_8601_FORMAT, - gmtime (&(time_->tv_sec))); + ISO_8601_FORMAT, + gmtime (&(time_->tv_sec))); return retval; } @@ -696,7 +696,7 @@ typedef void (* CkAddParamFunc) (GPtrArray *arr, const char *value); static struct { - char *key; + char *key; CkAddParamFunc func; } parse_ops[] = { { "display-device", add_param_string }, diff --git a/src/ck-session.c b/src/ck-session.c index c4e286a..f136333 100644 --- a/src/ck-session.c +++ b/src/ck-session.c @@ -321,13 +321,13 @@ _g_time_val_to_iso8601 (GTimeVal *time_) g_return_val_if_fail (time_->tv_usec >= 0 && time_->tv_usec < G_USEC_PER_SEC, NULL); -#define ISO_8601_LEN 21 +#define ISO_8601_LEN 21 #define ISO_8601_FORMAT "%Y-%m-%dT%H:%M:%SZ" retval = g_new0 (gchar, ISO_8601_LEN + 1); strftime (retval, ISO_8601_LEN, - ISO_8601_FORMAT, - gmtime (&(time_->tv_sec))); + ISO_8601_FORMAT, + gmtime (&(time_->tv_sec))); return retval; } @@ -1103,7 +1103,7 @@ ck_session_new_with_parameters (const char *ssid, guint n_allocated_params; guint n_params; GObjectClass *class; - GType object_type; + GType object_type; object_type = CK_TYPE_SESSION; class = g_type_class_ref (object_type); diff --git a/src/ck-sysdeps-unix.c b/src/ck-sysdeps-unix.c index 2094e48..0001b6b 100644 --- a/src/ck-sysdeps-unix.c +++ b/src/ck-sysdeps-unix.c @@ -126,7 +126,7 @@ ck_fd_is_a_console (int fd) #ifdef __linux__ char arg = 0; #elif defined(__FreeBSD__) - int vers; + int vers; #endif int kb_ok; @@ -134,7 +134,7 @@ ck_fd_is_a_console (int fd) kb_ok = (ioctl (fd, KDGKBTYPE, &arg) == 0 && ((arg == KB_101) || (arg == KB_84))); #elif defined(__FreeBSD__) - kb_ok = (ioctl (fd, CONS_GETVERS, &vers) == 0); + kb_ok = (ioctl (fd, CONS_GETVERS, &vers) == 0); #else kb_ok = 1; #endif @@ -170,7 +170,7 @@ ck_get_a_console_fd (void) fd = -1; #ifdef __sun - /* On Solaris, first try Sun VT device. */ + /* On Solaris, first try Sun VT device. */ fd = open_a_console ("/dev/vt/active"); if (fd >= 0) { goto done; @@ -50,8 +50,8 @@ static void bus_proxy_destroyed_cb (DBusGProxy *bus_proxy, static gboolean timed_exit_cb (GMainLoop *loop) { - g_main_loop_quit (loop); - return FALSE; + g_main_loop_quit (loop); + return FALSE; } static DBusGProxy * @@ -59,7 +59,7 @@ get_bus_proxy (DBusGConnection *connection) { DBusGProxy *bus_proxy; - bus_proxy = dbus_g_proxy_new_for_name (connection, + bus_proxy = dbus_g_proxy_new_for_name (connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); @@ -81,7 +81,7 @@ acquire_name_on_proxy (DBusGProxy *bus_proxy) } error = NULL; - res = dbus_g_proxy_call (bus_proxy, + res = dbus_g_proxy_call (bus_proxy, "RequestName", &error, G_TYPE_STRING, CK_DBUS_NAME, @@ -97,9 +97,9 @@ acquire_name_on_proxy (DBusGProxy *bus_proxy) g_warning ("Failed to acquire %s", CK_DBUS_NAME); } goto out; - } + } - if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { + if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { if (error != NULL) { g_warning ("Failed to acquire %s: %s", CK_DBUS_NAME, error->message); g_error_free (error); |