diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/addressbook-file/addressbook-file.c | 2 | ||||
-rw-r--r-- | plugins/audio-inline/audio-inline.c | 4 | ||||
-rw-r--r-- | plugins/bogo-junk-plugin/bf-junk-filter.c | 2 | ||||
-rw-r--r-- | plugins/caldav/caldav-source.c | 2 | ||||
-rw-r--r-- | plugins/email-custom-header/email-custom-header.c | 52 | ||||
-rw-r--r-- | plugins/email-custom-header/email-custom-header.h | 4 | ||||
-rw-r--r-- | plugins/google-account-setup/google-source.c | 2 | ||||
-rw-r--r-- | plugins/groupwise-features/camel-gw-listener.c | 64 | ||||
-rw-r--r-- | plugins/groupwise-features/groupwise-account-setup.c | 6 | ||||
-rw-r--r-- | plugins/groupwise-features/proxy-login.c | 6 | ||||
-rw-r--r-- | plugins/groupwise-features/proxy.c | 20 | ||||
-rw-r--r-- | plugins/groupwise-features/send-options.c | 4 | ||||
-rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 80 | ||||
-rw-r--r-- | plugins/sa-junk-plugin/em-junk-filter.c | 2 | ||||
-rw-r--r-- | plugins/save-calendar/csv-format.c | 6 | ||||
-rw-r--r-- | plugins/tnef-attachments/tnef-plugin.c | 88 |
16 files changed, 172 insertions, 172 deletions
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c index 0adcf9a701..cb742588e3 100644 --- a/plugins/addressbook-file/addressbook-file.c +++ b/plugins/addressbook-file/addressbook-file.c @@ -43,7 +43,7 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data) gchar *uri_text; const gchar *relative_uri; - uri_text = e_source_get_uri (source); + uri_text = e_source_get_uri (source); if (strncmp (uri_text, "file", 4)) { g_free (uri_text); diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 3aebff938e..a454709757 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -244,9 +244,9 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob } } - gst_element_get_state (po->playbin, &cur_state, NULL, 0); + gst_element_get_state (po->playbin, &cur_state, NULL, 0); - if (cur_state >= GST_STATE_PAUSED) { + if (cur_state >= GST_STATE_PAUSED) { gst_element_set_state (po->playbin, GST_STATE_READY); } diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index ddaf200af2..7d479ce611 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -401,7 +401,7 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) - return data->old; + return data->old; check = gtk_check_button_new_with_mnemonic (_("Convert message text to _Unicode")); diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c index 6f50ae4dcb..ec15c70453 100644 --- a/plugins/caldav/caldav-source.c +++ b/plugins/caldav/caldav-source.c @@ -248,7 +248,7 @@ oge_caldav (EPlugin *epl, user, "changed", G_CALLBACK (user_changed_cb), source); - g_free (uri); + g_free (uri); g_free (username); mail = e_plugin_util_add_entry (parent, _("User e-_mail:"), source, "usermail"); diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index 24e76e3d6c..23f474c5ef 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -83,7 +83,7 @@ GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, st gint e_plugin_lib_enable (EPlugin *ep, gint enable) { - return 0; + return 0; } static void @@ -335,8 +335,8 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) /* To create an empty label widget. Text will be added dynamically. */ priv->header_type_name_label = gtk_label_new (""); temp_header_ptr = &g_array_index (priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id); - str = (temp_header_ptr->header_type_value)->str; - if (strcmp (str, security_field) == 0) + str = (temp_header_ptr->header_type_value)->str; + if (strcmp (str, security_field) == 0) str = g_dpgettext2 (GETTEXT_PACKAGE, "email-custom-header-Security", security_field); gtk_label_set_markup (GTK_LABEL (priv->header_type_name_label), str); @@ -351,7 +351,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) } for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; - sub_index++,row_combo++,column_combo++) { + sub_index++,row_combo++,column_combo++) { temp = &g_array_index (priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index); sub_combo_box_ptr = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,sub_index); @@ -485,25 +485,25 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp static void epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) { - EMsgComposer *composer; - EmailCustomHeaderWindow *new_email_custom_header_window = NULL; - CustomHeaderOptionsDialog *current_dialog = NULL; + EMsgComposer *composer; + EmailCustomHeaderWindow *new_email_custom_header_window = NULL; + CustomHeaderOptionsDialog *current_dialog = NULL; - composer = (EMsgComposer *) user_data; + composer = (EMsgComposer *) user_data; - if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) + if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data)) return; new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); - if (new_email_custom_header_window) { + if (new_email_custom_header_window) { current_dialog = new_email_custom_header_window->epech_dialog; - } + } - if (current_dialog) { + if (current_dialog) { g_free (current_dialog); current_dialog = NULL; - } + } if (new_email_custom_header_window) { g_free (new_email_custom_header_window); @@ -526,12 +526,12 @@ epech_check_existing_composer_window (gconstpointer compowindow, gconstpointer o static void destroy_compo_data (gpointer data) { - EmailCustomHeaderWindow *compo_data = (EmailCustomHeaderWindow *) data; + EmailCustomHeaderWindow *compo_data = (EmailCustomHeaderWindow *) data; - if (!compo_data) - return; + if (!compo_data) + return; - g_free (compo_data); + g_free (compo_data); } static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *composer) @@ -554,10 +554,10 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp } else { dialog = epech_dialog_new (); if (dialog) { - EmailCustomHeaderWindow *new_email_custom_header_window; - new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1); - new_email_custom_header_window->epech_window = window; - new_email_custom_header_window->epech_dialog = dialog; + EmailCustomHeaderWindow *new_email_custom_header_window; + new_email_custom_header_window = g_new0 (EmailCustomHeaderWindow, 1); + new_email_custom_header_window->epech_window = window; + new_email_custom_header_window->epech_dialog = dialog; g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data); } } @@ -613,12 +613,12 @@ commit_changes (ConfigData *cd) -1); /* Check if the keyword is not empty */ - if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) { - if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { + if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) { + if ((value) && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { keyword = g_strconcat (keyword, "=", value, NULL); - } - header_config_list = g_slist_append (header_config_list, g_strdup (keyword)); - } + } + header_config_list = g_slist_append (header_config_list, g_strdup (keyword)); + } g_free (keyword); g_free (value); diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h index ac2b8f1204..00fa2ef763 100644 --- a/plugins/email-custom-header/email-custom-header.h +++ b/plugins/email-custom-header/email-custom-header.h @@ -65,8 +65,8 @@ struct _CustomHeaderOptionsDialogClass { typedef struct _EmailCustomHeaderWindow { - GdkWindow *epech_window; - CustomHeaderOptionsDialog *epech_dialog; + GdkWindow *epech_window; + CustomHeaderOptionsDialog *epech_dialog; }EmailCustomHeaderWindow; enum { diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c index b5865c7780..335aece2e5 100644 --- a/plugins/google-account-setup/google-source.c +++ b/plugins/google-account-setup/google-source.c @@ -119,7 +119,7 @@ static gboolean is_email (const gchar *address) { /* This is supposed to check if the address's domain could be - an FQDN but alas, it's not worth the pain and suffering. */ + an FQDN but alas, it's not worth the pain and suffering. */ const gchar *at; at = strchr (address, '@'); diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index fff8af3dd1..ff00f50913 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -143,17 +143,17 @@ static GwAccountInfo* lookup_account_info (const gchar *key) { GList *list; - GwAccountInfo *info; + GwAccountInfo *info; gint found = 0; - if (!key) - return NULL; + if (!key) + return NULL; info = NULL; - for (list = g_list_first (groupwise_accounts); list; list = g_list_next (list)) { - info = (GwAccountInfo *) (list->data); - found = (strcmp (info->uid, key) == 0); + for (list = g_list_first (groupwise_accounts); list; list = g_list_next (list)) { + info = (GwAccountInfo *) (list->data); + found = (strcmp (info->uid, key) == 0); if (found) break; } @@ -175,7 +175,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na ESourceList *source_list; ESourceGroup *group; ESource *source; - GConfClient* client; + GConfClient* client; GSList *ids, *temp; const gchar *source_selection_key; gchar *relative_uri; @@ -268,15 +268,15 @@ static void remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri) { ESourceList *list; - GSList *groups; + GSList *groups; gboolean found_group; GConfClient* client; GSList *ids; GSList *node_tobe_deleted; const gchar *source_selection_key; - client = gconf_client_get_default (); - list = e_source_list_new_for_gconf (client, conf_key); + client = gconf_client_get_default (); + list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); found_group = FALSE; @@ -339,7 +339,7 @@ static void modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccount *a, CamelURL *new_url) { ESourceList *list; - GSList *groups; + GSList *groups; gchar *old_relative_uri; CamelURL *url; gboolean found_group; @@ -356,7 +356,7 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun old_relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address); client = gconf_client_get_default (); - list = e_source_list_new_for_gconf (client, conf_key); + list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); found_group = FALSE; @@ -456,7 +456,7 @@ static GList* get_addressbook_names_from_server (gchar *source_url) { gchar *key; - EGwConnection *cnc; + EGwConnection *cnc; gchar *password; GList *book_list = NULL; gint status, count = 0; @@ -472,15 +472,15 @@ get_addressbook_names_from_server (gchar *source_url) guint32 flags = E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET; url = camel_url_new (source_url, NULL); - if (url == NULL) { - return NULL; - } + if (url == NULL) { + return NULL; + } poa_address = url->host; if (!poa_address || strlen (poa_address) ==0) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -571,8 +571,8 @@ add_addressbook_sources (EAccount *account) { CamelURL *url; ESourceList *list; - ESourceGroup *group; - ESource *source; + ESourceGroup *group; + ESource *source; gchar *base_uri; const gchar *soap_port; GList *books_list, *temp_list; @@ -581,7 +581,7 @@ add_addressbook_sources (EAccount *account) const gchar *poa_address; gboolean is_frequent_contacts = FALSE, is_writable = FALSE; - url = camel_url_new (account->source->url, NULL); + url = camel_url_new (account->source->url, NULL); if (url == NULL) { return FALSE; } @@ -663,7 +663,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ { CamelURL *url; ESourceList *list; - ESourceGroup *group; + ESourceGroup *group; GSList *groups; gboolean found_group; gboolean delete_group; @@ -746,7 +746,7 @@ static void remove_addressbook_sources (GwAccountInfo *existing_account_info) { ESourceList *list; - ESourceGroup *group; + ESourceGroup *group; GSList *groups; gboolean found_group; CamelURL *url; @@ -841,7 +841,7 @@ account_removed (EAccountList *account_listener, EAccount *account) g_free (info->uid); g_free (info->name); g_free (info->source_url); - g_free (info); + g_free (info); } static void @@ -1014,15 +1014,15 @@ camel_gw_listener_get_type (void) if (!camel_gw_listener_type) { static GTypeInfo info = { - sizeof (CamelGwListenerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) camel_gw_listener_class_init, - NULL, NULL, - sizeof (CamelGwListener), - 0, - (GInstanceInitFunc) camel_gw_listener_init - }; + sizeof (CamelGwListenerClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) camel_gw_listener_class_init, + NULL, NULL, + sizeof (CamelGwListener), + 0, + (GInstanceInitFunc) camel_gw_listener_init + }; camel_gw_listener_type = g_type_register_static (PARENT_TYPE, "CamelGwListener", &info, 0); } diff --git a/plugins/groupwise-features/groupwise-account-setup.c b/plugins/groupwise-features/groupwise-account-setup.c index 4cd8c3ca56..335a3b525e 100644 --- a/plugins/groupwise-features/groupwise-account-setup.c +++ b/plugins/groupwise-features/groupwise-account-setup.c @@ -50,9 +50,9 @@ static void set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gchar *name) { ESourceList *list; - GSList *groups; + GSList *groups; - list = e_source_list_new_for_gconf (client, path); + list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); for (; groups != NULL; groups = g_slist_next (groups)) { @@ -84,7 +84,7 @@ set_esource_props (const gchar *path, EAccount *a, GConfClient *client, const gc void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target) { - GConfClient* client; + GConfClient* client; EAccountList *al; EIterator *it; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index e40771295b..61e32216a4 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -159,7 +159,7 @@ proxy_login_get_type (void) }; type = g_type_register_static (G_TYPE_OBJECT, "proxyLoginType", - &info, 0); + &info, 0); } return type; @@ -192,7 +192,7 @@ proxy_get_password (EAccount *account, gchar **user_name, gchar **password) return 0; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -235,7 +235,7 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 3d350232db..555d3f716b 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -233,7 +233,7 @@ proxy_dialog_get_type (void) type = g_type_register_static (G_TYPE_OBJECT, "proxyDialogType", - &info, 0); + &info, 0); } return type; @@ -477,7 +477,7 @@ proxy_get_cnc (EAccount *account, GtkWindow *parent_window) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -853,7 +853,7 @@ static void proxy_remove_account (GtkWidget *button, EAccount *account) { GtkTreeIter iter; - GtkTreeModel *model; + GtkTreeModel *model; proxyDialogPrivate *priv; proxyHandler *deleted; GtkTreeSelection* account_select; @@ -864,8 +864,8 @@ proxy_remove_account (GtkWidget *button, EAccount *account) priv = prd->priv; account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); - if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { - gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); + if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { + gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; deleted = proxy_get_item_from_list (account, account_mailid); @@ -873,7 +873,7 @@ proxy_remove_account (GtkWidget *button, EAccount *account) deleted->flags |= E_GW_PROXY_DELETED; proxy_update_tree_view (account); - } + } } static void @@ -998,7 +998,7 @@ static void proxy_edit_account (GtkWidget *button, EAccount *account) { GtkTreeIter iter; - GtkTreeModel *model; + GtkTreeModel *model; proxyDialogPrivate *priv; GtkTreeSelection* account_select; proxyHandler *edited; @@ -1014,8 +1014,8 @@ proxy_edit_account (GtkWidget *button, EAccount *account) account_select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->tree)); - if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { - gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); + if (gtk_tree_selection_get_selected (account_select, &model, &iter)) { + gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; edited = proxy_get_item_from_list (account, account_mailid); if (edited) { @@ -1034,5 +1034,5 @@ proxy_edit_account (GtkWidget *button, EAccount *account) gtk_widget_hide (contacts); gtk_widget_show (GTK_WIDGET (priv->main)); } - } + } } diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index a3c08ca90c..8b0aa48b55 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -67,7 +67,7 @@ get_cnc (GtkWindow *parent_window) return NULL; soap_port = camel_url_get_param (url, "soap_port"); - if (!soap_port || strlen (soap_port) == 0) + if (!soap_port || strlen (soap_port) == 0) soap_port = "7191"; use_ssl = camel_url_get_param (url, "use_ssl"); @@ -350,7 +350,7 @@ send_options_copy_check_changed (EGwSendOptions *n_opts) e_send_options_copy_status_options (sod->data->copts, gcopts); e_send_options_copy_status_options (sod->data->topts, gtopts); - if (check_general_changed (ggopts, o_gopts)) + if (check_general_changed (ggopts, o_gopts)) changed = TRUE; if (check_status_options_changed (gmopts, o_gmopts)) changed = TRUE; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 149d1652c7..a401865c0e 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -730,7 +730,7 @@ find_cal_opened_cb (ECal *ecal, const GError *error, gpointer data) * Replies only make sense for events with an organizer. */ if (!e_cal_get_static_capability (ecal, CAL_STATIC_CAPABILITY_SAVE_SCHEDULES) && - (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && + (pitip->method == ICAL_METHOD_PUBLISH || pitip->method == ICAL_METHOD_REQUEST) && pitip->has_organizer) { rsvp_enabled = TRUE; } @@ -848,7 +848,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp) sources = e_source_group_peek_sources (group); for (m = sources; m; m = m->next) { - gchar *source_uri = NULL; + gchar *source_uri = NULL; source = m->data; @@ -2036,7 +2036,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) /*FIXME Save schedules is misused here, remove it */ save_schedules = e_cal_get_static_capability (pitip->current_ecal, - CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); + CAL_STATIC_CAPABILITY_SAVE_SCHEDULES); switch (response) { case ITIP_VIEW_RESPONSE_ACCEPT: @@ -2153,40 +2153,40 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) if (!save_schedules && pitip->delete_message && pitip->folder) camel_folder_delete_message (pitip->folder, pitip->uid); - if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { - ECalComponent *comp = NULL; - icalcomponent *ical_comp; - icalvalue *value; - const gchar *attendee, *comment; - GSList *l, *list = NULL; + if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) { + ECalComponent *comp = NULL; + icalcomponent *ical_comp; + icalvalue *value; + const gchar *attendee, *comment; + GSList *l, *list = NULL; gboolean found; - comp = e_cal_component_clone (pitip->comp); - if (comp == NULL) - return; + comp = e_cal_component_clone (pitip->comp); + if (comp == NULL) + return; - if (pitip->to_address == NULL) - find_to_address (pitip, pitip->ical_comp, NULL); - g_assert (pitip->to_address != NULL); + if (pitip->to_address == NULL) + find_to_address (pitip, pitip->ical_comp, NULL); + g_assert (pitip->to_address != NULL); - ical_comp = e_cal_component_get_icalcomponent (comp); + ical_comp = e_cal_component_get_icalcomponent (comp); /* Remove all attendees except the one we are responding as */ found = FALSE; - for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY); - prop != NULL; - prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) - { - gchar *text; - - value = icalproperty_get_value (prop); - if (!value) - continue; + for (prop = icalcomponent_get_first_property (ical_comp, ICAL_ATTENDEE_PROPERTY); + prop != NULL; + prop = icalcomponent_get_next_property (ical_comp, ICAL_ATTENDEE_PROPERTY)) + { + gchar *text; + + value = icalproperty_get_value (prop); + if (!value) + continue; - attendee = icalvalue_get_string (value); + attendee = icalvalue_get_string (value); - text = g_strdup (itip_strip_mailto (attendee)); - text = g_strstrip (text); + text = g_strdup (itip_strip_mailto (attendee)); + text = g_strstrip (text); /* We do this to ensure there is at most one * attendee in the response */ @@ -2194,15 +2194,15 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) list = g_slist_prepend (list, prop); else if (!g_ascii_strcasecmp (pitip->to_address, text)) found = TRUE; - g_free (text); - } + g_free (text); + } - for (l = list; l; l = l->next) { - prop = l->data; - icalcomponent_remove_property (ical_comp, prop); - icalproperty_free (prop); - } - g_slist_free (list); + for (l = list; l; l = l->next) { + prop = l->data; + icalcomponent_remove_property (ical_comp, prop); + icalproperty_free (prop); + } + g_slist_free (list); /* Add a comment if there user set one */ comment = itip_view_get_rsvp_comment (ITIP_VIEW (pitip->view)); @@ -2219,17 +2219,17 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) e_cal_component_set_comment_list (comp, &comments); } - e_cal_component_rescan (comp); - if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL, TRUE, FALSE) && pitip->folder) { + e_cal_component_rescan (comp); + if (itip_send_comp (E_CAL_COMPONENT_METHOD_REPLY, comp, pitip->current_ecal, pitip->top_level, NULL, NULL, TRUE, FALSE) && pitip->folder) { camel_folder_set_message_flags ( pitip->folder, pitip->uid, CAMEL_MESSAGE_ANSWERED, CAMEL_MESSAGE_ANSWERED); } - g_object_unref (comp); + g_object_unref (comp); - } + } } static gboolean diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 830a10563b..ed52242ade 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -942,7 +942,7 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact g_object_get (data->parent, "n-rows", &n_rows, NULL); if (data->old) - return data->old; + return data->old; check = gtk_check_button_new_with_mnemonic (_("I_nclude remote tests")); label = gtk_label_new (NULL); diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index 6b147d88a2..a91c813799 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -281,9 +281,9 @@ userstring_to_systemstring (const gchar *userstring) i++; break; case 't': - str = g_string_append_c (str, '\t'); - i++; - break; + str = g_string_append_c (str, '\t'); + i++; + break; } } else { str = g_string_append_c (str, text[i]); diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 9828b60e7d..e25bff8afc 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -100,14 +100,14 @@ org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) g_object_unref (out); /* Extracting the winmail.dat */ - TNEFInitialize (&tnef); + TNEFInitialize (&tnef); tnef.Debug = verbose; - if (TNEFParseFile (name, &tnef) == -1) { + if (TNEFParseFile (name, &tnef) == -1) { printf("ERROR processing file\n"); - } + } processTnef (&tnef, tmpdir); - TNEFFree (&tnef); + TNEFFree (&tnef); /* Extraction done */ dir = opendir (tmpdir); @@ -772,7 +772,7 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) variableLength *filename; if (size < 0x1F) { - return; + return; } fprintf(fptr, "RRULE:FREQ="); @@ -780,63 +780,63 @@ void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) if (recur_data[0x04] == 0x0A) { fprintf(fptr, "DAILY"); - if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 || - recur_data[0x16] == 0x21) { - if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), - PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) { + if (recur_data[0x16] == 0x23 || recur_data[0x16] == 0x22 || + recur_data[0x16] == 0x21) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_I2, 0x0011))) != MAPI_UNDEFINED) { fprintf(fptr, ";INTERVAL=%d", *(filename->data)); - } - if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) { + } + if (recur_data[0x16] == 0x22 || recur_data[0x16] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1B], recur_data[0x1A])); - } - } else if (recur_data[0x16] == 0x3E) { + getRruleCount (recur_data[0x1B], recur_data[0x1A])); + } + } else if (recur_data[0x16] == 0x3E) { fprintf(fptr, ";BYDAY=MO,TU,WE,TH,FR"); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1F], recur_data[0x1E])); - } - } + getRruleCount (recur_data[0x1F], recur_data[0x1E])); + } + } } else if (recur_data[0x04] == 0x0B) { fprintf(fptr, "WEEKLY;INTERVAL=%d;BYDAY=%s", - recur_data[0x0E], getRruleDayname (recur_data[0x16])); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + recur_data[0x0E], getRruleDayname (recur_data[0x16])); + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", - getRruleCount (recur_data[0x1F], recur_data[0x1E])); - } + getRruleCount (recur_data[0x1F], recur_data[0x1E])); + } } else if (recur_data[0x04] == 0x0C) { fprintf(fptr, "MONTHLY"); - if (recur_data[0x06] == 0x02) { + if (recur_data[0x06] == 0x02) { fprintf(fptr, ";INTERVAL=%d;BYMONTHDAY=%d", recur_data[0x0E], - recur_data[0x16]); - if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { + recur_data[0x16]); + if (recur_data[0x1A] == 0x22 || recur_data[0x1A] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x1F], - recur_data[0x1E])); - } - } else if (recur_data[0x06] == 0x03) { + recur_data[0x1E])); + } + } else if (recur_data[0x06] == 0x03) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d", - getRruleDayname (recur_data[0x16]), - recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A], - recur_data[0x0E]); - if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { + getRruleDayname (recur_data[0x16]), + recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A], + recur_data[0x0E]); + if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23], - recur_data[0x22])); - } - } + recur_data[0x22])); + } + } } else if (recur_data[0x04] == 0x0D) { fprintf(fptr, "YEARLY;BYMONTH=%d", - getRruleMonthNum (recur_data[0x0A], recur_data[0x0B])); - if (recur_data[0x06] == 0x02) { + getRruleMonthNum (recur_data[0x0A], recur_data[0x0B])); + if (recur_data[0x06] == 0x02) { fprintf(fptr, ";BYMONTHDAY=%d", recur_data[0x16]); - } else if (recur_data[0x06] == 0x03) { + } else if (recur_data[0x06] == 0x03) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d", - getRruleDayname (recur_data[0x16]), - recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]); - } - if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { + getRruleDayname (recur_data[0x16]), + recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]); + } + if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { fprintf(fptr, ";COUNT=%d", getRruleCount(recur_data[0x23], - recur_data[0x22])); - } + recur_data[0x22])); + } } fprintf(fptr, "\n"); } |