Reduce diff noise with 'account-mgmt' branch.

One last time.

2 files changed, 27 insertions, 18 deletions

diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 32fbf52e38..d9a2b4e6d4 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -62,7 +62,7 @@ struct _ItipViewPrivate {
 	ItipViewMode mode;
 	ECalClientSourceType type;
 
-        gchar *sender;
+	gchar *sender;
 	gchar *organizer;
 	gchar *organizer_sentby;
 	gchar *delegator;
@@ -73,18 +73,18 @@ struct _ItipViewPrivate {
 	gchar *summary;
 
 	gchar *location;
-        gchar *status;
+	gchar *status;
 	gchar *comment;
 
 	struct tm *start_tm;
 	gint start_tm_is_date : 1;
-        gchar *start_label;
-        const gchar *start_header;
+	gchar *start_label;
+	const gchar *start_header;
 
 	struct tm *end_tm;
 	gint end_tm_is_date : 1;
-        gchar *end_label;
-        const gchar *end_header;
+	gchar *end_label;
+	const gchar *end_header;
 
 	GSList *upper_info_items;
 	GSList *lower_info_items;
@@ -97,14 +97,14 @@ struct _ItipViewPrivate {
 
 	gint buttons_sensitive : 1;
 
-        gboolean is_recur_set;
+	gboolean is_recur_set;
 
 	gint needs_decline : 1;
 
-        WebKitDOMDocument *dom_document;
-        ItipPURI *puri;
+	WebKitDOMDocument *dom_document;
+	ItipPURI *puri;
 
-        gchar *error;
+	gchar *error;
 };
 
 #define TEXT_ROW_SENDER "text_row_sender"
@@ -150,7 +150,6 @@ struct _ItipViewPrivate {
 #define DIV_ITIP_CONTENT "div_itip_content"
 #define DIV_ITIP_ERROR "div_itip_error"
 
-/* Signal IDs */
 enum {
 	SOURCE_SELECTED,
 	RESPONSE,
@@ -2292,9 +2291,9 @@ itip_view_set_source (ItipView *view,
 	select = webkit_dom_document_get_element_by_id (
 		view->priv->dom_document, SELECT_ESOURCE);
 
-        /* <select> does not emit 'change' event when already selected <option>
-         * is re-selected, but we need to notify itip formatter, so that it would
-         * make all the buttons sensitive */
+	/* <select> does not emit 'change' event when already selected
+	 * <option> is re-selected, but we need to notify itip formatter,
+	 * so that it would make all the buttons sensitive. */
 	if (source == itip_view_get_source (view)) {
 		source_changed_cb (select, NULL, view);
 	}
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 2d9efb6380..35910db8c7 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -25,10 +25,13 @@
 #endif
 
 #include "url-editor-dialog.h"
+
+#include <string.h>
+#include <glib/gi18n.h>
+
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-url.h>
-#include <glib/gi18n.h>
-#include <string.h>
+
 #include <e-util/e-util.h>
 #include <e-util/e-util-private.h>
 
@@ -588,8 +591,15 @@ url_editor_dialog_run (UrlEditorDialog *dialog)
 		}
 
 		l = e_source_selector_get_selection (E_SOURCE_SELECTOR (dialog->events_selector));
-		for (p = l; p; p = g_slist_next (p))
-			dialog->uri->events = g_slist_append (dialog->uri->events, g_strdup (e_source_get_uid (p->data)));
+		for (p = l; p; p = g_slist_next (p)) {
+			ESource *source;
+			const gchar *uid;
+
+			source = E_SOURCE (p->data);
+			uid = e_source_get_uid (source);
+			dialog->uri->events = g_slist_append (
+				dialog->uri->events, g_strdup (uid));
+		}
 	}
 	gtk_widget_hide (GTK_WIDGET (dialog));