diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/google-account-setup/google-contacts-source.c | 481 | ||||
-rw-r--r-- | plugins/groupwise-features/junk-mail-settings.c | 4 | ||||
-rw-r--r-- | plugins/groupwise-features/mail-send-options.c | 8 | ||||
-rw-r--r-- | plugins/groupwise-features/status-track.c | 11 | ||||
-rw-r--r-- | plugins/image-inline/image-inline.c | 13 | ||||
-rw-r--r-- | plugins/save-calendar/csv-format.c | 26 |
6 files changed, 286 insertions, 257 deletions
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 43f4f14c3f..d7554ebe10 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -41,164 +41,167 @@ void ensure_google_contacts_source_group (void) { ESourceList *source_list; + const gchar *key; - source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); + key = "/apps/evolution/addressbook/sources"; + source_list = e_source_list_new_for_gconf_default (key); - if (source_list == NULL) { + if (source_list == NULL) return; - } - e_source_list_ensure_group (source_list, _("Google"), "google://", FALSE); + e_source_list_ensure_group ( + source_list, _("Google"), "google://", FALSE); g_object_unref (source_list); } void remove_google_contacts_source_group (void) { - ESourceList *source_list; - ESourceGroup *group; + ESourceList *source_list; + ESourceGroup *group; + const gchar *key; - source_list = e_source_list_new_for_gconf_default ("/apps/evolution/addressbook/sources"); + key = "/apps/evolution/addressbook/sources"; + source_list = e_source_list_new_for_gconf_default (key); - if (source_list == NULL) { - return; - } + if (source_list == NULL) + return; - group = e_source_list_peek_group_by_base_uri (source_list, "google://"); + group = e_source_list_peek_group_by_base_uri (source_list, "google://"); - if (group) { - GSList *sources; + if (group) { + GSList *sources; - sources = e_source_group_peek_sources (group); + sources = e_source_group_peek_sources (group); - if (NULL == sources) { - e_source_list_remove_group (source_list, group); - e_source_list_sync (source_list, NULL); - } - } - g_object_unref (source_list); + if (NULL == sources) { + e_source_list_remove_group (source_list, group); + e_source_list_sync (source_list, NULL); + } + } + g_object_unref (source_list); } static void on_username_entry_changed (GtkEntry *entry, gpointer user_data) { - ESource *source = user_data; - const gchar *text; - gchar *username; - - text = gtk_entry_get_text (entry); - - if (strstr (text, "@")) { - username = g_strdup (text); - } else { - username = g_strdup_printf ("%s@gmail.com", text); - } - - e_source_set_relative_uri (source, username); - e_source_set_property (source, "username", username); - e_source_set_property (source, "auth", "plain/password"); - g_free (username); + ESource *source = user_data; + const gchar *text; + gchar *username; + + text = gtk_entry_get_text (entry); + + if (strstr (text, "@")) { + username = g_strdup (text); + } else { + username = g_strdup_printf ("%s@gmail.com", text); + } + + e_source_set_relative_uri (source, username); + e_source_set_property (source, "username", username); + e_source_set_property (source, "auth", "plain/password"); + g_free (username); } static void on_ssl_cb_toggled (GtkToggleButton *tb, gpointer user_data) { - ESource *source = user_data; + ESource *source = user_data; - if (gtk_toggle_button_get_active (tb)) { - e_source_set_property (source, "use-ssl", "true"); - } else { - e_source_set_property (source, "use-ssl", "false"); - } + if (gtk_toggle_button_get_active (tb)) { + e_source_set_property (source, "use-ssl", "true"); + } else { + e_source_set_property (source, "use-ssl", "false"); + } } typedef enum { - MINUTES, - HOURS, - DAYS, - WEEKS + MINUTES, + HOURS, + DAYS, + WEEKS } IntervalType; static void seconds_to_interval (guint seconds, IntervalType *type, gint *time) { - gint minutes = seconds / 60; - - *type = MINUTES; - *time = minutes; - if (minutes && !(minutes % 10080)) { - *type = WEEKS; - *time = minutes / 10080; - } else if (minutes && !(minutes % 1440)) { - *type = DAYS; - *time = minutes / 1440; - } else if (minutes && !(minutes % 60)) { - *type = HOURS; - *time = minutes / 60; - } + gint minutes = seconds / 60; + + *type = MINUTES; + *time = minutes; + if (minutes && !(minutes % 10080)) { + *type = WEEKS; + *time = minutes / 10080; + } else if (minutes && !(minutes % 1440)) { + *type = DAYS; + *time = minutes / 1440; + } else if (minutes && !(minutes % 60)) { + *type = HOURS; + *time = minutes / 60; + } } static guint interval_to_seconds (IntervalType type, gint time) { - switch (type) { - case MINUTES: - return time * 60; - case HOURS: - return time * 60 * 60; - case DAYS: - return time * 60 * 60 * 24; - case WEEKS: - return time * 60 * 60 * 24 * 7; - default: - g_warning ("Time unit out of range"); - break; - } - return 0; + switch (type) { + case MINUTES: + return time * 60; + case HOURS: + return time * 60 * 60; + case DAYS: + return time * 60 * 60 * 24; + case WEEKS: + return time * 60 * 60 * 24 * 7; + default: + g_warning ("Time unit out of range"); + break; + } + return 0; } static void on_interval_sb_value_changed (GtkSpinButton *sb, gpointer user_data) { - ESource *source = user_data; - gdouble time; - guint seconds; - gchar *value_string; - GtkWidget *interval_combo; - IntervalType type; + ESource *source = user_data; + gdouble time; + guint seconds; + gchar *value_string; + GtkWidget *interval_combo; + IntervalType type; - interval_combo = g_object_get_data (G_OBJECT (sb), "interval-combo"); - type = gtk_combo_box_get_active (GTK_COMBO_BOX (interval_combo)); + interval_combo = g_object_get_data (G_OBJECT (sb), "interval-combo"); + type = gtk_combo_box_get_active (GTK_COMBO_BOX (interval_combo)); - time = gtk_spin_button_get_value (sb); + time = gtk_spin_button_get_value (sb); - seconds = interval_to_seconds (type, time); + seconds = interval_to_seconds (type, time); - value_string = g_strdup_printf ("%u", seconds); - e_source_set_property (source, "refresh-interval", value_string); - g_free (value_string); + value_string = g_strdup_printf ("%u", seconds); + e_source_set_property (source, "refresh-interval", value_string); + g_free (value_string); } static void on_interval_combo_changed (GtkComboBox *combo, gpointer user_data) { - ESource *source = user_data; - gdouble time; - guint seconds; - gchar *value_string; - GtkWidget *sb; - IntervalType type; + ESource *source = user_data; + gdouble time; + guint seconds; + gchar *value_string; + GtkWidget *sb; + IntervalType type; - sb = g_object_get_data (G_OBJECT (combo), "interval-sb"); - type = gtk_combo_box_get_active (combo); + sb = g_object_get_data (G_OBJECT (combo), "interval-sb"); + type = gtk_combo_box_get_active (combo); - time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (sb)); + time = gtk_spin_button_get_value (GTK_SPIN_BUTTON (sb)); - seconds = interval_to_seconds (type, time); + seconds = interval_to_seconds (type, time); - value_string = g_strdup_printf ("%u", seconds); - e_source_set_property (source, "refresh-interval", value_string); - g_free (value_string); + value_string = g_strdup_printf ("%u", seconds); + e_source_set_property (source, "refresh-interval", value_string); + g_free (value_string); } struct ui_data { @@ -217,146 +220,146 @@ destroy_ui_data(gpointer data) } GtkWidget * -plugin_google_contacts (EPlugin *epl, +plugin_google_contacts (EPlugin *epl, EConfigHookItemFactoryData *data) { - EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; - ESource *source; - ESourceGroup *group; - const gchar *base_uri; - const gchar *username; - const gchar *refresh_interval_str; - guint refresh_interval; - const gchar *use_ssl_str; - gboolean use_ssl; - GtkWidget *parent; - GtkWidget *vbox; - - GtkWidget *section; - GtkWidget *vbox2; - - GtkWidget *hbox; - GtkWidget *spacer; - GtkWidget *label; - GtkWidget *username_entry; - - GtkWidget *interval_sb; - GtkWidget *interval_combo; - IntervalType type; - gint time; - - GtkWidget *ssl_cb; - struct ui_data *ui; - - source = t->source; - group = e_source_peek_group (source); - - base_uri = e_source_group_peek_base_uri (group); - - g_object_set_data (G_OBJECT (epl), "gwidget", NULL); - - if (g_ascii_strncasecmp ("google://", base_uri, 9) != 0) { - return NULL; - } - - /* Build up the UI */ - parent = data->parent; - vbox = gtk_widget_get_ancestor (gtk_widget_get_parent (parent), GTK_TYPE_VBOX); - - vbox2 = gtk_vbox_new (FALSE, 6); - gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); - - section = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (section), _("<b>Server</b>")); - gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0); - gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0); - - hbox = gtk_hbox_new (FALSE, 10); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); - - spacer = gtk_label_new (" "); - gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); - - label = gtk_label_new_with_mnemonic (_("User_name:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - - username_entry = gtk_entry_new (); - username = e_source_get_property (source, "username"); - if (username) { - gtk_entry_set_text (GTK_ENTRY (username_entry), username); - } - gtk_box_pack_start (GTK_BOX (hbox), username_entry, TRUE, TRUE, 0); - - hbox = gtk_hbox_new (FALSE, 10); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); - - spacer = gtk_label_new (" "); - gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); - - use_ssl_str = e_source_get_property (source, "use-ssl"); - if (use_ssl_str && ('1' == use_ssl_str[0] || - 0 == g_ascii_strcasecmp (use_ssl_str, "true"))) { - use_ssl = 1; - } else { - use_ssl = 0; - } - ssl_cb = gtk_check_button_new_with_mnemonic (_("Use _SSL")); - gtk_box_pack_start (GTK_BOX (hbox), ssl_cb, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ssl_cb), - use_ssl); - - hbox = gtk_hbox_new (FALSE, 10); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); - - spacer = gtk_label_new (" "); - gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); - - refresh_interval_str = e_source_get_property (source, "refresh-interval"); - if (refresh_interval_str && - (1 == sscanf (refresh_interval_str, "%u", &refresh_interval))) { - } else { - refresh_interval = -1; - } - seconds_to_interval (refresh_interval, &type, &time); - - label = gtk_label_new_with_mnemonic (_("Re_fresh:")); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); - - interval_sb = gtk_spin_button_new_with_range (1, 100, 1); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb), time); - gtk_box_pack_start (GTK_BOX (hbox), interval_sb, FALSE, FALSE, 0); - - interval_combo = gtk_combo_box_new_text (); - gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("minutes")); - gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("hours")); - gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("days")); - gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("weeks")); - gtk_combo_box_set_active (GTK_COMBO_BOX (interval_combo), type); - gtk_box_pack_start (GTK_BOX (hbox), interval_combo, FALSE, FALSE, 0); - - gtk_widget_show_all (vbox2); - - g_object_set_data (G_OBJECT (interval_sb), "interval-combo", interval_combo); - g_object_set_data (G_OBJECT (interval_combo), "interval-sb", interval_sb); - - ui = g_malloc0 (sizeof (struct ui_data)); - ui->widget = vbox2; - g_object_set_data_full(G_OBJECT(epl), "gwidget", ui, destroy_ui_data); - g_signal_connect (ui->widget, "destroy", G_CALLBACK (gtk_widget_destroyed), &ui->widget); - - g_signal_connect (G_OBJECT (username_entry), "changed", - G_CALLBACK (on_username_entry_changed), - source); - g_signal_connect (G_OBJECT (interval_combo), "changed", - G_CALLBACK (on_interval_combo_changed), - source); - g_signal_connect (G_OBJECT (ssl_cb), "toggled", - G_CALLBACK (on_ssl_cb_toggled), - source); - g_signal_connect (G_OBJECT (interval_sb), "value-changed", - G_CALLBACK (on_interval_sb_value_changed), - source); - - return NULL; + EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; + ESource *source; + ESourceGroup *group; + const gchar *base_uri; + const gchar *username; + const gchar *refresh_interval_str; + guint refresh_interval; + const gchar *use_ssl_str; + gboolean use_ssl; + GtkWidget *parent; + GtkWidget *vbox; + + GtkWidget *section; + GtkWidget *vbox2; + + GtkWidget *hbox; + GtkWidget *spacer; + GtkWidget *label; + GtkWidget *username_entry; + + GtkWidget *interval_sb; + GtkWidget *interval_combo; + IntervalType type; + gint time; + + GtkWidget *ssl_cb; + struct ui_data *ui; + + source = t->source; + group = e_source_peek_group (source); + + base_uri = e_source_group_peek_base_uri (group); + + g_object_set_data (G_OBJECT (epl), "gwidget", NULL); + + if (g_ascii_strncasecmp ("google://", base_uri, 9) != 0) + return NULL; + + /* Build up the UI */ + parent = data->parent; + vbox = gtk_widget_get_ancestor ( + gtk_widget_get_parent (parent), GTK_TYPE_VBOX); + + vbox2 = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); + + section = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (section), _("<b>Server</b>")); + gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0); + gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0); + + hbox = gtk_hbox_new (FALSE, 10); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); + + spacer = gtk_label_new (" "); + gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); + + label = gtk_label_new_with_mnemonic (_("User_name:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + username_entry = gtk_entry_new (); + username = e_source_get_property (source, "username"); + if (username) + gtk_entry_set_text (GTK_ENTRY (username_entry), username); + gtk_box_pack_start (GTK_BOX (hbox), username_entry, TRUE, TRUE, 0); + + hbox = gtk_hbox_new (FALSE, 10); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); + + spacer = gtk_label_new (" "); + gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); + + use_ssl_str = e_source_get_property (source, "use-ssl"); + if (use_ssl_str && ('1' == use_ssl_str[0] || + 0 == g_ascii_strcasecmp (use_ssl_str, "true"))) { + use_ssl = 1; + } else { + use_ssl = 0; + } + ssl_cb = gtk_check_button_new_with_mnemonic (_("Use _SSL")); + gtk_box_pack_start (GTK_BOX (hbox), ssl_cb, FALSE, FALSE, 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ssl_cb), use_ssl); + + hbox = gtk_hbox_new (FALSE, 10); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, TRUE, TRUE, 0); + + spacer = gtk_label_new (" "); + gtk_box_pack_start (GTK_BOX (hbox), spacer, FALSE, FALSE, 0); + + refresh_interval_str = e_source_get_property (source, "refresh-interval"); + if (refresh_interval_str && + (1 == sscanf (refresh_interval_str, "%u", &refresh_interval))) { + } else { + refresh_interval = -1; + } + seconds_to_interval (refresh_interval, &type, &time); + + label = gtk_label_new_with_mnemonic (_("Re_fresh:")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + + interval_sb = gtk_spin_button_new_with_range (1, 100, 1); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (interval_sb), time); + gtk_box_pack_start (GTK_BOX (hbox), interval_sb, FALSE, FALSE, 0); + + interval_combo = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("minutes")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("hours")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("days")); + gtk_combo_box_append_text (GTK_COMBO_BOX (interval_combo), _("weeks")); + gtk_combo_box_set_active (GTK_COMBO_BOX (interval_combo), type); + gtk_box_pack_start (GTK_BOX (hbox), interval_combo, FALSE, FALSE, 0); + + gtk_widget_show_all (vbox2); + + g_object_set_data (G_OBJECT (interval_sb), "interval-combo", interval_combo); + g_object_set_data (G_OBJECT (interval_combo), "interval-sb", interval_sb); + + ui = g_malloc0 (sizeof (struct ui_data)); + ui->widget = vbox2; + g_object_set_data_full(G_OBJECT(epl), "gwidget", ui, destroy_ui_data); + g_signal_connect ( + ui->widget, "destroy", + G_CALLBACK (gtk_widget_destroyed), &ui->widget); + + g_signal_connect ( + username_entry, "changed", + G_CALLBACK (on_username_entry_changed), source); + g_signal_connect ( + interval_combo, "changed", + G_CALLBACK (on_interval_combo_changed), source); + g_signal_connect ( + ssl_cb, "toggled", + G_CALLBACK (on_ssl_cb_toggled), source); + g_signal_connect ( + interval_sb, "value-changed", + G_CALLBACK (on_interval_sb_value_changed), source); + + return NULL; } diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 61a5cb0ac9..b868e28c5a 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -104,7 +104,9 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) while (page_count > 0 ) { notebook = gtk_notebook_new (); gtk_notebook_append_page ((GtkNotebook *)notebook, box, NULL); - gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dialog)->vbox, notebook, TRUE, TRUE, 0); + gtk_box_pack_start ( + (GtkBox *) ((GtkDialog *) dialog)->vbox, + notebook, TRUE, TRUE, 0); } if (page_count == 0) diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 1db2209f4b..d6c6f32095 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -156,6 +156,7 @@ from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer) { GtkActionGroup *group; GtkAction *action; + EAccount *account; g_return_if_fail (header != NULL); g_return_if_fail (composer != NULL); @@ -166,7 +167,8 @@ from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer) action = gtk_action_group_get_action (group, "gw-send-options"); g_return_if_fail (action != NULL); - gtk_action_set_visible (action, account_is_groupwise (e_composer_from_header_get_active (header))); + account = e_composer_from_header_get_active (header); + gtk_action_set_visible (action, account_is_groupwise (account)); } static void @@ -216,7 +218,9 @@ gw_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer) header = e_composer_header_table_get_header (headers, E_COMPOSER_HEADER_FROM); from_changed_cb (E_COMPOSER_FROM_HEADER (header), composer); - g_signal_connect (G_OBJECT (header), "changed", G_CALLBACK (from_changed_cb), composer); + g_signal_connect ( + header, "changed", + G_CALLBACK (from_changed_cb), composer); return TRUE; } diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index f1b05ea477..d8cddd03fe 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -60,7 +60,9 @@ format_date (const gchar * value) } static CamelMimeMessage * -get_selected_message (EShellView *shell_view, CamelFolder **folder, gchar **selected_uid) +get_selected_message (EShellView *shell_view, + CamelFolder **folder, + gchar **selected_uid) { CamelMimeMessage *msg = NULL; EShellContent *shell_content; @@ -85,7 +87,8 @@ get_selected_message (EShellView *shell_view, CamelFolder **folder, gchar **sele } void -gw_track_message_status_cb (GtkAction *action, EShellView *shell_view) +gw_track_message_status_cb (GtkAction *action, + EShellView *shell_view) { CamelMimeMessage *msg = NULL; CamelFolder *folder = NULL; @@ -188,7 +191,9 @@ gw_track_message_status_cb (GtkAction *action, EShellView *shell_view) if (E_IS_GW_CONNECTION(cnc)) { GSList *recipient_list; - e_gw_connection_get_item (cnc, get_container_id (cnc, "Sent Items"), selected_uid, "distribution recipientStatus", &gwitem); + e_gw_connection_get_item ( + cnc, get_container_id (cnc, "Sent Items"), + selected_uid, "distribution recipientStatus", &gwitem); recipient_list = e_gw_item_get_recipient_list (gwitem); for (;recipient_list != NULL; recipient_list = recipient_list->next) { diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c index d3aa595951..fdff39a921 100644 --- a/plugins/image-inline/image-inline.c +++ b/plugins/image-inline/image-inline.c @@ -278,12 +278,17 @@ org_gnome_image_inline_pobject_free (EMFormatHTMLPObject *object) if (image_object->widget != NULL) { GtkWidget *parent; - g_signal_handlers_disconnect_by_func (image_object->widget, button_press_press_cb, image_object); - g_signal_handlers_disconnect_by_func (image_object->widget, drag_data_get_cb, image_object); + g_signal_handlers_disconnect_by_func ( + image_object->widget, + button_press_press_cb, image_object); + g_signal_handlers_disconnect_by_func ( + image_object->widget, + drag_data_get_cb, image_object); parent = gtk_widget_get_parent (image_object->widget); - if (parent) - g_signal_handlers_disconnect_by_func (parent, size_allocate_cb, image_object); + if (parent != NULL) + g_signal_handlers_disconnect_by_func ( + parent, size_allocate_cb, image_object); g_object_unref (image_object->widget); image_object->widget = NULL; diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index a5256c4c36..c3f566de4b 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -57,8 +57,10 @@ display_error_message (GtkWidget *parent, GError *error) { GtkWidget *dialog; - dialog = gtk_message_dialog_new (GTK_WINDOW (parent), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, - "%s", error->message); + dialog = gtk_message_dialog_new ( + GTK_WINDOW (parent), 0, + GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + "%s", error->message); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -135,10 +137,12 @@ add_nummeric_to_csv (GString *line, gint *nummeric, CsvConfig *config) */ if (nummeric) - g_string_append_printf (line, "%s%d", (*nummeric<10 && *nummeric>-1)?"0":"", *nummeric); + g_string_append_printf ( + line, "%s%d", + (*nummeric < 10 && *nummeric > -1) ? "0" : "", + *nummeric); - line = g_string_append (line, config->delimiter); - return line; + return g_string_append (line, config->delimiter); } static GString * @@ -295,7 +299,10 @@ userstring_to_systemstring (const gchar *userstring) } static void -do_save_calendar_csv (FormatHandler *handler, ESourceSelector *selector, ECalSourceType type, gchar *dest_uri) +do_save_calendar_csv (FormatHandler *handler, + ESourceSelector *selector, + ECalSourceType type, + gchar *dest_uri) { /* @@ -341,7 +348,9 @@ do_save_calendar_csv (FormatHandler *handler, ESourceSelector *selector, ECalSou config->quote = userstring_to_systemstring (tmp?tmp:"\""); config->header = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (d->header_check)); - stream = open_for_writing (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (selector))), dest_uri, &error); + stream = open_for_writing ( + GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (selector))), + dest_uri, &error); if (stream && e_cal_get_object_list_as_comp (source_client, "#t", &objects, NULL)) { @@ -517,7 +526,8 @@ static GtkWidget * create_options_widget (FormatHandler *handler) { GtkWidget *table = gtk_table_new (4, 2, FALSE), *label = NULL, - *csv_options = gtk_expander_new_with_mnemonic (_("A_dvanced options for the CSV format")), + *csv_options = gtk_expander_new_with_mnemonic ( + _("A_dvanced options for the CSV format")), *vbox = gtk_vbox_new (FALSE, 0); CsvPluginData *d = handler->data; |