M src/launcher/xsettings-client.c → src/launcher/xsettings-client.c

@@ -169,13 +169,13 @@ }
 
 static XSettingsResult fetch_card8 (XSettingsBuffer *buffer, CARD8 *result)
 {
-  if (BYTES_LEFT (buffer) < 1)
-    return XSETTINGS_ACCESS;
+	if (BYTES_LEFT (buffer) < 1)
+		return XSETTINGS_ACCESS;
 
-  *result = *(CARD8 *)buffer->pos;
-  buffer->pos += 1;
+	*result = *(CARD8 *)buffer->pos;
+	buffer->pos += 1;
 
-  return XSETTINGS_SUCCESS;
+	return XSETTINGS_SUCCESS;
 }
 
 #define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))

M src/launcher/xsettings-common.c → src/launcher/xsettings-common.c

@@ -15,7 +15,7 @@ * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT
  * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author:  Owen Taylor, Red Hat, Inc.
@@ -31,238 +31,238 @@ 
 XSettingsSetting *
 xsettings_setting_copy (XSettingsSetting *setting)
 {
-  XSettingsSetting *result;
-  size_t str_len;
-  
-  result = malloc (sizeof *result);
-  if (!result)
-    return NULL;
+	XSettingsSetting *result;
+	size_t str_len;
+
+	result = malloc (sizeof *result);
+	if (!result)
+		return NULL;
+
+	str_len = strlen (setting->name);
+	result->name = malloc (str_len + 1);
+	if (!result->name)
+		goto err;
 
-  str_len = strlen (setting->name);
-  result->name = malloc (str_len + 1);
-  if (!result->name)
-    goto err;
+	memcpy (result->name, setting->name, str_len + 1);
 
-  memcpy (result->name, setting->name, str_len + 1);
+	result->type = setting->type;
 
-  result->type = setting->type;
+	switch (setting->type)
+	{
+	case XSETTINGS_TYPE_INT:
+		result->data.v_int = setting->data.v_int;
+		break;
+	case XSETTINGS_TYPE_COLOR:
+		result->data.v_color = setting->data.v_color;
+		break;
+	case XSETTINGS_TYPE_STRING:
+		str_len = strlen (setting->data.v_string);
+		result->data.v_string = malloc (str_len + 1);
+		if (!result->data.v_string)
+			goto err;
 
-  switch (setting->type)
-    {
-    case XSETTINGS_TYPE_INT:
-      result->data.v_int = setting->data.v_int;
-      break;
-    case XSETTINGS_TYPE_COLOR:
-      result->data.v_color = setting->data.v_color;
-      break;
-    case XSETTINGS_TYPE_STRING:
-      str_len = strlen (setting->data.v_string);
-      result->data.v_string = malloc (str_len + 1);
-      if (!result->data.v_string)
-	goto err;
+		memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
+		break;
+	default:
+		break;
+	}
 
-      memcpy (result->data.v_string, setting->data.v_string, str_len + 1);
-      break;
-      default:
-      break;      
-    }
+	result->last_change_serial = setting->last_change_serial;
 
-  result->last_change_serial = setting->last_change_serial;
+	return result;
 
-  return result;
+err:
+	if (result->name)
+		free (result->name);
+	free (result);
 
- err:
-  if (result->name)
-    free (result->name);
-  free (result);
-  
-  return NULL;
+	return NULL;
 }
 
 XSettingsList *
 xsettings_list_copy (XSettingsList *list)
 {
-  XSettingsList *new = NULL;
-  XSettingsList *old_iter = list;
-  XSettingsList *new_iter = NULL;
+	XSettingsList *new = NULL;
+	XSettingsList *old_iter = list;
+	XSettingsList *new_iter = NULL;
 
-  while (old_iter)
-    {
-      XSettingsList *new_node;
+	while (old_iter)
+	{
+		XSettingsList *new_node;
 
-      new_node = malloc (sizeof *new_node);
-      if (!new_node)
-	goto error;
+		new_node = malloc (sizeof *new_node);
+		if (!new_node)
+			goto error;
 
-      new_node->setting = xsettings_setting_copy (old_iter->setting);
-      if (!new_node->setting)
-	{
-	  free (new_node);
-	  goto error;
-	}
+		new_node->setting = xsettings_setting_copy (old_iter->setting);
+		if (!new_node->setting)
+		{
+			free (new_node);
+			goto error;
+		}
 
-      if (new_iter)
-	new_iter->next = new_node;
-      else
-	new = new_node;
+		if (new_iter)
+			new_iter->next = new_node;
+		else
+			new = new_node;
 
-      new_iter = new_node;
-      
-      old_iter = old_iter->next;
-    }
+		new_iter = new_node;
 
-  return new;
+		old_iter = old_iter->next;
+	}
 
- error:
-  xsettings_list_free (new);
-  return NULL;
+	return new;
+
+error:
+	xsettings_list_free (new);
+	return NULL;
 }
 
 int
 xsettings_setting_equal (XSettingsSetting *setting_a,
-			 XSettingsSetting *setting_b)
+						 XSettingsSetting *setting_b)
 {
-  if (setting_a->type != setting_b->type)
-    return 0;
+	if (setting_a->type != setting_b->type)
+		return 0;
 
-  if (strcmp (setting_a->name, setting_b->name) != 0)
-    return 0;
+	if (strcmp (setting_a->name, setting_b->name) != 0)
+		return 0;
 
-  switch (setting_a->type)
-    {
-    case XSETTINGS_TYPE_INT:
-      return setting_a->data.v_int == setting_b->data.v_int;
-    case XSETTINGS_TYPE_COLOR:
-      return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
-	      setting_a->data.v_color.green == setting_b->data.v_color.green &&
-	      setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
-	      setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
-    case XSETTINGS_TYPE_STRING:
-      return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
-    default:
-      break;      
-    }
+	switch (setting_a->type)
+	{
+	case XSETTINGS_TYPE_INT:
+		return setting_a->data.v_int == setting_b->data.v_int;
+	case XSETTINGS_TYPE_COLOR:
+		return (setting_a->data.v_color.red == setting_b->data.v_color.red &&
+				setting_a->data.v_color.green == setting_b->data.v_color.green &&
+				setting_a->data.v_color.blue == setting_b->data.v_color.blue &&
+				setting_a->data.v_color.alpha == setting_b->data.v_color.alpha);
+	case XSETTINGS_TYPE_STRING:
+		return strcmp (setting_a->data.v_string, setting_b->data.v_string) == 0;
+	default:
+		break;
+	}
 
-  return 0;
+	return 0;
 }
 
 void
 xsettings_setting_free (XSettingsSetting *setting)
 {
-  if (setting->type == XSETTINGS_TYPE_STRING)
-    free (setting->data.v_string);
+	if (setting->type == XSETTINGS_TYPE_STRING)
+		free (setting->data.v_string);
 
-  if (setting->name)
-    free (setting->name);
-  
-  free (setting);
+	if (setting->name)
+		free (setting->name);
+
+	free (setting);
 }
 
 void
 xsettings_list_free (XSettingsList *list)
 {
-  while (list)
-    {
-      XSettingsList *next = list->next;
+	while (list)
+	{
+		XSettingsList *next = list->next;
 
-      xsettings_setting_free (list->setting);
-      free (list);
+		xsettings_setting_free (list->setting);
+		free (list);
 
-      list = next;
-    }
+		list = next;
+	}
 }
 
 XSettingsResult
 xsettings_list_insert (XSettingsList    **list,
-		       XSettingsSetting  *setting)
+					   XSettingsSetting  *setting)
 {
-  XSettingsList *node;
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
-
-  node = malloc (sizeof *node);
-  if (!node)
-    return XSETTINGS_NO_MEM;
-  node->setting = setting;
+	XSettingsList *node;
+	XSettingsList *iter;
+	XSettingsList *last = NULL;
 
-  iter = *list;
-  while (iter)
-    {
-      int cmp = strcmp (setting->name, iter->setting->name);
+	node = malloc (sizeof *node);
+	if (!node)
+		return XSETTINGS_NO_MEM;
+	node->setting = setting;
 
-      if (cmp < 0)
-	break;
-      else if (cmp == 0)
+	iter = *list;
+	while (iter)
 	{
-	  free (node);
-	  return XSETTINGS_DUPLICATE_ENTRY;
+		int cmp = strcmp (setting->name, iter->setting->name);
+
+		if (cmp < 0)
+			break;
+		else if (cmp == 0)
+		{
+			free (node);
+			return XSETTINGS_DUPLICATE_ENTRY;
+		}
+
+		last = iter;
+		iter = iter->next;
 	}
 
-      last = iter;
-      iter = iter->next;
-    }
-  
-  if (last)
-    last->next = node;
-  else
-    *list = node;
-  
-  node->next = iter;
-  
-  return XSETTINGS_SUCCESS;
+	if (last)
+		last->next = node;
+	else
+		*list = node;
+
+	node->next = iter;
+
+	return XSETTINGS_SUCCESS;
 }
 
 XSettingsResult
 xsettings_list_delete (XSettingsList **list,
-		       const char     *name)
+					   const char     *name)
 {
-  XSettingsList *iter;
-  XSettingsList *last = NULL;
+	XSettingsList *iter;
+	XSettingsList *last = NULL;
 
-  iter = *list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
+	iter = *list;
+	while (iter)
 	{
-	  if (last)
-	    last->next = iter->next;
-	  else
-	    *list = iter->next;
-  
-	  xsettings_setting_free (iter->setting);
-	  free (iter);
+		if (strcmp (name, iter->setting->name) == 0)
+		{
+			if (last)
+				last->next = iter->next;
+			else
+				*list = iter->next;
 
-	  return XSETTINGS_SUCCESS;
-	}
+			xsettings_setting_free (iter->setting);
+			free (iter);
 
-      last = iter;
-      iter = iter->next;
-    }
+			return XSETTINGS_SUCCESS;
+		}
 
-  return XSETTINGS_FAILED;
+		last = iter;
+		iter = iter->next;
+	}
+
+	return XSETTINGS_FAILED;
 }
 
 XSettingsSetting *
 xsettings_list_lookup (XSettingsList *list,
-		       const char    *name)
+					   const char    *name)
 {
-  XSettingsList *iter;
+	XSettingsList *iter;
 
-  iter = list;
-  while (iter)
-    {
-      if (strcmp (name, iter->setting->name) == 0)
-	return iter->setting;
+	iter = list;
+	while (iter)
+	{
+		if (strcmp (name, iter->setting->name) == 0)
+			return iter->setting;
 
-      iter = iter->next;
-    }
+		iter = iter->next;
+	}
 
-  return NULL;
+	return NULL;
 }
 
 char
 xsettings_byte_order (void)
 {
-  CARD32 myint = 0x01020304;
-  return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
+	CARD32 myint = 0x01020304;
+	return (*(char *)&myint == 1) ? MSBFirst : LSBFirst;
 }

M src/tint2conf/main.c → src/tint2conf/main.c

@@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 **************************************************************************/
 
 #ifdef HAVE_VERSION_H
-  #include "version.h"
+#include "version.h"
 #endif
 #include "main.h"
 #include "common.h"
@@ -368,7 +368,7 @@ g_free(g_default_theme);
 	if (g_cmd_property)
 		g_free(g_cmd_property);
 
-   gtk_main_quit ();
+	gtk_main_quit ();
 }