Coding style and whitespace cleanup.

2 files changed, 13 insertions, 10 deletions

diff --git a/smclient/eggsmclient-win32.c b/smclient/eggsmclient-win32.c
index caa06d8a2e..b404a490cc 100644
--- a/smclient/eggsmclient-win32.c
+++ b/smclient/eggsmclient-win32.c
@@ -60,9 +60,9 @@
 
 #define EGG_TYPE_SM_CLIENT_WIN32            (egg_sm_client_win32_get_type ())
 #define EGG_SM_CLIENT_WIN32(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32))
-#define EGG_SM_CLIENT_WIN32_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32Class))
+#define EGG_SM_CLIENT_WIN32_CLASS(cls)    (G_TYPE_CHECK_CLASS_CAST ((cls), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32Class))
 #define EGG_IS_SM_CLIENT_WIN32(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_SM_CLIENT_WIN32))
-#define EGG_IS_SM_CLIENT_WIN32_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_SM_CLIENT_WIN32))
+#define EGG_IS_SM_CLIENT_WIN32_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE ((cls), EGG_TYPE_SM_CLIENT_WIN32))
 #define EGG_SM_CLIENT_WIN32_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_SM_CLIENT_WIN32, EggSMClientWin32Class))
 
 typedef struct _EggSMClientWin32        EggSMClientWin32;
@@ -105,9 +105,9 @@ egg_sm_client_win32_init (EggSMClientWin32 *win32)
 }
 
 static void
-egg_sm_client_win32_class_init (EggSMClientWin32Class *klass)
+egg_sm_client_win32_class_init (EggSMClientWin32Class *class)
 {
-  EggSMClientClass *sm_client_class = EGG_SM_CLIENT_CLASS (klass);
+  EggSMClientClass *sm_client_class = EGG_SM_CLIENT_CLASS (class);
 
   sm_client_class->startup             = sm_client_win32_startup;
   sm_client_class->will_quit           = sm_client_win32_will_quit;
diff --git a/smclient/eggsmclient.c b/smclient/eggsmclient.c
index 91720c2832..a704ead6ce 100644
--- a/smclient/eggsmclient.c
+++ b/smclient/eggsmclient.c
@@ -46,6 +46,10 @@ struct _EggSMClientPrivate {
   GKeyFile *state_file;
 };
 
+#define EGG_SM_CLIENT_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), EGG_TYPE_SM_CLIENT, EggSMClientPrivate))
+
 G_DEFINE_TYPE (EggSMClient, egg_sm_client, G_TYPE_OBJECT)
 
 static EggSMClient *global_client;
@@ -54,16 +58,15 @@ static EggSMClientMode global_client_mode = EGG_SM_CLIENT_MODE_NORMAL;
 static void
 egg_sm_client_init (EggSMClient *client)
 {
-	client->priv = G_TYPE_INSTANCE_GET_PRIVATE (
-		client, EGG_TYPE_SM_CLIENT, EggSMClientPrivate);
+	client->priv = EGG_SM_CLIENT_GET_PRIVATE (client);
 }
 
 static void
-egg_sm_client_class_init (EggSMClientClass *klass)
+egg_sm_client_class_init (EggSMClientClass *class)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-  g_type_class_add_private (klass, sizeof (EggSMClientPrivate));
+  g_type_class_add_private (class, sizeof (EggSMClientPrivate));
 
   /**
    * EggSMClient::save_state:
@@ -391,7 +394,7 @@ egg_sm_client_is_resumed (EggSMClient *client)
 GKeyFile *
 egg_sm_client_get_state_file (EggSMClient *client)
 {
-  EggSMClientPrivate *priv = client->priv;
+  EggSMClientPrivate *priv = EGG_SM_CLIENT_GET_PRIVATE (client);
   gchar *state_file_path;
   GError *err = NULL;