GNOME.org
 

[evolution/gnome-2-30] Coding style and whitespace cleanup.

commit d9dcd9d667bcf08b274dd9752bdfeb0642e696b6
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jun 20 08:17:59 2010 -0400

    Coding style and whitespace cleanup.

 calendar/gui/gnome-cal.c                      |    2 -
 capplet/settings/anjal-mail-view.c            |    2 +-
 capplet/settings/mail-guess-servers.c         |    7 ++--
 mail/em-account-editor.c                      |    5 +--
 mail/em-folder-tree.c                         |    8 ++--
 mail/em-inline-filter.c                       |    2 +-
 modules/calendar/e-cal-shell-content.c        |    2 +-
 modules/calendar/e-cal-shell-view-private.c   |   33 +++++++++----------
 modules/mail/e-mail-shell-sidebar.c           |   12 +++---
 modules/plugin-mono/e-plugin-mono.c           |    2 +-
 modules/windows-sens/evolution-windows-sens.c |   42 +++++++++++-------------
 shell/e-shell-switcher.c                      |    2 +-
 shell/e-shell-window-actions.c                |    6 ++--
 shell/e-shell-window-private.c                |    1 -
 shell/main.c                                  |    4 +-
 smime/lib/e-cert-db.c                         |    1 -
 widgets/misc/e-calendar.h                     |    2 +-
 17 files changed, 61 insertions(+), 72 deletions(-)
---
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 670512b..d1cc397 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1043,7 +1043,6 @@ struct _date_query_msg {
 	GnomeCalendar *gcal;
 };
 
-
 static void
 free_dn_queries (GnomeCalendar *gcal)
 {
@@ -1491,7 +1490,6 @@ gnome_calendar_do_dispose (GObject *object)
 	gcal = GNOME_CALENDAR (object);
 	priv = gcal->priv;
 
-	
 	if (priv->shell_settings != NULL) {
 		g_object_unref (priv->shell_settings);
 		priv->shell_settings = NULL;
diff --git a/capplet/settings/anjal-mail-view.c b/capplet/settings/anjal-mail-view.c
index 99ff93a..9f96bcd 100644
--- a/capplet/settings/anjal-mail-view.c
+++ b/capplet/settings/anjal-mail-view.c
@@ -56,7 +56,7 @@ anjal_mail_view_finalize (GObject *object)
 	G_OBJECT_CLASS (anjal_mail_view_parent_class)->finalize (object);
 }
 
-static 	void
+static void
 view_set_folder_uri (AnjalMailView *mail_view, const gchar *uri)
 {
 }
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
index 388f894..7494190 100644
--- a/capplet/settings/mail-guess-servers.c
+++ b/capplet/settings/mail-guess-servers.c
@@ -127,7 +127,7 @@ handle_incoming (xmlNodePtr head, EmailProvider *provider)
 		} else if (strcmp ((gchar *)node->name, "username") == 0) {
 			provider->recv_username = xml_to_gchar(xmlNodeGetContent(node), provider);
 		} else if (strcmp ((gchar *)node->name, "authentication") == 0) {
-		 	provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider);
+			provider->recv_auth = xml_to_gchar(xmlNodeGetContent(node), provider);
 		}
 
 		node = node->next;
@@ -151,7 +151,7 @@ handle_outgoing (xmlNodePtr head, EmailProvider *provider)
 		} else if (strcmp ((gchar *)node->name, "username") == 0) {
 			provider->send_username = xml_to_gchar(xmlNodeGetContent(node), provider);
 		} else if (strcmp ((gchar *)node->name, "authentication") == 0) {
-		 	provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider);
+			provider->send_auth = xml_to_gchar(xmlNodeGetContent(node), provider);
 		}
 
 		node = node->next;
@@ -222,7 +222,6 @@ mail_guess_servers(EmailProvider *provider)
 	parsed = soup_uri_new (url);
 	soup_uri_free (parsed);
 
-
 	session = soup_session_sync_new_with_options (
 		SOUP_SESSION_SSL_CA_FILE, cafile,
 		SOUP_SESSION_USER_AGENT, "get ",
@@ -239,7 +238,7 @@ mail_guess_servers(EmailProvider *provider)
 		return FALSE;
 
 	parse_msg(msg, provider);
-	
+
 	g_object_unref (msg);
 	g_object_unref(session);
 	g_free(url);
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 77d2dc8..d0a7248 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2092,7 +2092,7 @@ emae_create_basic_assistant_page (EMAccountEditor *emae, GtkAssistant *assistant
 	gtk_widget_show (lbl);
 
 	if (g_ascii_strcasecmp (page_id, "start_page") == 0)
-		g_hash_table_insert (emae->priv->widgets, (char *)"start_page_label", lbl);
+		g_hash_table_insert (emae->priv->widgets, (gchar *)"start_page_label", lbl);
 
 	if (old) {
 		/* keep page on its previous index */
@@ -2123,7 +2123,6 @@ static struct {
 	{ "identity_organization", E_ACCOUNT_ID_ORGANIZATION },
 };
 
-
 static void
 emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *first, ...)
 {
@@ -2131,7 +2130,7 @@ emae_queue_widgets (EMAccountEditor *emae, GtkBuilder *builder, const gchar *fir
 
 	va_start (ap, first);
 	while (first) {
-		g_hash_table_insert (emae->priv->widgets, (char *)first, e_builder_get_widget (builder, first));
+		g_hash_table_insert (emae->priv->widgets, (gchar *)first, e_builder_get_widget (builder, first));
 		first = va_arg (ap, const gchar *);
 	}
 	va_end (ap);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index fdd1b88..371d764 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2834,22 +2834,22 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree,
 			goto next;
 
 		group_name = g_strdup_printf ("Store %s", uri);
-		
+
 		if (e_shell_get_express_mode (shell)) {
 			gboolean system = FALSE;
 
 			if (strncmp (uri, "vfolder", 7) == 0 ||
 					strncmp(uri, "mbox", 4) == 0)
 				system = TRUE;
-				
+
 			if (!system && !g_key_file_has_key (key_file, group_name, key, NULL)) {
 				GtkTreePath *path;
-	
+
 				path = gtk_tree_model_get_path (tree_model, &iter);
 				gtk_tree_view_expand_row (tree_view, path, FALSE);
 				gtk_tree_path_free (path);
 			}
-			
+
 		} else if (!g_key_file_has_key (key_file, group_name, key, NULL)) {
 			GtkTreePath *path;
 
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 43dee1f..4d3ac94 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -232,7 +232,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 		}
 
 		rest_len = inend - start;
-		if (inptr < inend) 
+		if (inptr < inend)
 			*inptr++ = 0;
 
 		#define restore_inptr() G_STMT_START { if (inptr < inend) inptr[-1] = '\n'; } G_STMT_END
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index f5cc016..a24bd01 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -151,7 +151,7 @@ cal_chell_content_get_pad_state_filename (EShellContent *shell_content, ETable *
 	g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL);
 	g_return_val_if_fail (table != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE (table), NULL);
-	
+
 	if (E_IS_TASK_TABLE (table))
 		nick = "TaskPad";
 	else if (E_IS_MEMO_TABLE (table))
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index c669c29..009a0b5 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -29,11 +29,11 @@
 #define CHECK_NB	5
 
 static const gchar * files_to_check [CHECK_NB] = {
-        ETC_TIMEZONE,
-        ETC_TIMEZONE_MAJ,
-        ETC_SYSCONFIG_CLOCK,
-        ETC_CONF_D_CLOCK,
-        ETC_LOCALTIME
+	ETC_TIMEZONE,
+	ETC_TIMEZONE_MAJ,
+	ETC_SYSCONFIG_CLOCK,
+	ETC_CONF_D_CLOCK,
+	ETC_LOCALTIME
 };
 
 static void
@@ -426,7 +426,6 @@ e_cal_shell_view_private_init (ECalShellView *cal_shell_view,
 		G_CALLBACK (cal_shell_view_notify_view_id_cb), NULL);
 }
 
-	
 static void
 system_timezone_monitor_changed (GFileMonitor *handle,
                                  GFile *file,
@@ -434,7 +433,7 @@ system_timezone_monitor_changed (GFileMonitor *handle,
                                  GFileMonitorEvent event,
                                  gpointer user_data)
 {
-        ECalShellView  *view = E_CAL_SHELL_VIEW (user_data);
+	ECalShellView  *view = E_CAL_SHELL_VIEW (user_data);
 	ECalShellViewPrivate *priv = view->priv;
 	ECalShellContent *cal_shell_content;
 	icaltimezone *timezone = NULL, *current_zone = NULL;
@@ -443,12 +442,12 @@ system_timezone_monitor_changed (GFileMonitor *handle,
 	EShell *shell;
 	ECalModel *model;
 	const gchar *location;
- 
- 	if (event != G_FILE_MONITOR_EVENT_CHANGED &&
-            event != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT &&
-            event != G_FILE_MONITOR_EVENT_DELETED &&
-            event != G_FILE_MONITOR_EVENT_CREATED)
-                return;
+
+	if (event != G_FILE_MONITOR_EVENT_CHANGED &&
+	    event != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT &&
+	    event != G_FILE_MONITOR_EVENT_DELETED &&
+	    event != G_FILE_MONITOR_EVENT_CREATED)
+		return;
 
 	cal_shell_content = priv->cal_shell_content;
 	model = e_cal_shell_content_get_model (cal_shell_content);
@@ -464,7 +463,7 @@ system_timezone_monitor_changed (GFileMonitor *handle,
 	location = icaltimezone_get_location (timezone);
 	if (location == NULL)
 		location = "UTC";
-	
+
 	g_object_set (settings, "cal-timezone-string", location, NULL);
 	g_object_set (settings, "cal-timezone", timezone, NULL);
 }
@@ -486,7 +485,7 @@ init_timezone_monitors (ECalShellView *view)
 
 		if (priv->monitors[i])
 			g_signal_connect (G_OBJECT (priv->monitors[i]),
-					"changed", 
+					"changed",
 					G_CALLBACK (system_timezone_monitor_changed),
 					view);
 	}
@@ -648,7 +647,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	init_timezone_monitors (cal_shell_view);
 	e_cal_shell_view_actions_init (cal_shell_view);
 	e_cal_shell_view_update_sidebar (cal_shell_view);
-        e_cal_shell_view_update_search_filter (cal_shell_view);
+	e_cal_shell_view_update_search_filter (cal_shell_view);
 	e_cal_shell_view_update_timezone (cal_shell_view);
 
 	/* Keep the ECalModel in sync with the sidebar. */
@@ -1065,7 +1064,7 @@ e_cal_shell_view_update_timezone (ECalShellView *cal_shell_view)
 
 	cal_shell_sidebar = cal_shell_view->priv->cal_shell_sidebar;
 	clients = e_cal_shell_sidebar_get_clients (cal_shell_sidebar);
-	
+
 	for (iter = clients; iter != NULL; iter = iter->next) {
 		ECal *client = iter->data;
 
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index ebe72bf..deefde9 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -178,12 +178,12 @@ mail_shell_sidebar_constructed (GObject *object)
 		shell_sidebar);
 }
 
-static int
+static gint
 guess_screen_width (EMailShellSidebar *sidebar)
 {
 	GtkWidget *widget;
 	GdkScreen *screen;
-	int screen_width;
+	gint screen_width;
 
 	widget = GTK_WIDGET (sidebar);
 
@@ -192,7 +192,7 @@ guess_screen_width (EMailShellSidebar *sidebar)
 	screen = gtk_widget_get_screen (widget);
 	if (screen) {
 		GtkWidget *toplevel;
-		int monitor;
+		gint monitor;
 		GdkRectangle rect;
 
 		toplevel = gtk_widget_get_toplevel (widget);
@@ -239,9 +239,9 @@ mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	PangoLayout *layout;
 	PangoRectangle ink_rect;
 	GtkStyle *style;
-	int border;
-	int sidebar_width;
-	int screen_width;
+	gint border;
+	gint sidebar_width;
+	gint screen_width;
 
 	sidebar = E_MAIL_SHELL_SIDEBAR (widget);
 
diff --git a/modules/plugin-mono/e-plugin-mono.c b/modules/plugin-mono/e-plugin-mono.c
index eb4b60c..68a6233 100644
--- a/modules/plugin-mono/e-plugin-mono.c
+++ b/modules/plugin-mono/e-plugin-mono.c
@@ -125,7 +125,7 @@ plugin_mono_invoke (EPlugin *plugin,
 		mono_config_parse (NULL);
 		domain = mono_jit_init (plugin_mono->location);
 	}
-	
+
 	/* We need to do this every time since we may
 	 * be called from any thread for some uses. */
 	mono_thread_attach (domain);
diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c
index d228fc0..2c58b93 100644
--- a/modules/windows-sens/evolution-windows-sens.c
+++ b/modules/windows-sens/evolution-windows-sens.c
@@ -39,7 +39,7 @@ typedef struct IEnumEventObject IEnumEventObject;
 const IID IID_IEnumEventObject;
 typedef struct IEnumEventObjectVtbl {
 	BEGIN_INTERFACE
-		HRESULT (WINAPI *QueryInterface)(IEnumEventObject *This,REFIID riid,void **ppvObject);
+		HRESULT (WINAPI *QueryInterface)(IEnumEventObject *This,REFIID riid,gpointer *ppvObject);
 		ULONG (WINAPI *AddRef)(IEnumEventObject *This);
 		ULONG (WINAPI *Release)(IEnumEventObject *This);
 		HRESULT (WINAPI *Clone)(IEnumEventObject *This,IEnumEventObject **ppInterface);
@@ -57,7 +57,7 @@ typedef struct IEventObjectCollection IEventObjectCollection;
 const IID IID_IEventObjectCollection;
 typedef struct IEventObjectCollectionVtbl {
 	BEGIN_INTERFACE
-		HRESULT (WINAPI *QueryInterface)(IEventObjectCollection *This,REFIID riid,void **ppvObject);
+		HRESULT (WINAPI *QueryInterface)(IEventObjectCollection *This,REFIID riid,gpointer *ppvObject);
 		ULONG (WINAPI *AddRef)(IEventObjectCollection *This);
 		ULONG (WINAPI *Release)(IEventObjectCollection *This);
 		HRESULT (WINAPI *GetTypeInfoCount)(IEventObjectCollection *This,UINT *pctinfo);
@@ -76,13 +76,12 @@ struct IEventObjectCollection {
 	CONST_VTBL struct IEventObjectCollectionVtbl *lpVtbl;
 };
 
-
 typedef struct IEventSystem IEventSystem;
 
 const IID IID_IEventSystem;
 typedef struct IEventSystemVtbl {
 	BEGIN_INTERFACE
-		HRESULT (WINAPI *QueryInterface)(IEventSystem *This,REFIID riid,void **ppvObject);
+		HRESULT (WINAPI *QueryInterface)(IEventSystem *This,REFIID riid,gpointer *ppvObject);
 		ULONG (WINAPI *AddRef)(IEventSystem *This);
 		ULONG (WINAPI *Release)(IEventSystem *This);
 		HRESULT (WINAPI *GetTypeInfoCount)(IEventSystem *This,UINT *pctinfo);
@@ -106,7 +105,7 @@ typedef struct IEventSubscription IEventSubscription;
 const IID IID_IEventSubscription;
 typedef struct IEventSubscriptionVtbl {
 	BEGIN_INTERFACE
-		HRESULT (WINAPI *QueryInterface)(IEventSubscription *This,REFIID riid,void **ppvObject);
+		HRESULT (WINAPI *QueryInterface)(IEventSubscription *This,REFIID riid,gpointer *ppvObject);
 		ULONG (WINAPI *AddRef)(IEventSubscription *This);
 		ULONG (WINAPI *Release)(IEventSubscription *This);
 		HRESULT (WINAPI *GetTypeInfoCount)(IEventSubscription *This,UINT *pctinfo);
@@ -175,7 +174,7 @@ typedef struct ISensNetwork ISensNetwork;
 const IID IID_ISensNetwork;
 typedef struct ISensNetworkVtbl {
 	BEGIN_INTERFACE
-		HRESULT (WINAPI *QueryInterface)(ISensNetwork *This,REFIID riid,void **ppvObject);
+		HRESULT (WINAPI *QueryInterface)(ISensNetwork *This,REFIID riid,gpointer *ppvObject);
 		ULONG (WINAPI *AddRef)(ISensNetwork *This);
 		ULONG (WINAPI *Release)(ISensNetwork *This);
 		HRESULT (WINAPI *GetTypeInfoCount)(ISensNetwork *This,UINT *pctinfo);
@@ -213,7 +212,6 @@ DEFINE_GUID(CLSID_CEventSystem, 0x4E14FBA2, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0x
 /* 7542e960-79c7-11d1-88f9-0080c7d771bf */
 DEFINE_GUID(CLSID_CEventSubscription, 0x7542e960, 0x79c7, 0x11d1, 0x88, 0xf9, 0x00, 0x80, 0xc7, 0xd7, 0x71, 0xbf);
 
-
 /* Standard GObject macros */
 #define E_TYPE_WINDOWS_SENS \
 	(e_windows_sens_get_type ())
@@ -263,7 +261,7 @@ static void e_sens_network_listener_init(ESensNetworkListener**,EWindowsSENS*);
 
 /* Functions to implement ISensNetwork interface */
 
-static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork*,REFIID,void**);
+static HRESULT WINAPI e_sens_network_listener_queryinterface (ISensNetwork*,REFIID,gpointer *);
 static ULONG WINAPI e_sens_network_listener_addref (ISensNetwork*);
 static ULONG WINAPI e_sens_network_listener_release (ISensNetwork*);
 static HRESULT WINAPI e_sens_network_listener_gettypeinfocount (ISensNetwork*, UINT*);
@@ -293,7 +291,6 @@ static ISensNetworkVtbl ESensNetworkListenerVtbl = {
 	e_sens_network_listener_destinationreachablenoqocinfo
 };
 
-
 static HRESULT WINAPI
 e_sens_network_listener_queryinterface (ISensNetwork *This,
                                         REFIID        iid,
@@ -381,7 +378,7 @@ e_sens_network_listener_connectionmade (ISensNetwork  *This,
 }
 
 static HRESULT WINAPI
-e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *This, 
+e_sens_network_listener_connectionmadenoqocinfo (ISensNetwork *This,
                                                  BSTR          bstrConnection,
                                                  ULONG         ulType)
 {
@@ -438,19 +435,18 @@ e_sens_network_listener_init(ESensNetworkListener **esnl_ptr,
 	(*esnl_ptr)->ref = 1;
 }
 
-
 static BSTR
-_mb2wchar (const char* a)
+_mb2wchar (const gchar * a)
 {
 	static WCHAR b[64];
 	MultiByteToWideChar (0, 0, a, -1, b, 64);
 	return b;
 }
 
-static const char* add_curly_braces_to_uuid (const char* string_uuid)
+static const gchar * add_curly_braces_to_uuid (const gchar * string_uuid)
 {
-	static char curly_braced_uuid_string[64];
-	int i;
+	static gchar curly_braced_uuid_string[64];
+	gint i;
 	if (!string_uuid)
 		return NULL;
 	lstrcpy(curly_braced_uuid_string,"{");
@@ -459,8 +455,8 @@ static const char* add_curly_braces_to_uuid (const char* string_uuid)
 	i = strlen(curly_braced_uuid_string);
 	lstrcat(curly_braced_uuid_string+i,"}");
 	return curly_braced_uuid_string;
-}	
-	
+}
+
 static void
 windows_sens_constructed (GObject *object)
 {
@@ -468,22 +464,22 @@ windows_sens_constructed (GObject *object)
 	static IEventSystem *pEventSystem =0;
 	static IEventSubscription* pEventSubscription = 0;
 	static ESensNetworkListener *pESensNetworkListener = 0;
-	static const char* eventclassid="{D5978620-5B9F-11D1-8DD2-00AA004ABD5E}";
-	static const char* methods[]={
+	static const gchar * eventclassid="{D5978620-5B9F-11D1-8DD2-00AA004ABD5E}";
+	static const gchar * methods[]={
 		"ConnectionMade",
 		"ConnectionMadeNoQOCInfo",
 		"ConnectionLost",
 		"DestinationReachable",
 		"DestinationReachableNoQOCInfo"
 	};
-	static const char* names[]={
+	static const gchar * names[]={
 		"EWS_ConnectionMade",
 		"EWS_ConnectionMadeNoQOCInfo",
 		"EWS_ConnectionLost",
 		"EWS_DestinationReachable",
 		"EWS_DestinationReachableNoQOCInfo"
 	};
-	unsigned char* subids[] = { 0, 0, 0, 0, 0 };
+	guchar * subids[] = { 0, 0, 0, 0, 0 };
 
 	EWindowsSENS *extension = (E_WINDOWS_SENS (object));
 	e_sens_network_listener_init(&pESensNetworkListener, extension);
@@ -504,7 +500,7 @@ windows_sens_constructed (GObject *object)
 				UUID tmp_uuid;
 				UuidCreate(&tmp_uuid);
 				UuidToString(&tmp_uuid, &subids[i]);
-				res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((char*)subids[i])));
+				res=pEventSubscription->lpVtbl->put_SubscriptionID (pEventSubscription, _mb2wchar (add_curly_braces_to_uuid ((gchar *)subids[i])));
 				if (res) {
 					RpcStringFree (&subids[i]);
 					break;
@@ -540,7 +536,7 @@ windows_sens_constructed (GObject *object)
 		if (pEventSubscription)
 			pEventSubscription->lpVtbl->Release(pEventSubscription);
 	}
-	
+
 	/* Do not try to get initial state when we are sure we will not get system events.
 	 * Like that we don't get stuck with Disconnected status if we were disconnected
 	 * on start.
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 7e82e55..74d3f6b 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -591,7 +591,7 @@ tool_item_button_cb (GtkWidget      *internal_widget,
  *
  * Adds a button to @switcher that proxies for @switcher_action.
  * Switcher buttons appear in the order they were added. A middle
- * click opens a new window of this type.  
+ * click opens a new window of this type.
  *
  * #EShellWindow adds switcher actions in the order given by the
  * <structfield>sort_order</structfield> field in #EShellBackendClass.
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 9b14730..e6c0b50 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1884,7 +1884,7 @@ e_shell_window_actions_init (EShellWindow *shell_window)
 	EFocusTracker *focus_tracker;
 	GtkUIManager *ui_manager;
 	gchar *path;
-	
+
 	g_return_if_fail (E_IS_SHELL_WINDOW (shell_window));
 
 	ui_manager = e_shell_window_get_ui_manager (shell_window);
@@ -2109,8 +2109,8 @@ e_shell_window_create_new_menu (EShellWindow *shell_window)
 
 static GtkAction *
 e_shell_window_create_switcher_action (GType type, EShellViewClass *class,
-				       const char *name, const char *tooltip,
-				       const char *view_name)
+				       const gchar *name, const gchar *tooltip,
+				       const gchar *view_name)
 {
 	GtkAction *action;
 
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 2272fac..b7a38d8 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -300,7 +300,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window)
 	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
 	priv->gal_view_merge_id = merge_id;
 
-
 	/* Construct window widgets. */
 
 	widget = gtk_vbox_new (FALSE, 0);
diff --git a/shell/main.c b/shell/main.c
index 4d9cd7a..b28e118 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -510,7 +510,7 @@ main (gint argc, gchar **argv)
 	if (register_handlers || reinstall || show_icons) {
 		_e_win32_register_mailer ();
 	}
-	
+
 	if (register_handlers)
 		exit (0);
 
@@ -528,7 +528,7 @@ main (gint argc, gchar **argv)
 		_e_win32_unset_default_mailer ();
 		exit (0);
 	}
-	
+
 	if (unregister_handlers) {
 		_e_win32_unregister_mailer();
 		exit (0);
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 05db3e3..52545f3 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -48,7 +48,6 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-
 #include <camel/camel.h>        /* FIXME: this is where camel_init is defined; it shouldn't include everything else */
 
 /* private NSS defines used by PSM */
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 83eb8df..a3d979c 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -91,7 +91,7 @@ void		e_calendar_set_minimum_size	(ECalendar *cal,
 						 gint rows,
 						 gint cols);
 void		e_calendar_set_maximum_size	(ECalendar *cal,
-					 	 gint rows,
+						 gint rows,
 						 gint cols);
 void		e_calendar_get_border_size	(ECalendar *cal,
 						 gint *top,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]