From 96538878911586a9e9ca26b81e1916c04e538980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 May 2010 10:15:32 -0400 Subject: Coding style and whitespace cleanup. --- modules/calendar/e-cal-shell-content.c | 8 ++++---- modules/calendar/e-cal-shell-sidebar.c | 8 ++++---- modules/calendar/e-cal-shell-view-actions.c | 2 +- modules/calendar/e-cal-shell-view-private.c | 23 +++++++++++------------ modules/calendar/e-cal-shell-view.c | 12 ++++++------ 5 files changed, 26 insertions(+), 27 deletions(-) (limited to 'modules/calendar') diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c index bf812f521f..99fb717c90 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)) @@ -348,7 +348,7 @@ cal_shell_content_constructed (GObject *object) foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); foreign_content = e_shell_view_get_shell_content (foreign_view); g_object_get (foreign_content, "model", &memo_model, NULL); - + foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); foreign_content = e_shell_view_get_shell_content (foreign_view); g_object_get (foreign_content, "model", &task_model, NULL); @@ -356,7 +356,7 @@ cal_shell_content_constructed (GObject *object) /* Build content widgets. */ container = GTK_WIDGET (object); - + if (!e_shell_get_express_mode (shell)) { widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_container_add (GTK_CONTAINER (container), widget); @@ -556,7 +556,7 @@ cal_shell_content_class_init (ECalShellContentClass *class) object_class->get_property = cal_shell_content_get_property; object_class->dispose = cal_shell_content_dispose; object_class->constructed = cal_shell_content_constructed; - + widget_class = GTK_WIDGET_CLASS (class); widget_class->map = cal_shell_content_map; diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 546d21b3c3..4545c88c3a 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -560,10 +560,10 @@ cal_shell_sidebar_finalize (GObject *object) } static void -new_calendar_clicked (GtkButton *button, +new_calendar_clicked (GtkButton *button, EShellSidebar *shell_sidebar) { - EShellView *shell_view; + EShellView *shell_view; EShellWindow *shell_window; EShellBackend *shell_backend; @@ -571,7 +571,7 @@ new_calendar_clicked (GtkButton *button, shell_backend = e_shell_view_get_shell_backend (shell_view); shell_window = e_shell_view_get_shell_window (shell_view); - calendar_setup_new_calendar (GTK_WINDOW (shell_window)); + calendar_setup_new_calendar (GTK_WINDOW (shell_window)); } static void @@ -621,7 +621,7 @@ cal_shell_sidebar_constructed (GObject *object) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); - if(!e_shell_get_express_mode(e_shell_get_default())) { + if (!e_shell_get_express_mode(e_shell_get_default())) { gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); } else { GtkWidget *button; diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c index 83f6101d0a..9510f066ef 100644 --- a/modules/calendar/e-cal-shell-view-actions.c +++ b/modules/calendar/e-cal-shell-view-actions.c @@ -1715,7 +1715,7 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view) cal_shell_content = cal_shell_view->priv->cal_shell_content; searchbar = e_cal_shell_content_get_searchbar (cal_shell_content); - + /* Calendar Actions */ action_group = ACTION_GROUP (CALENDAR); gtk_action_group_add_actions ( diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index a958a9f05e..43b8ae61cd 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -436,7 +436,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, @@ -453,12 +452,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); @@ -474,7 +473,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); } @@ -496,7 +495,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); } @@ -621,7 +620,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) G_CALLBACK (cal_shell_view_selector_client_removed_cb), cal_shell_view); - if (memo_table) + if (memo_table) g_signal_connect_swapped ( memo_table, "popup-event", G_CALLBACK (cal_shell_view_memopad_popup_event_cb), @@ -650,7 +649,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view) task_table, "status-message", G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), cal_shell_view); - + if (task_table) g_signal_connect_swapped ( task_table, "selection-change", @@ -1081,7 +1080,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/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c index 1f719e82c5..c4f52de83a 100644 --- a/modules/calendar/e-cal-shell-view.c +++ b/modules/calendar/e-cal-shell-view.c @@ -304,25 +304,25 @@ cal_shell_view_update_actions (EShellView *shell_view) shell_window = e_shell_view_get_shell_window (shell_view); - if(e_shell_get_express_mode(e_shell_get_default())) { + if (e_shell_get_express_mode(e_shell_get_default())) { GtkWidget *widget, *item; - /* Hack: Get rid of New and Send/Receive in toolbar + /* Hack: Get rid of New and Send/Receive in toolbar * while in express mode */ widget = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar"); item = (GtkWidget *)gtk_toolbar_get_nth_item ((GtkToolbar *)widget, 0); gtk_widget_hide(item); - + widget = e_shell_window_get_managed_widget ( shell_window, "/main-menu"); gtk_widget_hide(widget); - + item = e_shell_window_get_managed_widget ( shell_window, "/main-toolbar/send-receive"); if (item) - gtk_widget_hide(item); + gtk_widget_hide(item); } cal_shell_content = priv->cal_shell_content; calendar = e_cal_shell_content_get_calendar (cal_shell_content); @@ -497,7 +497,7 @@ cal_shell_view_class_init (ECalShellViewClass *class, shell_view_class->new_shell_sidebar = e_cal_shell_sidebar_new; shell_view_class->execute_search = cal_shell_view_execute_search; shell_view_class->update_actions = cal_shell_view_update_actions; -} +} static void cal_shell_view_init (ECalShellView *cal_shell_view, -- cgit v1.2.3