diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/addressbook/openldap-extract.h | 18 | ||||
-rw-r--r-- | modules/calendar/e-cal-shell-sidebar.c | 12 | ||||
-rw-r--r-- | modules/calendar/e-memo-shell-sidebar.c | 12 | ||||
-rw-r--r-- | modules/calendar/e-task-shell-sidebar.c | 12 |
4 files changed, 33 insertions, 21 deletions
diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h index 1c1fcf3d6b..67d5741ce9 100644 --- a/modules/addressbook/openldap-extract.h +++ b/modules/addressbook/openldap-extract.h @@ -768,8 +768,8 @@ static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set ) const gchar *cstr; const gchar *cset; - for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) { - for ( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) { + for (cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr)) { + for (cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset)) { if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) { return cstr - str; } @@ -784,8 +784,8 @@ static gsize ldap_utf8_strspn( const gchar *str, const gchar *set ) const gchar *cstr; const gchar *cset; - for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) { - for ( cset = set; ; LDAP_UTF8_INCR(cset) ) { + for (cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr)) { + for (cset = set; ; LDAP_UTF8_INCR(cset)) { if (*cset == '\0') { return cstr - str; } @@ -1007,7 +1007,7 @@ ldap_pvt_hex_unescape( gchar *s ) */ gchar *p; - for ( p = s; *s != '\0'; ++s ) { + for (p = s; *s != '\0'; ++s) { if (*s == '%') { if (*++s == '\0') { break; @@ -1040,7 +1040,7 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr ) } i = 1; - for ( s = str; *s; s++ ) { + for (s = str; *s; s++) { if (ldap_utf8_strchr( brkstr, s ) != NULL) { i++; } @@ -1055,14 +1055,14 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr ) i = 0; - for ( s = ldap_utf8_strtok( str, brkstr, &lasts ); + for (s = ldap_utf8_strtok( str, brkstr, &lasts); s != NULL; s = ldap_utf8_strtok( NULL, brkstr, &lasts ) ) { res[i] = LDAP_STRDUP( s ); if (res[i] == NULL) { - for ( --i; i >= 0; i-- ) { + for (--i; i >= 0; i--) { LDAP_FREE( res[i] ); } LDAP_FREE( res ); @@ -1381,7 +1381,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp ) return LDAP_URL_ERR_BADEXTS; } - for ( i=0; ludp->lud_exts[i] != NULL; i++ ) { + for (i=0; ludp->lud_exts[i] != NULL; i++) { ldap_pvt_hex_unescape( ludp->lud_exts[i] ); if (*ludp->lud_exts[i] == '!') { diff --git a/modules/calendar/e-cal-shell-sidebar.c b/modules/calendar/e-cal-shell-sidebar.c index 4299c07746..b8b7f4b03e 100644 --- a/modules/calendar/e-cal-shell-sidebar.c +++ b/modules/calendar/e-cal-shell-sidebar.c @@ -189,8 +189,10 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar, shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); shell_window = e_shell_view_get_shell_window (shell_view); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ @@ -242,8 +244,10 @@ cal_shell_sidebar_default_opened_cb (ECalShellSidebar *cal_shell_sidebar, shell_sidebar = E_SHELL_SIDEBAR (cal_shell_sidebar); shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ diff --git a/modules/calendar/e-memo-shell-sidebar.c b/modules/calendar/e-memo-shell-sidebar.c index 75245c2d87..c0001d19af 100644 --- a/modules/calendar/e-memo-shell-sidebar.c +++ b/modules/calendar/e-memo-shell-sidebar.c @@ -183,8 +183,10 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar, shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); shell_window = e_shell_view_get_shell_window (shell_view); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ @@ -236,8 +238,10 @@ memo_shell_sidebar_default_opened_cb (EMemoShellSidebar *memo_shell_sidebar, shell_sidebar = E_SHELL_SIDEBAR (memo_shell_sidebar); shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ diff --git a/modules/calendar/e-task-shell-sidebar.c b/modules/calendar/e-task-shell-sidebar.c index ef379d472f..4f870ec19a 100644 --- a/modules/calendar/e-task-shell-sidebar.c +++ b/modules/calendar/e-task-shell-sidebar.c @@ -183,8 +183,10 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar, shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); shell_window = e_shell_view_get_shell_window (shell_view); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ @@ -236,8 +238,10 @@ task_shell_sidebar_default_opened_cb (ETaskShellSidebar *task_shell_sidebar, shell_sidebar = E_SHELL_SIDEBAR (task_shell_sidebar); shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); - if (g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || - g_error_matches (error, E_CALENDAR_ERROR, E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) + if (g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_FAILED) || + g_error_matches (error, E_CALENDAR_ERROR, + E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)) e_auth_cal_forget_password (client); /* Handle errors. */ |