2 files changed, 25 insertions, 9 deletions

diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index d01950b879..13744187f9 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -300,7 +300,9 @@ bbdb_sync_buddy_list (void)
 
 	g_thread_create (bbdb_sync_buddy_list_in_thread, std, FALSE, &error);
 	if (error) {
-		g_warning ("%s: Creation of the thread failed with error: %s", G_STRFUNC, error->message);
+		g_warning (
+			"%s: Creation of the thread failed with error: %s",
+			G_STRFUNC, error->message);
 		g_error_free (error);
 
 		G_UNLOCK (syncing);
@@ -355,7 +357,9 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c)
 			photo = g_new0 (EContactPhoto, 1);
 			photo->type = E_CONTACT_PHOTO_TYPE_INLINED;
 
-			if (! g_file_get_contents (b->icon, &contents, &photo->data.inlined.length, &error)) {
+			if (!g_file_get_contents (
+				b->icon, &contents,
+				&photo->data.inlined.length, &error)) {
 				g_warning ("bbdb: Could not read buddy icon: %s\n", error->message);
 				g_error_free (error);
 				for (l = ims; l != NULL; l = l->next)
@@ -544,7 +548,9 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 	}
 
 	if (buddy == NULL) {
-		fprintf (stderr, "bbdb: Could not find buddy in contact. Malformed Pidgin buddy list file.\n");
+		fprintf (
+			stderr, "bbdb: Could not find buddy in contact. "
+			"Malformed Pidgin buddy list file.\n");
 		return;
 	}
 
@@ -563,7 +569,9 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 			g_free (setting_type);
 		} else if (! strcmp ((const gchar *)child->name, "name")) {
 			gb->account_name = get_node_text (child);
-			is_blocked = g_slist_find_custom (blocked, gb->account_name, (GCompareFunc)strcmp) != NULL;
+			is_blocked = g_slist_find_custom (
+				blocked, gb->account_name,
+				(GCompareFunc) strcmp) != NULL;
 		} else if (! strcmp ((const gchar *)child->name, "alias"))
 			gb->alias = get_node_text (child);
 
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 59e54e621a..699ec1efd9 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -69,9 +69,15 @@ typedef enum {
 } EmlaAction;
 
 typedef struct {
-	EmlaAction action;    /* action enumeration */
-	gboolean interactive; /* whether the user needs to edit a mailto: message (e.g. for post action) */
-	const gchar * header;   /* header representing the action */
+	/* action enumeration */
+	EmlaAction action;
+
+	/* whether the user needs to edit a mailto:
+	 * message (e.g. for post action) */
+	gboolean interactive;
+
+	/* header representing the action */
+	const gchar *header;
 } EmlaActionHeader;
 
 const EmlaActionHeader emla_action_headers[] = {
@@ -117,7 +123,8 @@ emla_list_action_do (CamelFolder *folder,
 
 	for (t = 0; t < G_N_ELEMENTS (emla_action_headers); t++) {
 		if (emla_action_headers[t].action == action &&
-		    (header = camel_medium_get_header (CAMEL_MEDIUM (msg), emla_action_headers[t].header)) != NULL)
+		    (header = camel_medium_get_header (CAMEL_MEDIUM (msg),
+			emla_action_headers[t].header)) != NULL)
 			break;
 	}
 
@@ -132,7 +139,8 @@ emla_list_action_do (CamelFolder *folder,
 	if (action == EMLA_ACTION_POST) {
 		while (*headerpos == ' ') headerpos++;
 		if (g_ascii_strcasecmp (headerpos, "NO") == 0) {
-			e_alert_run_dialog_for_args (window, MESSAGE_POSTING_NOT_ALLOWED, NULL);
+			e_alert_run_dialog_for_args (
+				window, MESSAGE_POSTING_NOT_ALLOWED, NULL);
 			goto exit;
 		}
 	}