diff options
Diffstat (limited to 'plugins')
36 files changed, 127 insertions, 127 deletions
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 76d19a9929..d28f24a8d4 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -90,7 +90,7 @@ replace_at_sign (const gchar *str) res = g_strdup (str); while (at = strchr (res, '@'), at) { - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (res) + 2)); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (res) + 2)); strncpy (tmp, res, at - res); strcat (tmp, "%40"); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index e43d3b0531..f9f7bd7d40 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -391,7 +391,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) uri_text = e_source_get_uri (source); if (uri_text && strncmp (uri_text, "exchange", 8)) { g_free (uri_text); - return ; + return; } status = exchange_is_offline (&offline_status); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index c898f1b4c5..4e10acabdd 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -207,7 +207,7 @@ set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type, return; physical_uri = e_folder_get_physical_uri (folder); - /* remove ; form the uri */ + /* remove; form the uri */ camel_url = camel_url_new (physical_uri, NULL); url_string = camel_url_to_string (camel_url, CAMEL_URL_HIDE_ALL); camel_url_free (camel_url); @@ -311,7 +311,7 @@ add_account_esources (ExchangeAccount *account, !e_source_list_add_group (tasks_source_list, tasks_source_group, -1)) { goto done; } - for ( ; folders != NULL ; folders = g_slist_next (folders)) { + for (; folders != NULL; folders = g_slist_next (folders)) { /* Create source for each folder and add to the group */ folder = folders->data; @@ -537,7 +537,7 @@ remove_account_esource (ExchangeAccount *account, groups = e_source_list_peek_groups (source_list); found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -545,7 +545,7 @@ remove_account_esource (ExchangeAccount *account, strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { source = E_SOURCE (sources->data); source_uid = e_source_peek_uid (source); @@ -1193,7 +1193,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (c_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1203,7 +1203,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (t_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1213,7 +1213,7 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl groups = e_source_list_peek_groups (a_source_list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (!strcmp (e_source_group_peek_name (group), old_name)) { e_source_group_set_name (group, new_name); @@ -1252,7 +1252,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS); groups = e_source_list_peek_groups (sl); - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -1260,7 +1260,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *absolute_uri; @@ -1372,7 +1372,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco groups = e_source_list_peek_groups (source_list); found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 @@ -1380,7 +1380,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { source = E_SOURCE (sources->data); source_uid = e_source_peek_uid (source); diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index b4ef8c43ad..5ecc02e0b1 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -472,7 +472,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) -1); } -static int +static gint get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter) { GtkTreeSelection *selection; diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c index 03d7ac7aa9..7113ef8e64 100644 --- a/plugins/exchange-operations/exchange-folder-permission.c +++ b/plugins/exchange-operations/exchange-folder-permission.c @@ -181,7 +181,7 @@ org_gnome_exchange_folder_permissions (EPlugin *ep, EMPopupTargetFolder *target) if (! g_strrstr (target->uri, "exchange://") || !exchange_account_get_folder (account, fixed_path)) { g_free (fixed_path); - return ; + return; } g_free (fixed_path); diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c index 9537f592a3..87f851a8c8 100644 --- a/plugins/exchange-operations/exchange-mail-send-options.c +++ b/plugins/exchange-operations/exchange-mail-send-options.c @@ -185,8 +185,8 @@ org_gnome_exchange_send_options (EPlugin *ep, EMEventTargetComposer *target) e_msg_composer_set_send_options (composer, TRUE); /*disply the send options dialog*/ if (!dialog) { - g_print ("New dialog\n\n") ; - dialog = exchange_sendoptions_dialog_new () ; + g_print ("New dialog\n\n"); + dialog = exchange_sendoptions_dialog_new (); } exchange_sendoptions_dialog_run (dialog, GTK_WIDGET (composer)); g_signal_connect (dialog, "sod_response", G_CALLBACK (append_to_header), GTK_WIDGET (composer)); diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index 5de844ba7f..3b4518f5fa 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -46,7 +46,7 @@ ExchangeConfigListenerStatus exchange_is_offline (gint *mode); gboolean exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize); gboolean exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri); -void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection) ; +void exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection); void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result); diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c index e44056abb8..cc707ab65e 100644 --- a/plugins/exchange-operations/exchange-send-options.c +++ b/plugins/exchange-operations/exchange-send-options.c @@ -87,7 +87,7 @@ static guint signals[LAST_SIGNAL] = {0}; /* exchange_send_options_get_widgets_data(ExchangeSendOptionsDialog *sod) Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned. */ -static int +static gint exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod) { ExchangeSendOptionsDialogPrivate *priv; diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h index 8a6d37d947..f41ac85371 100644 --- a/plugins/exchange-operations/exchange-send-options.h +++ b/plugins/exchange-operations/exchange-send-options.h @@ -63,7 +63,7 @@ typedef struct { const gchar *delegate_name; const gchar *delegate_email; const gchar *delegate_address; -} ExchangeSendOptions ; +} ExchangeSendOptions; struct _ExchangeSendOptionsDialog { GObject object; diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 10cfdb4fd6..5d8ae3bfcd 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -228,7 +228,7 @@ async_external_editor (EMsgComposer *composer) g_idle_add ((GSourceFunc) run_error_dialog, "org.gnome.evolution.plugins.external-editor:no-temp-file"); g_idle_add ((GSourceFunc) enable_composer, composer); - return ; + return; } gconf = gconf_client_get_default (); @@ -253,7 +253,7 @@ async_external_editor (EMsgComposer *composer) g_free (filename); g_free (editor_cmd_line); - return ; + return; } g_free (editor_cmd_line); @@ -264,7 +264,7 @@ async_external_editor (EMsgComposer *composer) #endif d(printf ("\n\nsome problem here with external editor\n\n")); g_idle_add ((GSourceFunc) enable_composer, composer); - return ; + return; } else { gchar *buf; @@ -294,7 +294,7 @@ static void launch_editor (GtkAction *action, EMsgComposer *composer) if (editor_running()) { d(printf("not opening editor, because it's still running\n")); - return ; + return; } disable_composer (composer); diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index 93b4ee9876..d475bf8036 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -137,7 +137,7 @@ sanitize_user_mail (const gchar *user) if (!is_email (user)) { return g_strconcat (user, "%40gmail.com", NULL); } else { - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (user) + 2)); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2)); gchar *at = strchr (user, '@'); strncpy (tmp, user, at - user); @@ -183,7 +183,7 @@ is_default_uri (const gchar *given_uri, const gchar *username) res = g_ascii_strcasecmp (given_uri, uri) == 0; else { const gchar *last; - gchar *tmp = g_malloc0 (sizeof (char) * (1 + strlen (given_uri) + (2 * ats))); + gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (given_uri) + (2 * ats))); last = given_uri; for (at = strchr (last, '@'); at; at = strchr (at + 1, '@')) { diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c index 99679ebd18..a86eeaae9e 100644 --- a/plugins/groupwise-account-setup/camel-gw-listener.c +++ b/plugins/groupwise-account-setup/camel-gw-listener.c @@ -106,7 +106,7 @@ finalize (GObject *object) g_free (config_listener->priv); } - for ( list = g_list_first (groupwise_accounts); list ; list = g_list_next (list) ) { + for ( list = g_list_first (groupwise_accounts); list; list = g_list_next (list) ) { info = (GwAccountInfo *) (list->data); @@ -142,7 +142,7 @@ static GwAccountInfo* lookup_account_info (const gchar *key) { GList *list; - GwAccountInfo *info ; + GwAccountInfo *info; gint found = 0; if (!key) @@ -175,7 +175,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na ESourceGroup *group; ESource *source; GConfClient* client; - GSList *ids, *temp ; + GSList *ids, *temp; const gchar *source_selection_key; gchar *relative_uri; const gchar *soap_port; @@ -282,14 +282,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), group_name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -363,14 +363,14 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -697,7 +697,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ url = camel_url_new (account->source->url, NULL); if (url == NULL) - return ; + return; poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return; @@ -715,7 +715,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ delete_group = TRUE; group = NULL; found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if ( strcmp ( e_source_group_peek_base_uri(group), old_base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) { @@ -782,7 +782,7 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info) found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { group = E_SOURCE_GROUP (groups->data); if ( strcmp ( e_source_group_peek_base_uri (group), base_uri) == 0 && strcmp (e_source_group_peek_name (group), existing_account_info->name) == 0) { @@ -994,13 +994,13 @@ camel_gw_listener_construct (CamelGwListener *config_listener) { EIterator *iter; EAccount *account; - GwAccountInfo *info ; + GwAccountInfo *info; prune_proxies (); config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); - for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { + for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) { account = E_ACCOUNT (e_iterator_get (iter)); diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 549c75da61..8899b17653 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -55,14 +55,14 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); - for ( ; groups != NULL; groups = g_slist_next (groups)) { + for (; groups != NULL; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), name) == 0 && strcmp (e_source_group_peek_base_uri (group), GROUPWISE_BASE_URI) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); if (a->source->auto_check) { diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index ae0c5e1e8a..4ee5af017e 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -43,7 +43,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target) if (strncmp (uri_text, "groupwise", 9)) { g_free (uri_text); - return ; + return; } e_source_set_property (source, "auth-domain", "Groupwise"); relative_uri = g_strconcat (";", e_source_peek_name (source), NULL); diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index dc13fad256..68cbaf6f9d 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -132,7 +132,7 @@ org_gnome_junk_settings(EPlugin *ep, EMPopupTargetSelect *t) static gint first = 0; if (! g_strrstr (t->uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index cc735feee1..23c3820130 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -142,11 +142,11 @@ find_node(GList *list, gchar *match) JunkEntry *one_entry = NULL; EGwJunkEntry *ent = NULL; GList *tmp; - gint i ; + gint i; if(list){ tmp = g_list_first(list); - for(i=0; tmp ; i++) + for(i=0; tmp; i++) { one_entry = tmp->data; ent = one_entry->entry; diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 7007ba5760..9e2920d6ab 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -115,5 +115,5 @@ void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t) e_popup_add_items (t->target.popup, menus, NULL, popup_free, t->folder); } - return ; + return; } diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 05b3452091..05d22bedce 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -41,7 +41,7 @@ #include "misc/e-send-options.h" -static ESendOptionsDialog * dialog = NULL ; +static ESendOptionsDialog * dialog = NULL; void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t); @@ -69,12 +69,12 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) if (state == GTK_RESPONSE_OK) { if (dialog->data->gopts->reply_enabled) { if (dialog->data->gopts->reply_convenient) - e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ) ; + e_msg_composer_add_header (comp, X_REPLY_CONVENIENT ,"1" ); else if (dialog->data->gopts->reply_within) { time_t t; t = add_day_to_time (time (NULL), dialog->data->gopts->reply_within); strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t)); - e_msg_composer_add_header (comp, X_REPLY_WITHIN , value) ; + e_msg_composer_add_header (comp, X_REPLY_WITHIN , value); } } @@ -83,33 +83,33 @@ feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) time_t t; t = add_day_to_time (time (NULL), dialog->data->gopts->expire_after); strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&t)); - e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value) ; + e_msg_composer_add_header (comp, X_EXPIRE_AFTER, value); } } if (dialog->data->gopts->delay_enabled) { strftime (value, 17, "%Y%m%dT%H%M%SZ", gmtime (&dialog->data->gopts->delay_until)); - e_msg_composer_add_header (comp, X_DELAY_UNTIL, value) ; + e_msg_composer_add_header (comp, X_DELAY_UNTIL, value); } /*Status Tracking Options*/ if (dialog->data->sopts->tracking_enabled) { - temp = g_strdup_printf ("%d",dialog->data->sopts->track_when) ; - e_msg_composer_add_header (comp, X_TRACK_WHEN, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->track_when); + e_msg_composer_add_header (comp, X_TRACK_WHEN, temp); + g_free (temp); } if (dialog->data->sopts->autodelete) { - e_msg_composer_add_header (comp, X_AUTODELETE, "1") ; + e_msg_composer_add_header (comp, X_AUTODELETE, "1"); } if (dialog->data->sopts->opened) { - temp = g_strdup_printf ("%d",dialog->data->sopts->opened) ; - e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->opened); + e_msg_composer_add_header (comp, X_RETURN_NOTIFY_OPEN, temp); + g_free (temp); } if (dialog->data->sopts->declined) { - temp = g_strdup_printf ("%d",dialog->data->sopts->declined) ; - e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp) ; - g_free (temp) ; + temp = g_strdup_printf ("%d",dialog->data->sopts->declined); + e_msg_composer_add_header (comp, X_RETURN_NOTIFY_DELETE, temp); + g_free (temp); } if (dialog->data->gopts->priority) { @@ -142,7 +142,7 @@ void org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) { - EMsgComposer *comp = (struct _EMsgComposer *)t->composer ; + EMsgComposer *comp = (struct _EMsgComposer *)t->composer; EComposerHeaderTable *table; EAccount *account = NULL; gchar *temp = NULL; @@ -152,17 +152,17 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t) if (!account) return; - temp = strstr (account->transport->url, "groupwise") ; + temp = strstr (account->transport->url, "groupwise"); if (!temp) { return; } e_msg_composer_set_send_options (comp, TRUE); /* display the send options dialog */ if (!dialog) { - g_print ("New dialog\n\n") ; - dialog = e_sendoptions_dialog_new () ; + g_print ("New dialog\n\n"); + dialog = e_sendoptions_dialog_new (); } - e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL) ; + e_sendoptions_dialog_run (dialog, GTK_WIDGET (comp), E_ITEM_MAIL); g_signal_connect (dialog, "sod_response", G_CALLBACK (feed_input_data), comp); diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c index 57eba9392c..5a8a991288 100644 --- a/plugins/groupwise-features/process-meeting.c +++ b/plugins/groupwise-features/process-meeting.c @@ -85,7 +85,7 @@ org_gnome_accept (EPlugin *ep, ECalPopupTargetSelect *target) return; if (! g_strrstr (uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { @@ -347,7 +347,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target) return; if (! g_strrstr (uri, "groupwise://")) - return ; + return; comp = e_cal_component_new (); e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp)); @@ -451,7 +451,7 @@ retract_object (gpointer val) } g_free (rid); - free_thread_data (data) ; + free_thread_data (data); return GINT_TO_POINTER (0); } @@ -466,7 +466,7 @@ object_created_cb (CompEditor *ce, gpointer data) response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL); if (response == GTK_RESPONSE_NO) { - free_thread_data (data) ; + free_thread_data (data); return; } diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index ad15f051d0..20d477a345 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -175,7 +175,7 @@ proxy_login_new (void) return prd; } -static int +static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password) { const gchar *failed_auth; @@ -309,9 +309,9 @@ proxy_soap_login (gchar *email) EAccount *srcAccount; EAccount *dstAccount; EGwConnection *proxy_cnc, *cnc; - CamelURL *uri = NULL, *parent = NULL ; + CamelURL *uri = NULL, *parent = NULL; gchar *password = NULL, *user_name = NULL; - gchar *proxy_source_url = NULL, *parent_source_url = NULL ; + gchar *proxy_source_url = NULL, *parent_source_url = NULL; gchar *name; gint i; gint permissions = 0; diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 44c82610d6..7f526f8389 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -251,7 +251,7 @@ proxy_dialog_new (void) return prd; } -static int +static gint proxy_get_permissions_from_dialog (EAccount *account) { gint permissions; @@ -301,7 +301,7 @@ proxy_get_permissions_from_dialog (EAccount *account) return permissions; } -static int +static gint proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog) { GtkTreeIter iter; diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index c3036d1da3..b75d9abebb 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -328,7 +328,7 @@ static void send_options_copy_check_changed (EGwSendOptions *n_opts) { EGwSendOptionsGeneral *ggopts, *o_gopts; - EGwSendOptionsStatusTracking *gmopts, *o_gmopts ; + EGwSendOptionsStatusTracking *gmopts, *o_gmopts; EGwSendOptionsStatusTracking *gcopts, *o_gcopts; EGwSendOptionsStatusTracking *gtopts, *o_gtopts; diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index c7c315c7f0..50bb6fccf3 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -159,7 +159,7 @@ static void create_folder_done (struct _EMCreateFolder *m) { struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; - CamelStore *store = CAMEL_STORE (m->store) ; + CamelStore *store = CAMEL_STORE (m->store); EGwConnection *ccnc; if (m->done) { @@ -207,7 +207,7 @@ new_folder_created_cb (struct _EMCreateFolder *m, gpointer user_data) g_object_unref (emfs); } -static int +static gint create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct _EMCreateFolder *m, gpointer user_data), gpointer user_data) { gchar *name, *namebuf = NULL; @@ -332,7 +332,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi); camel_object_unref (store); - return ; + return; } @@ -355,7 +355,7 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t) if (! g_strrstr (t->uri, "groupwise://")) - return ; + return; /* for translation*/ if (!first) { @@ -378,7 +378,7 @@ create_shared_folder(EPopup *ep, EPopupItem *p, gpointer data) EMFolderTreeModel *model; EMFolderTree *folder_tree; - GtkWidget *dialog ; + GtkWidget *dialog; gchar *uri; model = mail_component_peek_tree_model (mail_component_peek ()); diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 2b12d4be9b..87404db6bc 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -133,7 +133,7 @@ free_user_node(EShUsers *user) g_free(user->email); user->email = NULL; } - return ; + return; } static void @@ -144,7 +144,7 @@ free_node(SharedUser *usr) g_free(user->email); user->email = NULL; } - return ; + return; } static SharedUser * @@ -153,11 +153,11 @@ find_node(GList *list, gchar *email) SharedUser *user = NULL; EShUsers *usr = NULL; GList *tmp; - gint i ; + gint i; if(list){ tmp = g_list_first(list); - for(i=0; tmp ; i++) + for(i=0; tmp; i++) { user = tmp->data; usr = user->user_node; @@ -346,7 +346,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) if (!g_ascii_strcasecmp (email, "" )) { e_error_run (NULL, "org.gnome.evolution.mail_shared_folder:no-user",NULL); - return ; + return; } @@ -354,7 +354,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) if (sf->users_list && email){ new_user = find_node (sf->users_list, (gchar *)email); if (new_user) - return ; + return; } usr = g_new0 (EShUsers, 1); @@ -586,7 +586,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) path = gtk_tree_path_new_from_string (arg1); if (!gtk_tree_model_get_iter ((GtkTreeModel *) sf->model, &(sf->iter), path)){ gtk_tree_path_free (path); - return ; + return; } gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1); usr = find_node(sf->users_list, email); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index 2569cbebd7..d9173e09e2 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -64,18 +64,18 @@ static void track_status (EPopup *ep, EPopupItem *item, gpointer data) { EMPopupTargetSelect *t = (EMPopupTargetSelect *)data; - CamelMimeMessage *msg = NULL ; - const CamelInternetAddress *from ; - const gchar *namep, *addp ; + CamelMimeMessage *msg = NULL; + const CamelInternetAddress *from; + const gchar *namep, *addp; - GtkDialog *d ; - GtkTable *table ; + GtkDialog *d; + GtkTable *table; GtkWidget *widget; GtkScrolledWindow *win; GtkVBox *vbox; - time_t time ; - gchar *time_str ; + time_t time; + gchar *time_str; gchar *boldmsg; @@ -87,8 +87,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) /*Get message*/ msg = camel_folder_get_message (t->folder, g_ptr_array_index (t->uids, 0), NULL); if (!msg) { - g_print ("Error!! No message\n") ; - return ; + g_print ("Error!! No message\n"); + return; } /*Create the dialog*/ @@ -120,8 +120,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) row++; /*From*/ - from = camel_mime_message_get_from (msg) ; - camel_internet_address_get (from, 0, &namep, &addp) ; + from = camel_mime_message_get_from (msg); + camel_internet_address_get (from, 0, &namep, &addp); boldmsg = g_strdup_printf ("<b>%s</b>", _("From:")); widget = gtk_label_new (boldmsg); g_free (boldmsg); @@ -134,8 +134,8 @@ track_status (EPopup *ep, EPopupItem *item, gpointer data) row++; /*creation date*/ - time = camel_mime_message_get_date (msg, NULL) ; - time_str = ctime (&time) ; + time = camel_mime_message_get_date (msg, NULL); + time_str = ctime (&time); time_str[strlen(time_str)-1] = '\0' ; boldmsg = g_strdup_printf ("<b>%s</b>", _("Creation date:")); widget = gtk_label_new (boldmsg); diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index d5a17b7893..818c6a5e14 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -101,7 +101,7 @@ finalize (GObject *object) g_free (config_listener->priv); } - for ( list = g_list_first (hula_accounts); list ; list = g_list_next (list) ) { + for ( list = g_list_first (hula_accounts); list; list = g_list_next (list) ) { info = (HulaAccountInfo *) (list->data); @@ -147,7 +147,7 @@ static HulaAccountInfo* lookup_account_info (const gchar *key) { GList *list; - HulaAccountInfo *info ; + HulaAccountInfo *info; gint found = 0; if (!key) @@ -176,7 +176,7 @@ add_esource (const gchar *conf_key, const gchar *group_name, const gchar *sourc ESourceGroup *group; ESource *source; GConfClient *client; - GSList *ids, *temp ; + GSList *ids, *temp; gboolean result; gchar *source_selection_key; gchar *relative_uri; @@ -253,14 +253,14 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); if (strcmp (e_source_group_peek_name (group), group_name) == 0 && strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) { GSList *sources = e_source_group_peek_sources (group); - for( ; sources != NULL; sources = g_slist_next (sources)) { + for(; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -325,7 +325,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const found_group = FALSE; - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + for (; groups != NULL && !found_group; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); @@ -333,7 +333,7 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) { GSList *sources = e_source_group_peek_sources (group); - for ( ; sources != NULL; sources = g_slist_next (sources)) { + for (; sources != NULL; sources = g_slist_next (sources)) { ESource *source = E_SOURCE (sources->data); const gchar *source_relative_uri; @@ -544,11 +544,11 @@ camel_hula_listener_construct (CamelHulaListener *config_listener) { EIterator *iter; EAccount *account; - HulaAccountInfo *info ; + HulaAccountInfo *info; config_listener->priv->account_list = e_account_list_new (config_listener->priv->gconf_client); - for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ) ; e_iterator_is_valid (iter); e_iterator_next (iter) ) { + for ( iter = e_list_get_iterator (E_LIST ( config_listener->priv->account_list) ); e_iterator_is_valid (iter); e_iterator_next (iter) ) { account = E_ACCOUNT (e_iterator_get (iter)); diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c index 5f518dece6..8c930eb82b 100644 --- a/plugins/ipod-sync/sync.c +++ b/plugins/ipod-sync/sync.c @@ -159,7 +159,7 @@ write_to_ipod (GString *str, gchar *path, gchar *filename) guchar *utf8; gunichar2 *utf16; guchar bom[2] = {0xFF, 0xFE}; - int i, count; + gint i, count; output_path = g_build_path (G_DIR_SEPARATOR_S, ipod_info.mount_point, diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index c2fe0e163a..5007bf6541 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -145,8 +145,8 @@ format_date_and_time_x (struct tm *date_tm, gboolean use_24_hour_format, gboolean show_midnight, gboolean show_zero_seconds, - char *buffer, - int buffer_size) + gchar *buffer, + gint buffer_size) { gchar *format; struct tm tomorrow_tm, week_tm; diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c index c7feb024b0..76b1e42da1 100644 --- a/plugins/mono/mono-plugin.c +++ b/plugins/mono/mono-plugin.c @@ -159,13 +159,13 @@ epm_invoke(EPlugin *ep, const gchar *name, gpointer data) if (res) { gpointer *p = mono_object_unbox(res); - d(printf("mono method returned '%p' %ld\n", *p, (long int)*p)); + d(printf("mono method returned '%p' %ld\n", *p, (long gint)*p)); return *p; } else return NULL; } -static int +static gint epm_construct(EPlugin *ep, xmlNodePtr root) { if (((EPluginClass *)epm_parent_class)->construct(ep, root) == -1) diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 94984a3560..49e1dffda4 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -40,7 +40,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) if (!fp) { gchar *name; - name = g_strdup_printf("eprofile.%ld", (long int)getpid()); + name = g_strdup_printf("eprofile.%ld", (long gint)getpid()); fp = fopen(name, "w"); if (fp) fprintf(stderr, "Generating profiling data in `%s'\n", name); diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index ac3d8ea6f0..445b5f80bd 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -755,7 +755,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype); } else { gchar *buf = NULL; - size_t size; + gsize size; size = pst_attach_to_mem (&m->pst, attach, &buf); camel_mime_part_set_content (part, (gchar *) buf, size, mimetype); @@ -1617,7 +1617,7 @@ pst_status (CamelOperation *op, const gchar *what, gint pc, gpointer data) g_mutex_unlock (importer->status_lock); } -static int +static gint pst_import (EImport *ei, EImportTarget *target) { PstImporter *m; diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 4650d97375..43e093eff2 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -394,7 +394,7 @@ update_timestamp (EPublishUri *uri) if (uri->last_pub_time) g_free (uri->last_pub_time); - uri->last_pub_time = g_strdup_printf ("%d", (int) time (NULL)); + uri->last_pub_time = g_strdup_printf ("%d", (gint) time (NULL)); uris = g_slist_prepend (uris, e_publish_uri_to_xml (uri)); diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c index aa273ae264..0a03809e97 100644 --- a/plugins/python/python-plugin-loader.c +++ b/plugins/python/python-plugin-loader.c @@ -69,7 +69,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data) if (p->pModule == NULL) { pModuleName = PyString_FromString(epp->module_name); - PyRun_SimpleString(g_strdup_printf ("import sys ; sys.path.insert(0, '%s')", epp->location)); + PyRun_SimpleString(g_strdup_printf ("import sys; sys.path.insert(0, '%s')", epp->location)); p->pModule = PyImport_Import(pModuleName); @@ -114,7 +114,7 @@ epp_invoke(EPlugin *ep, const gchar *name, gpointer data) return NULL; } -static int +static gint epp_construct(EPlugin *ep, xmlNodePtr root) { if (((EPluginClass *)epp_parent_class)->construct(ep, root) == -1) diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index d7123dc4e7..5736786725 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -103,7 +103,7 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE; gchar *em_junk_sa_spamc_gconf_binary = NULL; gchar *em_junk_sa_spamd_gconf_binary = NULL; -static int +static gint pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gint rv_err, gint wait_for_termination, GByteArray *output_buffer, GError **error) { gint result, status, errnosav, fds[2], out_fds[2]; @@ -253,7 +253,7 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin return 0; } -static int +static gint pipe_to_sa (CamelMimeMessage *msg, const gchar *in, const gchar **argv, GError **error) { return pipe_to_sa_full (msg, in, argv, -1, 1, NULL, error); @@ -513,7 +513,7 @@ em_junk_sa_is_available (GError **error) /* While we're at it, see if spamd is running with --allow-tell */ if (!em_junk_sa_allow_tell_tested) - em_junk_sa_test_allow_tell () ; + em_junk_sa_test_allow_tell (); pthread_mutex_unlock (&em_junk_sa_init_lock); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 95a3c1e361..53669ba347 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -550,7 +550,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data) camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC)); camel_mime_part_set_content((CamelMimePart *)new, - cont, (int) g_utf8_strlen(cont, -1), "text"); + cont, (gint) g_utf8_strlen(cont, -1), "text"); /* Create the composer */ em_utils_edit_message (new, templates_folder); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index cd706e694e..3ad583c2a7 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -223,7 +223,7 @@ void processTnef(TNEFStruct *tnef) { gint foundCal=0; FILE *fptr; - ifilename = (gchar *) g_malloc(sizeof(char) * 256); + ifilename = (gchar *) g_malloc(sizeof(gchar) * 256); /* First see if this requires special processing. */ /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */ @@ -940,7 +940,7 @@ void saveVCalendar(TNEFStruct *tnef) { if (filename!=NULL) { fprintf(fptr, "UID:"); for(index=0;index<filename->size;index++) { - fprintf(fptr,"%02X", (unsigned char)filename->data[index]); + fprintf(fptr,"%02X", (guchar)filename->data[index]); } fprintf(fptr,"\n"); } @@ -950,7 +950,7 @@ void saveVCalendar(TNEFStruct *tnef) { if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_LONG, 0x8201))) != MAPI_UNDEFINED) { ddword_ptr = (DDWORD*)filename->data; - fprintf(fptr, "SEQUENCE:%i\n", (int) *ddword_ptr); + fprintf(fptr, "SEQUENCE:%i\n", (gint) *ddword_ptr); } if ((filename=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY))) |