[evolution/webkit: 38/134] Coding style cleanup

[Dan VrÃtil <dvratil src gnome org>]

commit f8e1773e71e21b5f750ea221825fa6afae9b4540
Author: Dan VrÃtil <dvratil redhat com>
Date:   Thu Sep 22 10:21:52 2011 +0200

    Coding style cleanup
    
    The rebase has caused padding of multiline function definitions to
    have bad padding.

 em-format/em-format-quote.c |   11 ++-
 em-format/em-format.c       |   62 +++++++-------
 em-format/em-format.h       |  200 +++++++++++++++++++++----------------------
 3 files changed, 134 insertions(+), 139 deletions(-)
---
diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c
index 89e4ed7..1aee811 100644
--- a/em-format/em-format-quote.c
+++ b/em-format/em-format-quote.c
@@ -61,7 +61,8 @@ static gpointer parent_class;
 /* Decodes inline encoded parts of 'part'. The returned pointer,
  * if not NULL, should be unreffed with g_object_unref(). */
 static CamelMimePart *
-decode_inline_parts (CamelMimePart *part, GCancellable *cancellable)
+decode_inline_parts (CamelMimePart *part,
+		     GCancellable *cancellable)
 {
 	CamelMultipart *mp;
 	CamelStream *null;
@@ -650,9 +651,9 @@ emfq_write_message_rfc822 (EMFormat *emf,
 
 static void
 emfq_write_text_plain (EMFormat *emf,
-					   EMFormatPURI *puri,
-					   CamelStream *stream,
-					   GCancellable *cancellable)
+		       EMFormatPURI *puri,
+		       CamelStream *stream,
+		       GCancellable *cancellable)
 {
 	EMFormatQuote *emfq = EM_FORMAT_QUOTE (emf);
 	CamelStream *filtered_stream;
@@ -713,7 +714,7 @@ emfq_write_text_plain (EMFormat *emf,
 
 static void
 emfq_write_text_enriched (EMFormat *emf,
-						  EMFormatPURI *puri,
+			  EMFormatPURI *puri,
                     	  CamelStream *stream,
                     	  GCancellable *cancellable)
 {
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 169cd81..d6b83b7 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -118,7 +118,7 @@ preserve_charset_in_content_type (CamelMimePart *ipart,
 
 static CamelMimePart *
 get_related_display_part (CamelMimePart *part,
-			  			  gint *out_displayid)
+  			  gint *out_displayid)
 {
 	CamelMultipart *mp;
 	CamelMimePart *body_part, *display_part = NULL;
@@ -164,7 +164,7 @@ get_related_display_part (CamelMimePart *part,
 
 static gboolean
 related_display_part_is_attachment (EMFormat *emf,
-				    				CamelMimePart *part)
+				    CamelMimePart *part)
 {
 	CamelMimePart *display_part;
 
@@ -175,10 +175,10 @@ related_display_part_is_attachment (EMFormat *emf,
 /**************************************************************************/
 void
 em_format_empty_parser (EMFormat *emf,
-						CamelMimePart *part,
-						GString *part_id,
-						EMFormatParserInfo *info,
-						GCancellable *cancellable)
+			CamelMimePart *part,
+			GString *part_id,
+			EMFormatParserInfo *info,
+			GCancellable *cancellable)
 {
 	/* DO NOTHING */
 }
@@ -186,10 +186,10 @@ em_format_empty_parser (EMFormat *emf,
 #ifdef ENABLE_SMIME
 static void
 emf_parse_application_xpkcs7mime (EMFormat *emf,
-				  				  CamelMimePart *part,
-								  GString *part_id,
-								  EMFormatParserInfo *info,
-								  GCancellable *cancellable)
+				  CamelMimePart *part,
+				  GString *part_id,
+				  EMFormatParserInfo *info,
+				  GCancellable *cancellable)
 {
 	CamelCipherContext *context;
 	CamelMimePart *opart;
@@ -312,10 +312,10 @@ emf_parse_application_mbox (EMFormat *emf,
 /* RFC 1740 */
 static void
 emf_parse_multipart_alternative (EMFormat *emf,
-                           	 	 CamelMimePart *part,
-	                           	 GString *part_id,
+                           	 CamelMimePart *part,
+	                         GString *part_id,
     	                       	 EMFormatParserInfo *info,
-        	                   	 GCancellable *cancellable)
+        	                 GCancellable *cancellable)
 {
 	CamelMultipart *mp;
 	gint i, nparts, bestid = 0;
@@ -403,10 +403,10 @@ emf_parse_multipart_alternative (EMFormat *emf,
 /* RFC 1740 */
 static void
 emf_parse_multipart_appledouble (EMFormat *emf,
-                           	 	 CamelMimePart *part,
-	                           	 GString *part_id,
+                           	 CamelMimePart *part,
+	                         GString *part_id,
     	                      	 EMFormatParserInfo *info,
-        	                   	 GCancellable *cancellable)
+        	                 GCancellable *cancellable)
 {
 	CamelMultipart *mp;
 	CamelMimePart *mime_part;
@@ -1618,7 +1618,7 @@ em_format_find_puri (EMFormat *emf,
 
 void
 em_format_class_add_handler (EMFormatClass *emfc,
-		  	    			 EMFormatHandler *handler)
+		  	     EMFormatHandler *handler)
 {
 	EMFormatHandler *old_handler;
 
@@ -1648,7 +1648,7 @@ em_format_class_add_handler (EMFormatClass *emfc,
 
 void
 em_format_class_remove_handler (EMFormatClass *emfc,
-								EMFormatHandler *handler)
+				EMFormatHandler *handler)
 {
 	g_return_if_fail (EM_IS_FORMAT_CLASS (emfc));
 	g_return_if_fail (handler);
@@ -1684,7 +1684,7 @@ em_format_find_handler (EMFormat *emf,
  **/
 const EMFormatHandler *
 em_format_fallback_handler (EMFormat *emf,
-						    const gchar *mime_type)
+			    const gchar *mime_type)
 {
 	gchar *mime, *s;
 
@@ -1704,9 +1704,9 @@ em_format_fallback_handler (EMFormat *emf,
 
 void
 em_format_parse (EMFormat *emf,
-				 CamelMimeMessage *message,
-				 CamelFolder *folder,
-				 GCancellable *cancellable)
+		 CamelMimeMessage *message,
+		 CamelFolder *folder,
+		 GCancellable *cancellable)
 {
 	EMFormatClass *class;
 
@@ -1722,11 +1722,11 @@ em_format_parse (EMFormat *emf,
 
 void
 em_format_parse_part_as (EMFormat *emf,
-						 CamelMimePart *part,
-						 GString *part_id,
-						 EMFormatParserInfo *info,
-						 const gchar *mime_type,
-						 GCancellable *cancellable)
+			 CamelMimePart *part,
+			 GString *part_id,
+			 EMFormatParserInfo *info,
+			 const gchar *mime_type,
+			 GCancellable *cancellable)
 {
 	const EMFormatHandler *handler;
 	EMFormatParserInfo ninfo = {
@@ -1748,10 +1748,10 @@ em_format_parse_part_as (EMFormat *emf,
 
 void
 em_format_parse_part (EMFormat *emf,
-		      		  CamelMimePart *part,
-				      GString *part_id,
-				      EMFormatParserInfo *info,
-				      GCancellable *cancellable)
+		      CamelMimePart *part,
+		      GString *part_id,
+		      EMFormatParserInfo *info,
+		      GCancellable *cancellable)
 {
 	CamelContentType *ct;
 	gchar *mime_type;
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 78f28b4..c7d69a9 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -65,19 +65,18 @@ typedef struct _EMFormatHeader EMFormatHeader;
 typedef struct _EMFormatHandler EMFormatHandler;
 typedef struct _EMFormatParserInfo EMFormatParserInfo;
 
-typedef void	(*EMFormatParseFunc)	(EMFormat *emf,
-					 CamelMimePart *part,
-					 GString *part_id,
-					 EMFormatParserInfo *info,
-					 GCancellable *cancellable);
-typedef void	(*EMFormatWriteFunc)	(EMFormat *emf,
-					 EMFormatPURI *puri,
-					 CamelStream *stream,
-					 GCancellable *cancellable);
-typedef GtkWidget*	(*EMFormatWidgetFunc)
-					(EMFormat *emf,
-					 EMFormatPURI *puri,
-					 GCancellable *cancellable);
+typedef void		(*EMFormatParseFunc)	(EMFormat *emf,
+					 	 CamelMimePart *part,
+					 	 GString *part_id,
+					 	 EMFormatParserInfo *info,
+					 	 GCancellable *cancellable);
+typedef void		(*EMFormatWriteFunc)	(EMFormat *emf,
+					 	 EMFormatPURI *puri,
+					 	 CamelStream *stream,
+					 	 GCancellable *cancellable);
+typedef GtkWidget*	(*EMFormatWidgetFunc)	(EMFormat *emf,
+					 	 EMFormatPURI *puri,
+					 	 GCancellable *cancellable);
 
 
 
@@ -162,144 +161,139 @@ struct _EMFormatClass {
 
 	GHashTable *type_handlers;
 
-	void 		(*format_error) 			(EMFormat *emf,
-											 const gchar *message);
-
-	void		(*parse)					(EMFormat *emf,
-											 CamelMimeMessage *message,
-											 CamelFolder *folder,
-											 GCancellable *cancellable);
-	gboolean 	(*is_inline)				(EMFormat *emf,
-											 const gchar *part_id,
-											 CamelMimePart *part,
-											 const EMFormatHandler *handler);
+	void 		(*format_error) 		(EMFormat *emf,
+							 const gchar *message);
+	void		(*parse)			(EMFormat *emf,
+							 CamelMimeMessage *message,
+							 CamelFolder *folder,
+							 GCancellable *cancellable);
+	gboolean 	(*is_inline)			(EMFormat *emf,
+							 const gchar *part_id,
+							 CamelMimePart *part,
+							 const EMFormatHandler *handler);
 	void		(*format_attachment)		(EMFormat *emf,
-											 EMFormatPURI *puri,
-											 GCancellable *cancellable);
-	void		(*format_optional)			(EMFormat *emf,
-											 EMFormatPURI *puri,
-											 CamelStream *mstream,
-											 GCancellable *cancellable);
-	void		(*format_secure)			(EMFormat *emf,
-										 	 EMFormatPURI *puri,
-											 GCancellable *cancellable);
-	void		(*format_source)			(EMFormat *emf,
-							 				 CamelStream *stream,
-											 GCancellable *cancellable);
+							 EMFormatPURI *puri,
+							 GCancellable *cancellable);
+	void		(*format_optional)		(EMFormat *emf,
+							 EMFormatPURI *puri,
+							 CamelStream *mstream,
+							 GCancellable *cancellable);
+	void		(*format_secure)		(EMFormat *emf,
+						 	 EMFormatPURI *puri,
+							 GCancellable *cancellable);
+	void		(*format_source)		(EMFormat *emf,
+				 			 CamelStream *stream,
+							 GCancellable *cancellable);
 };
 
-EMFormat*		em_format_new 				(void);
+EMFormat*		em_format_new 			(void);
 
-GType			em_format_get_type 			(void);
+GType			em_format_get_type 		(void);
 
 void			em_format_set_charset		(EMFormat *emf,
-						 					 const gchar *charset);
-const gchar*		em_format_get_charset	(EMFormat *emf);
+							 const gchar *charset);
+const gchar*		em_format_get_charset		(EMFormat *emf);
 
-void			em_format_set_default_charset
-											(EMFormat *emf,
-						 	 				 const gchar *charset);
-const gchar*		em_format_get_default_charset
-											(EMFormat *emf);
+void			em_format_set_default_charset	(EMFormat *emf,
+						 	 const gchar *charset);
+const gchar*		em_format_get_default_charset	(EMFormat *emf);
 
 void			em_format_set_composer 		(EMFormat *emf,
-							 				 gboolean composer);
+			 				 gboolean composer);
 gboolean		em_format_get_composer		(EMFormat *emf);
 
 void			em_format_set_base_url		(EMFormat *emf,
-							 				 CamelURL *url);
-void			em_format_set_base_url_string  
-											(EMFormat *emf,
-							 				 const gchar *url_string);
+			 				 CamelURL *url);
+void			em_format_set_base_url_string	(EMFormat *emf,
+							 const gchar *url_string);
 CamelURL*		em_format_get_base_url		(EMFormat *emf);
 
 void			em_format_clear_headers		(EMFormat *emf);
 
 void			em_format_add_header 		(EMFormat *emf,
-											 const gchar *name,
-											 guint32 flags);
-void			em_format_add_puri			(EMFormat *emf,
-											 EMFormatPURI *puri);
-EMFormatPURI*	em_format_find_puri			(EMFormat *emf,
-											 const gchar *id);
+							 const gchar *name,
+							 guint32 flags);
+void			em_format_add_puri		(EMFormat *emf,
+							 EMFormatPURI *puri);
+EMFormatPURI*		em_format_find_puri		(EMFormat *emf,
+							 const gchar *id);
 
 void			em_format_class_add_handler	(EMFormatClass *emfc,
-											 EMFormatHandler *handler);
-void			em_format_class_remove_handler
-										 	(EMFormatClass *emfc,
-											 EMFormatHandler *handler);
+							 EMFormatHandler *handler);
+void			em_format_class_remove_handler 	(EMFormatClass *emfc,
+							 EMFormatHandler *handler);
 
 const EMFormatHandler*	em_format_find_handler 		(EMFormat *emf,
-													 const gchar *mime_type);
+							 const gchar *mime_type);
 const EMFormatHandler* 	em_format_fallback_handler	(EMFormat *emf,
-		                            				 const gchar *mime_type);
+		                            		 const gchar *mime_type);
 
-void			em_format_parse				(EMFormat *emf,
-											 CamelMimeMessage *message,
-											 CamelFolder *folder,
-											 GCancellable *cancellable);
+void			em_format_parse			(EMFormat *emf,
+							 CamelMimeMessage *message,
+							 CamelFolder *folder,
+							 GCancellable *cancellable);
 void 			em_format_parse_part		(EMFormat *emf,
-											 CamelMimePart *part,
-											 GString *part_id,
-											 EMFormatParserInfo *info,
-											 GCancellable *cancellable);
+							 CamelMimePart *part,
+							 GString *part_id,
+							 EMFormatParserInfo *info,
+							 GCancellable *cancellable);
 void 			em_format_parse_part_as		(EMFormat *emf,
-											 CamelMimePart *part,
-											 GString *part_id,
-											 EMFormatParserInfo *info,
-											 const gchar *mime_type,
-											 GCancellable *cancellable);
-gboolean		em_format_is_inline			(EMFormat *emf,
-											 const gchar *part_id,
-											 CamelMimePart *part,
-											 const EMFormatHandler *handler);
+							 CamelMimePart *part,
+							 GString *part_id,
+							 EMFormatParserInfo *info,
+							 const gchar *mime_type,
+							 GCancellable *cancellable);
+gboolean		em_format_is_inline		(EMFormat *emf,
+							 const gchar *part_id,
+							 CamelMimePart *part,
+							 const EMFormatHandler *handler);
 
 gchar*			em_format_get_error_id		(EMFormat *emf);
 
 void			em_format_format_error		(EMFormat *emf,
-											 const gchar *format,
-											 ...) G_GNUC_PRINTF (2, 3);
+							 const gchar *format,
+							 ...) G_GNUC_PRINTF (2, 3);
 void			em_format_format_text		(EMFormat *emf,
-											 CamelStream *stream,
-											 CamelDataWrapper *dw,
-											 GCancellable *cancellable);
+							 CamelStream *stream,
+							 CamelDataWrapper *dw,
+							 GCancellable *cancellable);
 void			em_format_format_source		(EMFormat *emf,
-											 CamelStream *stream,
-											 GCancellable *cancellable);
+							 CamelStream *stream,
+							 GCancellable *cancellable);
 gchar*			em_format_describe_part		(CamelMimePart *part,
-											 const gchar *mime_type);
+							 const gchar *mime_type);
 gint			em_format_is_attachment 	(EMFormat *emf,
-                	         	 	 	 	 CamelMimePart *part);
-const gchar*	em_format_snoop_type	 	(CamelMimePart *part);
+                	         	 	 	 CamelMimePart *part);
+const gchar*		em_format_snoop_type	 	(CamelMimePart *part);
 
 gchar *			em_format_build_mail_uri	(CamelFolder *folder,
-						 					 const gchar *message_uid,
-						 					 const gchar *part_uid);
+							 const gchar *message_uid,
+							 const gchar *part_uid);
 
 /* EMFormatParseFunc that does nothing. Use it to disable
  * parsing of a specific mime type parts  */
 void			em_format_empty_parser 		(EMFormat *emf,
-											 CamelMimePart *part,
-											 GString *part_id,
-											 EMFormatParserInfo *info,
-											 GCancellable *cancellable);
+							 CamelMimePart *part,
+							 GString *part_id,
+							 EMFormatParserInfo *info,
+							 GCancellable *cancellable);
 
 /* EMFormatWriteFunc that does nothing. Use it to disable
  * writing of a specific mime type parts */
 void			em_format_empty_writer 		(EMFormat *emf,
-											 EMFormatPURI *puri,
-											 CamelStream *stream,
-											 GCancellable *cancellable);
+							 EMFormatPURI *puri,
+							 CamelStream *stream,
+							 GCancellable *cancellable);
 
 
 EMFormatPURI*		em_format_puri_new 		(EMFormat *emf,
-											 gsize puri_size,
-											 CamelMimePart *part,
-											 const gchar *uri);
+							 gsize puri_size,
+							 CamelMimePart *part,
+							 const gchar *uri);
 void			em_format_puri_free 		(EMFormatPURI *puri);
 
 void			em_format_puri_write 		(EMFormatPURI *puri,
-											 CamelStream *stream,
-											 GCancellable *cancellable);
+							 CamelStream *stream,
+							 GCancellable *cancellable);
 
 #endif /* EM_FORMAT_H */