aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/e-book-shell-content.c3
-rw-r--r--modules/calendar/e-cal-shell-view-private.c9
-rw-r--r--modules/calendar/e-cal-shell-view.c14
-rw-r--r--modules/calendar/e-memo-shell-content.c3
-rw-r--r--modules/calendar/e-task-shell-content.c3
-rw-r--r--modules/mail/e-mail-shell-content.c3
6 files changed, 20 insertions, 15 deletions
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index a86d101e1b..82e1f297d9 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -437,7 +437,8 @@ book_shell_content_class_init (EBookShellContentClass *class)
shell_content_class = E_SHELL_CONTENT_CLASS (class);
shell_content_class->check_state = book_shell_content_check_state;
- shell_content_class->focus_search_results = book_shell_content_focus_search_results;
+ shell_content_class->focus_search_results =
+ book_shell_content_focus_search_results;
g_object_class_install_property (
object_class,
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index 1ae493c30d..c6c9fa5673 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -687,12 +687,9 @@ e_cal_shell_view_private_dispose (ECalShellView *cal_shell_view)
ECalShellViewPrivate *priv = cal_shell_view->priv;
gint i;
- /* Calling calendar's save state from here, because it is too late in its dispose */
- if (priv->cal_shell_content)
- e_cal_shell_content_save_state (priv->cal_shell_content);
-
- /* Calling calendar's save state from here, because it is too late in its dispose */
- if (priv->cal_shell_content)
+ /* Calling calendar's save state from here,
+ * because it is too late in its dispose. */
+ if (priv->cal_shell_content != NULL)
e_cal_shell_content_save_state (priv->cal_shell_content);
DISPOSE (priv->cal_shell_backend);
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 1706fa0a5f..1d7269cd55 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -235,15 +235,19 @@ get_attendee_prop (icalcomponent *icalcomp, const gchar *address)
if (!(address && *address))
return NULL;
- for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
- prop;
- prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
+ prop = icalcomponent_get_first_property (
+ icalcomp, ICAL_ATTENDEE_PROPERTY);
+
+ while (prop != NULL) {
const gchar *attendee = icalproperty_get_attendee (prop);
- if (g_str_equal (itip_strip_mailto (attendee), address)) {
+ if (g_str_equal (itip_strip_mailto (attendee), address))
return prop;
- }
+
+ prop = icalcomponent_get_next_property (
+ icalcomp, ICAL_ATTENDEE_PROPERTY);
}
+
return NULL;
}
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 5c964fc505..9f7d0768b9 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -624,7 +624,8 @@ memo_shell_content_class_init (EMemoShellContentClass *class)
shell_content_class = E_SHELL_CONTENT_CLASS (class);
shell_content_class->check_state = memo_shell_content_check_state;
- shell_content_class->focus_search_results = memo_shell_content_focus_search_results;
+ shell_content_class->focus_search_results =
+ memo_shell_content_focus_search_results;
g_object_class_install_property (
object_class,
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index 2287ee893c..0ffa6fb5a3 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -647,7 +647,8 @@ task_shell_content_class_init (ETaskShellContentClass *class)
shell_content_class = E_SHELL_CONTENT_CLASS (class);
shell_content_class->check_state = task_shell_content_check_state;
- shell_content_class->focus_search_results = task_shell_content_focus_search_results;
+ shell_content_class->focus_search_results =
+ task_shell_content_focus_search_results;
g_object_class_install_property (
object_class,
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index fcb10e461f..9fd7d3b91a 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -422,7 +422,8 @@ mail_shell_content_class_init (EMailShellContentClass *class)
shell_content_class = E_SHELL_CONTENT_CLASS (class);
shell_content_class->check_state = mail_shell_content_check_state;
- shell_content_class->focus_search_results = mail_shell_content_focus_search_results;
+ shell_content_class->focus_search_results =
+ mail_shell_content_focus_search_results;
/* Inherited from EMailReader */
g_object_class_override_property (