From cd53ba990035bdb4861d9660917d457533d4ecb2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 11 Sep 2010 14:56:28 -0400 Subject: Coding style cleanups. --- plugins/attachment-reminder/attachment-reminder.c | 20 +- plugins/audio-inline/audio-inline.c | 8 +- plugins/backup-restore/backup-restore.c | 16 +- plugins/backup-restore/backup.c | 12 +- plugins/bogo-junk-plugin/bf-junk-filter.c | 6 +- plugins/contacts-map/contacts-map.c | 6 +- plugins/contacts-map/geo-utils.c | 2 +- plugins/dbx-import/dbx-importer.c | 158 +++---- plugins/email-custom-header/email-custom-header.c | 66 +-- plugins/external-editor/external-editor.c | 22 +- .../google-account-setup/google-contacts-source.c | 2 +- plugins/groupwise-features/addressbook-groupwise.c | 2 +- plugins/groupwise-features/camel-gw-listener.c | 18 +- .../groupwise-features/groupwise-account-setup.c | 16 +- plugins/groupwise-features/gw-ui.c | 2 +- plugins/groupwise-features/install-shared.c | 18 +- plugins/groupwise-features/junk-mail-settings.c | 4 +- plugins/groupwise-features/junk-settings.c | 42 +- plugins/groupwise-features/mail-retract.c | 4 +- plugins/groupwise-features/mail-send-options.c | 2 +- plugins/groupwise-features/proxy-login.c | 30 +- plugins/groupwise-features/proxy-login.h | 2 +- plugins/groupwise-features/proxy.c | 42 +- plugins/groupwise-features/proxy.h | 2 +- plugins/groupwise-features/share-folder-common.c | 38 +- plugins/groupwise-features/share-folder.c | 88 ++-- plugins/groupwise-features/share-folder.h | 2 +- plugins/groupwise-features/status-track.c | 28 +- plugins/imap-features/imap-headers.c | 28 +- plugins/itip-formatter/itip-formatter.c | 48 +- plugins/mail-notification/mail-notification.c | 20 +- .../mailing-list-actions/mailing-list-actions.c | 2 +- plugins/mark-all-read/mark-all-read.c | 4 +- plugins/plugin-manager/plugin-manager.c | 2 +- plugins/prefer-plain/prefer-plain.c | 64 +-- plugins/profiler/profiler.c | 4 +- plugins/pst-import/pst-importer.c | 42 +- plugins/publish-calendar/publish-format-fb.c | 2 +- plugins/publish-calendar/url-editor-dialog.c | 60 +-- plugins/sa-junk-plugin/em-junk-filter.c | 18 +- plugins/save-calendar/csv-format.c | 16 +- plugins/save-calendar/rdf-format.c | 2 +- plugins/save-calendar/save-calendar.c | 2 +- plugins/templates/templates.c | 24 +- plugins/tnef-attachments/tnef-plugin.c | 512 ++++++++++----------- .../webdav-account-setup/webdav-contacts-source.c | 90 ++-- 46 files changed, 799 insertions(+), 799 deletions(-) (limited to 'plugins') diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index f93467b8de..25b0ddb514 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -115,17 +115,17 @@ ask_for_missing_attachment (EPlugin *ep, GtkWindow *window) /*Check buttons*/ check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again.")); - gtk_container_set_border_width((GtkContainer *)check, 12); + gtk_container_set_border_width ((GtkContainer *)check, 12); content_area = gtk_dialog_get_content_area (dialog); gtk_box_pack_start (GTK_BOX (content_area), check, TRUE, TRUE, 0); gtk_widget_show (check); response = gtk_dialog_run ((GtkDialog *) dialog); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))) e_plugin_enable (ep, FALSE); - gtk_widget_destroy((GtkWidget *)dialog); + gtk_widget_destroy ((GtkWidget *)dialog); if (response == GTK_RESPONSE_OK) gtk_action_activate (E_COMPOSER_ACTION_ATTACH (window)); @@ -151,7 +151,7 @@ check_for_attachment_clues (gchar *msg) g_object_unref (gconf); msg_length = strlen (msg); - for (list = clue_list;list && !ret_val;list=g_slist_next(list)) { + for (list = clue_list;list && !ret_val;list=g_slist_next (list)) { gchar *needle = g_utf8_strdown (list->data, -1); if (g_strstr_len (msg, msg_length, needle)) { ret_val = TRUE; @@ -226,7 +226,7 @@ commit_changes (UIData *ui) model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1); /* Check if the keyword is not empty */ - if ((keyword) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)) + if ((keyword) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0)) clue_list = g_slist_append (clue_list, keyword); valid = gtk_tree_model_iter_next (model, &iter); } @@ -305,17 +305,17 @@ clue_remove_clicked (GtkButton *button, UIData *ui) /* Get the path and move to the previous node :) */ path = gtk_tree_model_get_path (model, &iter); if (path) - valid = gtk_tree_path_prev(path); + valid = gtk_tree_path_prev (path); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); len = gtk_tree_model_iter_n_children (model, NULL); if (len > 0) { - if (gtk_list_store_iter_is_valid (GTK_LIST_STORE(model), &iter)) { + if (gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), &iter)) { gtk_tree_selection_select_iter (selection, &iter); } else { if (path && valid) { - gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get_iter (model, &iter, path); gtk_tree_selection_select_iter (selection, &iter); } } @@ -324,7 +324,7 @@ clue_remove_clicked (GtkButton *button, UIData *ui) gtk_widget_set_sensitive (ui->clue_remove, FALSE); } - gtk_widget_grab_focus(ui->treeview); + gtk_widget_grab_focus (ui->treeview); gtk_tree_path_free (path); commit_changes (ui); @@ -385,7 +385,7 @@ e_plugin_lib_get_configure_widget (EPlugin *plugin) GtkCellRenderer *renderer; GtkTreeSelection *selection; GtkTreeIter iter; - GConfClient *gconf = gconf_client_get_default(); + GConfClient *gconf = gconf_client_get_default (); GtkWidget *hbox; GSList *clue_list = NULL, *list; diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 46f345974f..994e25b267 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -164,7 +164,7 @@ org_gnome_audio_inline_gst_callback (GstBus * bus, GstMessage * message, gpointe { GstState old_state, new_state; - if (GST_MESSAGE_SRC(message) != GST_OBJECT (po->playbin)) + if (GST_MESSAGE_SRC (message) != GST_OBJECT (po->playbin)) break; gst_message_parse_state_changed (message, &old_state, &new_state, NULL); @@ -231,7 +231,7 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob uri = g_filename_to_uri (po->filename, NULL, NULL); g_object_set (G_OBJECT (po->playbin), "uri", uri, NULL); g_free (uri); - org_gnome_audio_inline_set_audiosink(po->playbin); + org_gnome_audio_inline_set_audiosink (po->playbin); bus = gst_element_get_bus (po->playbin); po->bus_id = gst_bus_add_watch (bus, org_gnome_audio_inline_gst_callback, po); @@ -260,7 +260,7 @@ org_gnome_audio_inline_add_button (GtkWidget *box, const gchar *stock_icon, GCal { GtkWidget *button; - button = gtk_button_new_from_stock(stock_icon); + button = gtk_button_new_from_stock (stock_icon); gtk_widget_set_sensitive (button, sensitive); g_signal_connect (button, "clicked", cb, data); @@ -299,7 +299,7 @@ org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t) d(printf ("audio inline formatter: format classid %s\n", classid)); - pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof(*pobj), classid, + pobj = (struct _org_gnome_audio_inline_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof (*pobj), classid, t->part, org_gnome_audio_inline_button_panel); g_object_ref (t->part); pobj->part = t->part; diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c index 87feab7a25..283079d84d 100644 --- a/plugins/backup-restore/backup-restore.c +++ b/plugins/backup-restore/backup-restore.c @@ -84,7 +84,7 @@ sanity_check (const gchar *filename) gint result; gchar *quotedfname, *toolfname; - quotedfname = g_shell_quote(filename); + quotedfname = g_shell_quote (filename); toolfname = g_build_filename (EVOLUTION_TOOLSDIR, "evolution-backup", NULL); command = g_strdup_printf("%s --check %s", toolfname, quotedfname); @@ -103,7 +103,7 @@ sanity_check (const gchar *filename) } static guint32 -dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, ...) +dialog_prompt_user (GtkWindow *parent, const gchar *string, const gchar *tag, ...) { GtkWidget *mbox, *check = NULL; va_list ap; @@ -111,9 +111,9 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, ... guint32 mask = 0; EAlert *alert = NULL; - va_start(ap, tag); - alert = e_alert_new_valist(tag, ap); - va_end(ap); + va_start (ap, tag); + alert = e_alert_new_valist (tag, ap); + va_end (ap); mbox = e_alert_dialog_new (parent, alert); g_object_unref (alert); @@ -121,7 +121,7 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, ... check = gtk_check_button_new_with_mnemonic (string); /* We should hardcode this to true */ gtk_toggle_button_set_active ((GtkToggleButton *)check, TRUE); - gtk_container_set_border_width((GtkContainer *)check, 12); + gtk_container_set_border_width ((GtkContainer *)check, 12); gtk_box_pack_start ((GtkBox *)gtk_dialog_get_content_area ((GtkDialog *) mbox), check, TRUE, TRUE, 0); gtk_widget_show (check); @@ -129,10 +129,10 @@ dialog_prompt_user(GtkWindow *parent, const gchar *string, const gchar *tag, ... if (button == GTK_RESPONSE_YES) mask |= BR_OK; - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(check))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check))) mask |= BR_START; - gtk_widget_destroy(mbox); + gtk_widget_destroy (mbox); return mask; } diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c index 5b39374b58..104afe7166 100644 --- a/plugins/backup-restore/backup.c +++ b/plugins/backup-restore/backup.c @@ -183,7 +183,7 @@ backup (const gchar *filename) gchar *quotedfname; g_return_if_fail (filename && *filename); - quotedfname = g_shell_quote(filename); + quotedfname = g_shell_quote (filename); CANCEL (complete); txt = _("Shutting down Evolution"); @@ -244,7 +244,7 @@ restore (const gchar *filename) return; } - quotedfname = g_shell_quote(filename); + quotedfname = g_shell_quote (filename); /* FIXME Will the versioned setting always work? */ CANCEL (complete); @@ -296,7 +296,7 @@ check (const gchar *filename) gchar *quotedfname; g_return_val_if_fail (filename && *filename, FALSE); - quotedfname = g_shell_quote(filename); + quotedfname = g_shell_quote (filename); command = g_strdup_printf ("tar ztf %s 1>/dev/null", quotedfname); result = system (command); @@ -353,11 +353,11 @@ thread_start (gpointer data) complete = TRUE; - return GINT_TO_POINTER(result); + return GINT_TO_POINTER (result); } static gboolean -idle_cb(gpointer data) +idle_cb (gpointer data) { if (gui_arg) { /* Show progress dialog */ @@ -476,7 +476,7 @@ main (gint argc, gchar **argv) gtk_container_set_border_width (GTK_CONTAINER (action_area), 0); if (oper && file) - str = g_strdup_printf(oper, file); + str = g_strdup_printf (oper, file); container = gtk_table_new (2, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (container), 12); diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 2bd72f96cd..c335f6d46f 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -205,7 +205,7 @@ retry: if (!only_once) { /* Create wordlist.db */ only_once = TRUE; - init_db(); + init_db (); goto retry; } @@ -350,7 +350,7 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) return 0; first = FALSE; - gconf = gconf_client_get_default(); + gconf = gconf_client_get_default (); gconf_client_add_dir (gconf, em_junk_bf_gconf_dir, @@ -375,7 +375,7 @@ convert_unicode_cb (GtkWidget *widget, gpointer data) { gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - GConfClient *gconf = gconf_client_get_default(); + GConfClient *gconf = gconf_client_get_default (); gconf_client_set_bool (gconf, data, active, NULL); diff --git a/plugins/contacts-map/contacts-map.c b/plugins/contacts-map/contacts-map.c index 868930035d..bb46be65e6 100644 --- a/plugins/contacts-map/contacts-map.c +++ b/plugins/contacts-map/contacts-map.c @@ -150,8 +150,8 @@ show_map_general (ESourceSelector *selector) /* Get the lat & lng and add the marker asynchronously */ i = 0; addr = NULL; - while (!addr && iuri_dest); - target->uri_dest = g_strdup(em_folder_selection_button_get_selection(button)); + g_free (target->uri_dest); + target->uri_dest = g_strdup (em_folder_selection_button_get_selection (button)); } GtkWidget * -org_gnome_evolution_readdbx_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) +org_gnome_evolution_readdbx_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im) { GtkWidget *hbox, *w; GtkLabel *label; @@ -221,24 +221,24 @@ org_gnome_evolution_readdbx_getwidget(EImport *ei, EImportTarget *target, EImpor if (!select_uri) select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX)); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_hbox_new (FALSE, 0); w = gtk_label_new_with_mnemonic (_("_Destination folder:")); - gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6); + gtk_box_pack_start ((GtkBox *)hbox, w, FALSE, TRUE, 6); label = GTK_LABEL (w); - w = em_folder_selection_button_new( + w = em_folder_selection_button_new ( _("Select folder"), _("Select folder to import OE folder into")); gtk_label_set_mnemonic_widget (label, w); em_folder_selection_button_set_selection ((EMFolderSelectionButton *)w, select_uri); folder_selected ((EMFolderSelectionButton *)w, (EImportTargetURI *)target); g_signal_connect (w, "selected", G_CALLBACK(folder_selected), target); - gtk_box_pack_start((GtkBox *)hbox, w, FALSE, TRUE, 6); + gtk_box_pack_start ((GtkBox *)hbox, w, FALSE, TRUE, 6); - w = gtk_vbox_new(FALSE, 0); - gtk_box_pack_start((GtkBox *)w, hbox, FALSE, FALSE, 0); - gtk_widget_show_all(w); + w = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start ((GtkBox *)w, hbox, FALSE, FALSE, 0); + gtk_widget_show_all (w); g_free (select_uri); @@ -290,14 +290,14 @@ struct _dbx_block_hdrstruct { guint32 nextaddress; }; -static gint dbx_pread(gint fd, gpointer buf, guint32 count, guint32 offset) +static gint dbx_pread (gint fd, gpointer buf, guint32 count, guint32 offset) { - if (lseek(fd, offset, SEEK_SET) != offset) + if (lseek (fd, offset, SEEK_SET) != offset) return -1; - return read(fd, buf, count); + return read (fd, buf, count); } -static gboolean dbx_load_index_table(DbxImporter *m, guint32 pos, guint32 *index_ofs) +static gboolean dbx_load_index_table (DbxImporter *m, guint32 pos, guint32 *index_ofs) { struct _dbx_tableindexstruct tindex; struct _dbx_indexstruct index; @@ -305,15 +305,15 @@ static gboolean dbx_load_index_table(DbxImporter *m, guint32 pos, guint32 *index d(printf("Loading index table at 0x%x\n", pos)); - if (dbx_pread(m->dbx_fd, &tindex, sizeof(tindex), pos) != sizeof(tindex)) { + if (dbx_pread (m->dbx_fd, &tindex, sizeof (tindex), pos) != sizeof (tindex)) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read table index from DBX file"); return FALSE; } - tindex.anotherTablePtr = GUINT32_FROM_LE(tindex.anotherTablePtr); - tindex.self = GUINT32_FROM_LE(tindex.self); - tindex.indexCount = GUINT32_FROM_LE(tindex.indexCount); + tindex.anotherTablePtr = GUINT32_FROM_LE (tindex.anotherTablePtr); + tindex.self = GUINT32_FROM_LE (tindex.self); + tindex.indexCount = GUINT32_FROM_LE (tindex.indexCount); if (tindex.self != pos) { g_set_error ( @@ -326,25 +326,25 @@ static gboolean dbx_load_index_table(DbxImporter *m, guint32 pos, guint32 *index d(printf("Index at %x: indexCount %x, anotherTablePtr %x\n", pos, tindex.indexCount, tindex.anotherTablePtr)); if (tindex.indexCount > 0) { - if (!dbx_load_index_table(m, tindex.anotherTablePtr, index_ofs)) + if (!dbx_load_index_table (m, tindex.anotherTablePtr, index_ofs)) return FALSE; } d(printf("Index at %x has ptrCount %d\n", pos, tindex.ptrCount)); - pos += sizeof(tindex); + pos += sizeof (tindex); for (i = 0; i < tindex.ptrCount; i++) { - if (dbx_pread(m->dbx_fd, &index, sizeof(index), pos) != sizeof(index)) { + if (dbx_pread (m->dbx_fd, &index, sizeof (index), pos) != sizeof (index)) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read index entry from DBX file"); return FALSE; } - index.indexptr = GUINT32_FROM_LE(index.indexptr); - index.anotherTablePtr = GUINT32_FROM_LE(index.anotherTablePtr); - index.indexCount = GUINT32_FROM_LE(index.indexCount); + index.indexptr = GUINT32_FROM_LE (index.indexptr); + index.anotherTablePtr = GUINT32_FROM_LE (index.anotherTablePtr); + index.indexCount = GUINT32_FROM_LE (index.indexCount); if (*index_ofs == m->index_count) { g_set_error ( @@ -357,39 +357,39 @@ static gboolean dbx_load_index_table(DbxImporter *m, guint32 pos, guint32 *index } m->indices[(*index_ofs)++] = index.indexptr; if (index.indexCount > 0) { - if (!dbx_load_index_table(m, index.anotherTablePtr, index_ofs)) + if (!dbx_load_index_table (m, index.anotherTablePtr, index_ofs)) return FALSE; } - pos += sizeof(index); + pos += sizeof (index); } return TRUE; } -static gboolean dbx_load_indices(DbxImporter *m) +static gboolean dbx_load_indices (DbxImporter *m) { guint indexptr, itemcount; guint32 index_ofs = 0; - if (dbx_pread(m->dbx_fd, &indexptr, 4, INDEX_POINTER) != 4) { + if (dbx_pread (m->dbx_fd, &indexptr, 4, INDEX_POINTER) != 4) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read first index pointer from DBX file"); return FALSE; } - if (dbx_pread(m->dbx_fd, &itemcount, 4, ITEM_COUNT) != 4) { + if (dbx_pread (m->dbx_fd, &itemcount, 4, ITEM_COUNT) != 4) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read item count from DBX file"); return FALSE; } - indexptr = GUINT32_FROM_LE(indexptr); - m->index_count = itemcount = GUINT32_FROM_LE(itemcount); - m->indices = g_malloc(itemcount * 4); + indexptr = GUINT32_FROM_LE (indexptr); + m->index_count = itemcount = GUINT32_FROM_LE (itemcount); + m->indices = g_malloc (itemcount * 4); d(printf("indexptr %x, itemcount %d\n", indexptr, itemcount)); - if (indexptr && !dbx_load_index_table(m, indexptr, &index_ofs)) + if (indexptr && !dbx_load_index_table (m, indexptr, &index_ofs)) return FALSE; d(printf("Loaded %d of %d indices\n", index_ofs, m->index_count)); @@ -412,15 +412,15 @@ dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) struct _dbx_block_hdrstruct hdr; guint32 buflen = 0x200; - guchar *buffer = g_malloc(buflen); + guchar *buffer = g_malloc (buflen); - ftruncate(bodyfd, 0); - lseek(bodyfd, 0, SEEK_SET); + ftruncate (bodyfd, 0); + lseek (bodyfd, 0, SEEK_SET); while (offset) { d(printf("Reading mail data chunk from %x\n", offset)); - if (dbx_pread(m->dbx_fd, &hdr, sizeof(hdr), offset) != sizeof(hdr)) { + if (dbx_pread (m->dbx_fd, &hdr, sizeof (hdr), offset) != sizeof (hdr)) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, @@ -428,9 +428,9 @@ dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) "DBX file at offset %x", offset); return FALSE; } - hdr.self = GUINT32_FROM_LE(hdr.self); - hdr.blocksize = GUINT16_FROM_LE(hdr.blocksize); - hdr.nextaddress = GUINT32_FROM_LE(hdr.nextaddress); + hdr.self = GUINT32_FROM_LE (hdr.self); + hdr.blocksize = GUINT16_FROM_LE (hdr.blocksize); + hdr.nextaddress = GUINT32_FROM_LE (hdr.nextaddress); if (hdr.self != offset) { g_set_error ( @@ -442,21 +442,21 @@ dbx_read_mail_body (DbxImporter *m, guint32 offset, gint bodyfd) } if (hdr.blocksize > buflen) { - g_free(buffer); + g_free (buffer); buflen = hdr.blocksize; - buffer = g_malloc(buflen); + buffer = g_malloc (buflen); } d(printf("Reading %d bytes from %lx\n", hdr.blocksize, offset + sizeof(hdr))); - if (dbx_pread(m->dbx_fd, buffer, hdr.blocksize, offset + sizeof(hdr)) != hdr.blocksize) { + if (dbx_pread (m->dbx_fd, buffer, hdr.blocksize, offset + sizeof (hdr)) != hdr.blocksize) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read mail data from DBX file " "at offset %lx", - (long)(offset + sizeof(hdr))); + (long)(offset + sizeof (hdr))); return FALSE; } - if (write(bodyfd, buffer, hdr.blocksize) != hdr.blocksize) { + if (write (bodyfd, buffer, hdr.blocksize) != hdr.blocksize) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, @@ -476,15 +476,15 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) guint32 dataptr = 0; gint i; - if (dbx_pread(m->dbx_fd, &hdr, sizeof(hdr), offset) != sizeof(hdr)) { + if (dbx_pread (m->dbx_fd, &hdr, sizeof (hdr), offset) != sizeof (hdr)) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read mail header from DBX file at offset %x", offset); return FALSE; } - hdr.self = GUINT32_FROM_LE(hdr.self); - hdr.size = GUINT32_FROM_LE(hdr.size); + hdr.self = GUINT32_FROM_LE (hdr.self); + hdr.size = GUINT32_FROM_LE (hdr.size); if (hdr.self != offset) { g_set_error ( @@ -493,14 +493,14 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) "point to itself", offset); return FALSE; } - buffer = g_malloc(hdr.size); - offset += sizeof(hdr); - if (dbx_pread(m->dbx_fd, buffer, hdr.size, offset) != hdr.size) { + buffer = g_malloc (hdr.size); + offset += sizeof (hdr); + if (dbx_pread (m->dbx_fd, buffer, hdr.size, offset) != hdr.size) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, "Failed to read mail data block from DBX file " "at offset %x", offset); - g_free(buffer); + g_free (buffer); return FALSE; } @@ -518,7 +518,7 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) d(printf("Got type 0x81 flags %02x\n", *flags)); break; case 0x04: - dataptr = GUINT32_FROM_LE(*(guint32 *)(buffer + hdr.count*4 + val)); + dataptr = GUINT32_FROM_LE (*(guint32 *)(buffer + hdr.count*4 + val)); d(printf("Got type 0x04 data pointer %x\n", dataptr)); break; case 0x84: @@ -531,12 +531,12 @@ dbx_read_email (DbxImporter *m, guint32 offset, gint bodyfd, gint *flags) break; } } - g_free(buffer); + g_free (buffer); if (!dataptr) return FALSE; - return dbx_read_mail_body(m, dataptr, bodyfd); + return dbx_read_mail_body (m, dataptr, bodyfd); } static void @@ -557,7 +557,7 @@ dbx_import_file (DbxImporter *m) return; d(printf("importing to %s\n", camel_folder_get_full_name(folder))); - camel_folder_freeze(folder); + camel_folder_freeze (folder); filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); m->dbx_fd = g_open (filename, O_RDONLY, 0); @@ -570,7 +570,7 @@ dbx_import_file (DbxImporter *m) goto out; } - if (!dbx_load_indices(m)) + if (!dbx_load_indices (m)) goto out; tmpfile = e_mkstemp("dbx-import-XXXXXX"); @@ -589,10 +589,10 @@ dbx_import_file (DbxImporter *m) gint flags = 0; gboolean success; - camel_operation_progress(NULL, 100 * i / m->index_count); - camel_operation_progress(m->status, 100 * i / m->index_count); + camel_operation_progress (NULL, 100 * i / m->index_count); + camel_operation_progress (m->status, 100 * i / m->index_count); - if (!dbx_read_email(m, m->indices[i], tmpfile, &dbx_flags)) { + if (!dbx_read_email (m, m->indices[i], tmpfile, &dbx_flags)) { d(printf("Cannot read email index %d at %x\n", i, m->indices[i])); if (m->base.error != NULL) @@ -607,39 +607,39 @@ dbx_import_file (DbxImporter *m) if (dbx_flags & 0x80000) flags |= CAMEL_MESSAGE_ANSWERED; - mp = camel_mime_parser_new(); + mp = camel_mime_parser_new (); - lseek(tmpfile, 0, SEEK_SET); - camel_mime_parser_init_with_fd(mp, tmpfile); + lseek (tmpfile, 0, SEEK_SET); + camel_mime_parser_init_with_fd (mp, tmpfile); - msg = camel_mime_message_new(); - if (camel_mime_part_construct_from_parser((CamelMimePart *)msg, mp, NULL) == -1) { + msg = camel_mime_message_new (); + if (camel_mime_part_construct_from_parser ((CamelMimePart *)msg, mp, NULL) == -1) { /* set exception? */ g_object_unref (msg); g_object_unref (mp); break; } - info = camel_message_info_new(NULL); - camel_message_info_set_flags(info, flags, ~0); + info = camel_message_info_new (NULL); + camel_message_info_set_flags (info, flags, ~0); success = camel_folder_append_message ( folder, msg, info, NULL, &m->base.error); - camel_message_info_free(info); + camel_message_info_free (info); g_object_unref (msg); if (!success) { - g_object_unref(mp); + g_object_unref (mp); break; } } out: if (m->dbx_fd != -1) - close(m->dbx_fd); + close (m->dbx_fd); if (m->indices) - g_free(m->indices); - camel_folder_sync(folder, FALSE, NULL); - camel_folder_thaw(folder); - g_object_unref(folder); + g_free (m->indices); + camel_folder_sync (folder, FALSE, NULL); + camel_folder_thaw (folder); + g_object_unref (folder); if (missing && m->base.error == NULL) { g_set_error ( &m->base.error, CAMEL_ERROR, CAMEL_ERROR_GENERIC, @@ -647,7 +647,7 @@ dbx_import_file (DbxImporter *m) "bodies were not present in the DBX file", m->index_count - missing, missing); } - camel_operation_end(NULL); + camel_operation_end (NULL); } static void diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c index b78474d78b..94cc793d25 100644 --- a/plugins/email-custom-header/email-custom-header.c +++ b/plugins/email-custom-header/email-custom-header.c @@ -73,11 +73,11 @@ static void epech_dialog_finalize (GObject *object); static void epech_dialog_init (GObject *object); static void epech_dialog_dispose (GObject *object); static void epech_setup_widgets (CustomHeaderOptionsDialog *mch); -static gint epech_check_existing_composer_window(gconstpointer a, gconstpointer b); +static gint epech_check_existing_composer_window (gconstpointer a, gconstpointer b); static void commit_changes (ConfigData *cd); gint e_plugin_lib_enable (EPlugin *ep, gint enable); GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl); -gboolean e_plugin_ui_init(GtkUIManager *ui_manager, EMsgComposer *composer); +gboolean e_plugin_ui_init (GtkUIManager *ui_manager, EMsgComposer *composer); GtkWidget *org_gnome_email_custom_header_config_option (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); gint @@ -101,8 +101,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch) for (index_column = 0; index_column < priv->email_custom_header_details->len; index_column++) { - sub_combo_box_get = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,index_column); - selected_item = gtk_combo_box_get_active((GtkComboBox *)sub_combo_box_get->header_value_combo_box); + sub_combo_box_get = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,index_column); + selected_item = gtk_combo_box_get_active ((GtkComboBox *)sub_combo_box_get->header_value_combo_box); g_array_append_val (priv->header_index_type, selected_item); } } @@ -139,13 +139,13 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch) for (set_index_column = 0; set_index_column < priv->email_custom_header_details->len;set_index_column++) { - sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column); + sub_combo_box_fill = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,set_index_column); if (priv->flag == 0) { gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0); } else { gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, - g_array_index(priv->header_index_type, gint, set_index_column)); + g_array_index (priv->header_index_type, gint, set_index_column)); } } } @@ -227,7 +227,7 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent) e_load_ui_builder_definition ( priv->builder, "org-gnome-email-custom-header.ui"); - if (!epech_get_widgets(mch)) { + if (!epech_get_widgets (mch)) { g_object_unref (priv->builder); d (printf ("\n Could not get the Widgets\n")); } @@ -275,27 +275,27 @@ epech_load_from_gconf (GConfClient *client,const gchar *path,CustomHeaderOptions for (q = header_list,pos = 0; q != NULL; q = q->next,pos++) { gchar **parse_header_list; - memset(&temp_header_value_details,0,sizeof(CustomSubHeader)); + memset (&temp_header_value_details,0,sizeof (CustomSubHeader)); temp_header_details.sub_header_type_value = g_array_new (TRUE, TRUE, sizeof (CustomSubHeader)); buffer = q->data; parse_header_list = g_strsplit_set (buffer, "=;,", -1); temp_header_details.header_type_value = g_string_new(""); if (temp_header_details.header_type_value) { - g_string_assign(temp_header_details.header_type_value, parse_header_list[0]); + g_string_assign (temp_header_details.header_type_value, parse_header_list[0]); } for (index = 0; parse_header_list[index+1] ; ++index) { temp_header_value_details.sub_header_string_value = g_string_new(""); if (temp_header_value_details.sub_header_string_value) { - g_string_assign(temp_header_value_details.sub_header_string_value, parse_header_list[index+1]); + g_string_assign (temp_header_value_details.sub_header_string_value, parse_header_list[index+1]); } - g_array_append_val(temp_header_details.sub_header_type_value, temp_header_value_details); + g_array_append_val (temp_header_details.sub_header_type_value, temp_header_value_details); } temp_header_details.number_of_subtype_header = index; - g_array_append_val(priv->email_custom_header_details, temp_header_details); + g_array_append_val (priv->email_custom_header_details, temp_header_details); } temp_header_details.number_of_header = pos; @@ -334,7 +334,7 @@ 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); + 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 = _(security_field); @@ -348,21 +348,21 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch) gtk_misc_set_alignment (GTK_MISC (priv->header_type_name_label), 0, 0.5); gtk_widget_show (priv->header_type_name_label); sub_combo_box.header_value_combo_box = gtk_combo_box_new_text (); - g_array_append_val(priv->combo_box_header_value, sub_combo_box); + g_array_append_val (priv->combo_box_header_value, sub_combo_box); } for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; sub_index++,row_combo++,column_combo++) { - temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index); + 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); + sub_combo_box_ptr = &g_array_index (priv->combo_box_header_value, HeaderValueComboBox,sub_index); gtk_table_attach (GTK_TABLE (priv->header_table), sub_combo_box_ptr->header_value_combo_box, 1, 2, row_combo, column_combo, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (GTK_FILL), 0, 0); for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) { - temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); + temp_header_value_ptr = &g_array_index (temp->sub_header_type_value, CustomSubHeader,sub_type_index); str = (temp_header_value_ptr->sub_header_string_value)->str; for (i = 0; security_values[i].value != NULL; i++) { if (strcmp (str, security_values[i].value) == 0) { @@ -465,12 +465,12 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp for (index_subtype = 0; index_subtype < priv->email_custom_header_details->len; index_subtype++) { - temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,index_subtype); + temp_header_ptr = &g_array_index (priv->email_custom_header_details, EmailCustomHeaderDetails,index_subtype); for (sub_type_index = 0; sub_type_index < temp_header_ptr->number_of_subtype_header; sub_type_index++) { - temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index); + temp_header_value_ptr = &g_array_index (temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index); - if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)) { + if (sub_type_index == g_array_index (priv->header_index_type, gint, index_subtype)) { e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, (temp_header_value_ptr->sub_header_string_value)->str); } @@ -509,7 +509,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data) } static gint -epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow) +epech_check_existing_composer_window (gconstpointer compowindow, gconstpointer other_compowindow) { if ((compowindow) && (other_compowindow)) { if (((EmailCustomHeaderWindow *)compowindow)->epech_window == (GdkWindow *)other_compowindow) { @@ -546,13 +546,13 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp new_email_custom_header_window = g_object_get_data ((GObject *) composer, "compowindow"); window = gtk_widget_get_window (menuitem); - if (epech_check_existing_composer_window(new_email_custom_header_window,window) == 0) { + if (epech_check_existing_composer_window (new_email_custom_header_window,window) == 0) { dialog = new_email_custom_header_window->epech_dialog; } 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 = 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); @@ -610,11 +610,11 @@ 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); @@ -717,17 +717,17 @@ header_remove_clicked (GtkButton *button, ConfigData *cd) /* Get the path and move to the previous node :) */ path = gtk_tree_model_get_path (model, &iter); if (path) - valid = gtk_tree_path_prev(path); + valid = gtk_tree_path_prev (path); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); len = gtk_tree_model_iter_n_children (model, NULL); if (len > 0) { - if (gtk_list_store_iter_is_valid (GTK_LIST_STORE(model), &iter)) { + if (gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), &iter)) { gtk_tree_selection_select_iter (selection, &iter); } else { if (path && valid) { - gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get_iter (model, &iter, path); gtk_tree_selection_select_iter (selection, &iter); } } @@ -736,7 +736,7 @@ header_remove_clicked (GtkButton *button, ConfigData *cd) gtk_widget_set_sensitive (cd->header_remove, FALSE); } - gtk_widget_grab_focus(cd->treeview); + gtk_widget_grab_focus (cd->treeview); gtk_tree_path_free (path); commit_changes (cd); @@ -804,7 +804,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gchar *buffer; GtkTreeViewColumn *col; gint col_pos; - GConfClient *client = gconf_client_get_default(); + GConfClient *client = gconf_client_get_default (); ConfigData *cd = g_new0 (ConfigData, 1); GtkWidget *ech_configuration_box; @@ -885,7 +885,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) renderer, "text", HEADER_KEY_COLUMN, NULL); col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1); gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_reorderable(col, TRUE); + gtk_tree_view_column_set_reorderable (col, TRUE); g_object_set (col, "min-width", 50, NULL); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); @@ -901,7 +901,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) renderer, "text", HEADER_VALUE_COLUMN, NULL); col = gtk_tree_view_get_column (GTK_TREE_VIEW (cd->treeview), col_pos -1); gtk_tree_view_column_set_resizable (col, TRUE); - gtk_tree_view_column_set_reorderable(col, TRUE); + gtk_tree_view_column_set_reorderable (col, TRUE); g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL); g_signal_connect ( diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 11db7db3a2..c1f787d2f4 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -59,7 +59,7 @@ static void ee_editor_command_changed (GtkWidget *textbox); static void ee_editor_immediate_launch_changed (GtkWidget *checkbox); static void async_external_editor (EMsgComposer *composer); static gboolean editor_running (void); -static gboolean key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer); +static gboolean key_press_cb (GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer); /* used to track when the external editor is active */ static GThread *editor_thread; @@ -78,7 +78,7 @@ ee_editor_command_changed (GtkWidget *textbox) const gchar *editor; GConfClient *gconf; - editor = gtk_entry_get_text (GTK_ENTRY(textbox)); + editor = gtk_entry_get_text (GTK_ENTRY (textbox)); d(printf ("\n\aeditor is : [%s] \n\a", editor)); /* gconf access for every key-press. Sucky ? */ @@ -118,7 +118,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) editor = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL); if (editor) { - gtk_entry_set_text (GTK_ENTRY(textbox), editor); + gtk_entry_set_text (GTK_ENTRY (textbox), editor); g_free (editor); } @@ -137,7 +137,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_signal_connect (textbox, "changed", G_CALLBACK(ee_editor_command_changed), textbox); g_signal_connect (checkbox, "toggled", - G_CALLBACK(ee_editor_immediate_launch_changed), checkbox); + G_CALLBACK (ee_editor_immediate_launch_changed), checkbox); gtk_widget_show_all (vbox); return vbox; @@ -346,10 +346,10 @@ async_external_editor (EMsgComposer *composer) gchar *htmltext; GArray *array; - htmltext = camel_text_to_html(buf, CAMEL_MIME_FILTER_TOHTML_PRE, 0); + htmltext = camel_text_to_html (buf, CAMEL_MIME_FILTER_TOHTML_PRE, 0); array = g_array_sized_new (TRUE, TRUE, - sizeof (gpointer), 2 * sizeof(gpointer)); + sizeof (gpointer), 2 * sizeof (gpointer)); array = g_array_append_val (array, composer); array = g_array_append_val (array, htmltext); @@ -366,7 +366,7 @@ static void launch_editor (GtkAction *action, EMsgComposer *composer) { d(printf ("\n\nexternal_editor plugin is launched \n\n")); - if (editor_running()) { + if (editor_running ()) { d(printf("not opening editor, because it's still running\n")); return; } @@ -386,7 +386,7 @@ static GtkActionEntry entries[] = { }; static gboolean -key_press_cb(GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer) +key_press_cb (GtkWidget * widget, GdkEventKey * event, EMsgComposer *composer) { GConfClient *gconf; gboolean immediately; @@ -436,7 +436,7 @@ editor_running (void) static gboolean delete_cb (GtkWidget *widget, EMsgComposer *composer) { - if (editor_running()) { + if (editor_running ()) { e_alert_run_dialog_for_args (NULL, "org.gnome.evolution.plugins.external-editor:editor-still-running", NULL); return TRUE; } @@ -460,10 +460,10 @@ e_plugin_ui_init (GtkUIManager *manager, EMsgComposer *composer) html = gtkhtml_editor_get_html (editor); g_signal_connect (G_OBJECT(html), "key_press_event", - G_CALLBACK(key_press_cb), composer); + G_CALLBACK (key_press_cb), composer); g_signal_connect (G_OBJECT(composer), "delete-event", - G_CALLBACK(delete_cb), composer); + G_CALLBACK (delete_cb), composer); return TRUE; } diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c index 289a939dec..e55333064a 100644 --- a/plugins/google-account-setup/google-contacts-source.c +++ b/plugins/google-account-setup/google-contacts-source.c @@ -209,7 +209,7 @@ struct ui_data { }; static void -destroy_ui_data(gpointer data) +destroy_ui_data (gpointer data) { struct ui_data *ui = data; diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c index a5568d3bba..b55672e836 100644 --- a/plugins/groupwise-features/addressbook-groupwise.c +++ b/plugins/groupwise-features/addressbook-groupwise.c @@ -51,7 +51,7 @@ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target) g_free (relative_uri); source_group = e_source_peek_group (source); - l = e_source_group_peek_sources(source_group); + l = e_source_group_peek_sources (source_group); if (l && l->data ) { e_source_set_property(source, "auth", e_source_get_property(l->data, "auth")); e_source_set_property(source, "user", e_source_get_property(l->data, "user")); diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index 308ed517c9..fff8af3dd1 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -200,7 +200,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info, const gchar *source_na offline_sync = camel_url_get_param (url, "offline_sync"); - client = gconf_client_get_default(); + client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (client, conf_key); group = e_source_group_new (group_name, GROUPWISE_URI_PREFIX); @@ -275,7 +275,7 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n GSList *node_tobe_deleted; const gchar *source_selection_key; - client = gconf_client_get_default(); + client = gconf_client_get_default (); list = e_source_list_new_for_gconf (client, conf_key); groups = e_source_list_peek_groups (list); @@ -518,7 +518,7 @@ get_addressbook_names_from_server (gchar *source_url) cnc = e_gw_connection_new (uri, url->user, password); g_free (password); - if (!E_IS_GW_CONNECTION(cnc)) { + if (!E_IS_GW_CONNECTION (cnc)) { if (count == 3) break; } @@ -529,7 +529,7 @@ get_addressbook_names_from_server (gchar *source_url) g_free (key); - if (E_IS_GW_CONNECTION(cnc)) { + if (E_IS_GW_CONNECTION (cnc)) { book_list = NULL; status = e_gw_connection_get_address_book_list (cnc, &book_list); if (status == E_GW_CONNECTION_STATUS_OK) @@ -603,11 +603,11 @@ add_addressbook_sources (EAccount *account) if (!temp_list) return FALSE; for (; temp_list != NULL; temp_list = g_list_next (temp_list)) { - const gchar *book_name = e_gw_container_get_name (E_GW_CONTAINER(temp_list->data)); + const gchar *book_name = e_gw_container_get_name (E_GW_CONTAINER (temp_list->data)); /* is_writable is set to TRUE if the book has isPersonal property, * by e_gw_connection_get_address_book_list() */ - is_writable = e_gw_container_get_is_writable (E_GW_CONTAINER(temp_list->data)); + is_writable = e_gw_container_get_is_writable (E_GW_CONTAINER (temp_list->data)); if (is_writable && !g_ascii_strncasecmp (book_name, "Novell GroupWise Address Book", strlen (book_name))) { /* This is a hack to not to show multiple groupwise system address books @@ -711,7 +711,7 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_ 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) { + 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) { found_group = TRUE; if (!delete_group) { e_source_group_set_name (group, account->name); @@ -812,7 +812,7 @@ account_added (EAccountList *account_listener, EAccount *account) if (!parent) return; - parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL); + parent_url = camel_url_new (e_account_get_string (parent, E_ACCOUNT_SOURCE_URL), NULL); add_proxy_sources (info, parent_url->user); } else { status = add_addressbook_sources (account); @@ -1035,7 +1035,7 @@ camel_gw_listener_new (void) CamelGwListener *config_listener; config_listener = g_object_new (CAMEL_TYPE_GW_LISTENER, NULL); - config_listener->priv->gconf_client = gconf_client_get_default(); + config_listener->priv->gconf_client = gconf_client_get_default (); camel_gw_listener_construct (config_listener); diff --git a/plugins/groupwise-features/groupwise-account-setup.c b/plugins/groupwise-features/groupwise-account-setup.c index 0872a9c2a7..4cd8c3ca56 100644 --- a/plugins/groupwise-features/groupwise-account-setup.c +++ b/plugins/groupwise-features/groupwise-account-setup.c @@ -33,7 +33,7 @@ static CamelGwListener *config_listener = NULL; gint e_plugin_lib_enable (EPlugin *ep, gint enable); -GtkWidget* org_gnome_gw_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); +GtkWidget* org_gnome_gw_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); void ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target); static gboolean @@ -88,15 +88,15 @@ ensure_mandatory_esource_properties (EPlugin *ep, ESEventTargetUpgrade *target) EAccountList *al; EIterator *it; - client = gconf_client_get_default(); + client = gconf_client_get_default (); al = e_account_list_new (client); - for (it = e_list_get_iterator((EList *)al); - e_iterator_is_valid(it); - e_iterator_next(it)) { + for (it = e_list_get_iterator ((EList *)al); + e_iterator_is_valid (it); + e_iterator_next (it)) { EAccount *a; - a = (EAccount *) e_iterator_get(it); + a = (EAccount *) e_iterator_get (it); if (!a->enabled || !is_groupwise_account (a)) continue; set_esource_props ("/apps/evolution/calendar/sources", a, client, a->name); @@ -124,10 +124,10 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) return 0; } -GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); +GtkWidget * org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); GtkWidget * -org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) +org_gnome_groupwise_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { if (data->old) return data->old; diff --git a/plugins/groupwise-features/gw-ui.c b/plugins/groupwise-features/gw-ui.c index 41529b5d41..3ca262b674 100644 --- a/plugins/groupwise-features/gw-ui.c +++ b/plugins/groupwise-features/gw-ui.c @@ -319,7 +319,7 @@ is_meeting_owner (ECalComponent *comp, ECal *client) } if (!ret_val) - ret_val = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; + ret_val = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL; g_free (email); return ret_val; diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index db906e6952..2db4eaf4e7 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -132,19 +132,19 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data) } } - g_strfreev(names); + g_strfreev (names); gtk_widget_destroy ((GtkWidget *)emfs); } } static void -accept_free(gpointer data) +accept_free (gpointer data) { struct AcceptData *accept_data = data; g_object_unref (accept_data->msg); - g_free(accept_data); + g_free (accept_data); } static void @@ -159,13 +159,13 @@ apply_clicked (GtkAssistant *assistant, CamelMimeMessage *msg) parent = gtk_widget_get_toplevel (GTK_WIDGET (assistant)); parent = gtk_widget_is_toplevel (parent) ? parent : NULL; - accept_data = g_new0(struct AcceptData, 1); + accept_data = g_new0 (struct AcceptData, 1); folder_tree = (EMFolderTree *) em_folder_tree_new (); dialog = em_folder_selector_create_new (parent, folder_tree, 0, _("Create folder"), _("Specify where to create the folder:")); - uri = em_folder_tree_get_selected_uri(folder_tree); + uri = em_folder_tree_get_selected_uri (folder_tree); em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri); - g_free(uri); + g_free (uri); accept_data->msg = msg; g_object_ref (msg); accept_data->model = EM_FOLDER_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree))); @@ -194,12 +194,12 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) if (((gchar *)camel_medium_get_header (CAMEL_MEDIUM(msg),"X-notification")) == NULL || (from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message)) == NULL - || !camel_internet_address_get(from_addr, 0, &name, &email) + || !camel_internet_address_get (from_addr, 0, &name, &email) || (dw = camel_medium_get_content (CAMEL_MEDIUM (msg))) == NULL) { return; } else { if (CAMEL_IS_MULTIPART (dw)) { - dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part((CamelMultipart *)dw, 0)); + dw = camel_medium_get_content ((CamelMedium *)camel_multipart_get_part ((CamelMultipart *)dw, 0)); if (dw == NULL) return; } @@ -210,7 +210,7 @@ org_gnome_popup_wizard (EPlugin *ep, EMEventTargetMessage *target) camel_stream_write (stream, "", 1, NULL); from_addr = camel_mime_message_get_from ((CamelMimeMessage *)target->message); - if (from_addr && camel_internet_address_get(from_addr, 0, &name, &email)) { + if (from_addr && camel_internet_address_get (from_addr, 0, &name, &email)) { GtkWidget *page; GtkAssistant *assistant = GTK_ASSISTANT (gtk_assistant_new ()); diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c index 6e72b67320..a633f0bcc3 100644 --- a/plugins/groupwise-features/junk-mail-settings.c +++ b/plugins/groupwise-features/junk-mail-settings.c @@ -48,7 +48,7 @@ static void junk_dialog_response (GtkWidget *dialog, gint response, JunkSettings *js) { if (response == GTK_RESPONSE_ACCEPT) { - commit_changes(js); + commit_changes (js); abort_changes (js); } else @@ -96,7 +96,7 @@ gw_junk_mail_settings_cb (GtkAction *action, EShellView *shell_view) msg = g_strdup_printf("%s", _("Junk Mail Settings")); gtk_label_set_markup (GTK_LABEL (w), msg); gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 6); - g_free(msg); + g_free (msg); junk_tab = junk_settings_new (cnc); w = (GtkWidget *)junk_tab->vbox; diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 23f4a0833f..242d037bb4 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -43,7 +43,7 @@ static void junk_settings_class_init (JunkSettingsClass *class); static void junk_settings_init (JunkSettings *js); static void junk_settings_destroy (GtkObject *obj); static void junk_settings_finalise (GObject *obj); -static void free_all(JunkSettings *js); +static void free_all (JunkSettings *js); static void get_junk_list (JunkSettings *js); static void disable_clicked (GtkRadioButton *button, JunkSettings *js); static void enable_clicked (GtkRadioButton *button, JunkSettings *js); @@ -88,7 +88,7 @@ junk_settings_finalise (GObject *obj) { JunkSettings *js = (JunkSettings *) obj; g_object_unref (js->builder); - free_all(js); + free_all (js); G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -112,10 +112,10 @@ junk_settings_init (JunkSettings *js) } static void -free_entry_node(EGwJunkEntry *entry) +free_entry_node (EGwJunkEntry *entry) { if (entry) { - g_free(entry->match); + g_free (entry->match); entry->match = NULL; } @@ -123,12 +123,12 @@ free_entry_node(EGwJunkEntry *entry) } static void -free_node(JunkEntry *nentry) +free_node (JunkEntry *nentry) { EGwJunkEntry *junk_entry = nentry->entry; if (junk_entry) { - g_free(junk_entry->match); + g_free (junk_entry->match); junk_entry->match = NULL; } @@ -136,7 +136,7 @@ free_node(JunkEntry *nentry) } static JunkEntry * -find_node(GList *list, gchar *match) +find_node (GList *list, gchar *match) { JunkEntry *one_entry = NULL; EGwJunkEntry *ent = NULL; @@ -144,16 +144,16 @@ find_node(GList *list, gchar *match) gint i; if (list) { - tmp = g_list_first(list); + tmp = g_list_first (list); for (i=0; tmp; i++) { one_entry = tmp->data; ent = one_entry->entry; - if (!g_ascii_strcasecmp(ent->match, match)) { + if (!g_ascii_strcasecmp (ent->match, match)) { return one_entry; /*if found, it returns that user*/ } - tmp= g_list_next(tmp); + tmp= g_list_next (tmp); } } @@ -182,8 +182,8 @@ get_junk_list (JunkSettings *js) if (e_gw_connection_get_junk_settings (js->cnc, &use_junk, &use_block, &use_pab, &persistence) == E_GW_CONNECTION_STATUS_OK) { if (use_junk) { js->enabled = TRUE; - gtk_toggle_button_set_active((GtkToggleButton *) js->enable, TRUE); - enable_clicked(js->enable , js); + gtk_toggle_button_set_active ((GtkToggleButton *) js->enable, TRUE); + enable_clicked (js->enable , js); gtk_widget_set_sensitive (GTK_WIDGET (js->table), TRUE); } else { gtk_toggle_button_set_active ((GtkToggleButton *) js->disable, TRUE); @@ -298,7 +298,7 @@ disable_clicked (GtkRadioButton *button, JunkSettings *js) } static void -add_clicked(GtkButton *button, JunkSettings *js) +add_clicked (GtkButton *button, JunkSettings *js) { const gchar *email = NULL; const gchar *self_email = NULL; @@ -321,14 +321,14 @@ add_clicked(GtkButton *button, JunkSettings *js) } junk_entry = g_new0 (EGwJunkEntry, 1); new_entry = g_new0 (JunkEntry, 1); - junk_entry->match = g_strdup(email); + junk_entry->match = g_strdup (email); /*XXX:populate more fields*/ new_entry->entry = junk_entry; new_entry->flag = 1; msg = g_strdup (email); gtk_list_store_append (GTK_LIST_STORE (js->model), &(js->iter)); gtk_list_store_set (GTK_LIST_STORE (js->model), &(js->iter), 0, msg, -1); - g_free(msg); + g_free (msg); js->junk_list = g_list_append (js->junk_list, new_entry); js->flag_for_ok = 0; } @@ -336,7 +336,7 @@ add_clicked(GtkButton *button, JunkSettings *js) } static void -remove_clicked(GtkButton *button, JunkSettings *js) +remove_clicked (GtkButton *button, JunkSettings *js) { JunkEntry *entry = NULL; gchar *email; @@ -345,7 +345,7 @@ remove_clicked(GtkButton *button, JunkSettings *js) entry = find_node (js->junk_list, email); if (entry->flag & 0x1) { js->junk_list = g_list_remove (js->junk_list, entry); - free_node(entry); + free_node (entry); } else { entry->flag = 0; entry->flag |= 0x4; @@ -355,11 +355,11 @@ remove_clicked(GtkButton *button, JunkSettings *js) } static void -user_selected(GtkTreeSelection *selection, JunkSettings *js) +user_selected (GtkTreeSelection *selection, JunkSettings *js) { GtkTreeModel *model; - gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); if (gtk_tree_selection_get_selected (selection, &model, &(js->iter))) { gtk_widget_set_sensitive (GTK_WIDGET (js->remove), TRUE); @@ -387,7 +387,7 @@ junk_settings_construct (JunkSettings *js) js->remove = GTK_BUTTON(e_builder_get_widget(js->builder, "Remove")); g_signal_connect ((GtkWidget *) js->remove, "clicked", G_CALLBACK (remove_clicked), js); - gtk_widget_set_sensitive(GTK_WIDGET (js->remove), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (js->remove), FALSE); js->entry = GTK_ENTRY (e_builder_get_widget (js->builder, "entry4")); /*TODO:connect entry and label*/ @@ -420,7 +420,7 @@ junk_settings_new (EGwConnection *ccnc) junk_settings_construct (new); new->cnc = ccnc; if (new->cnc) - get_junk_list(new); + get_junk_list (new); return (JunkSettings *) new; } diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 466da1cb23..1213311e36 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -76,7 +76,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) cnc = get_cnc (parent_store); - if (cnc && E_IS_GW_CONNECTION(cnc)) { + if (cnc && E_IS_GW_CONNECTION (cnc)) { confirm_dialog = gtk_dialog_new_with_buttons ( _("Message Retract"), GTK_WINDOW (e_shell_view_get_shell_window (shell_view)), @@ -109,7 +109,7 @@ gw_retract_mail_cb (GtkAction *action, EShellView *shell_view) else { GtkWidget *dialog; dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Message retracted successfully")); - gtk_dialog_run (GTK_DIALOG(dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } } diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c index 63bbbe7c9b..8b59946330 100644 --- a/plugins/groupwise-features/mail-send-options.c +++ b/plugins/groupwise-features/mail-send-options.c @@ -59,7 +59,7 @@ add_day_to_time (time_t time, gint days) } static void -feed_input_data(ESendOptionsDialog * dialog, gint state, gpointer data) +feed_input_data (ESendOptionsDialog * dialog, gint state, gpointer data) { EMsgComposer *comp; gchar value[100]; diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index 25518ba9a7..12d095bb31 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -317,7 +317,7 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent) for (i=0; email[i]!='\0' && email[i]!='@' ; i++); if (email[i]=='@') - name = g_strndup(email, i); + name = g_strndup (email, i); else { e_alert_run_dialog_for_args (error_parent, "org.gnome.evolution.proxy-login:invalid-user", @@ -343,24 +343,24 @@ proxy_soap_login (gchar *email, GtkWindow *error_parent) proxy_cnc = e_gw_connection_get_proxy_connection (cnc, user_name, password, email, &permissions); if (proxy_cnc) { - parent = camel_url_new (e_account_get_string(srcAccount, E_ACCOUNT_SOURCE_URL), NULL); + parent = camel_url_new (e_account_get_string (srcAccount, E_ACCOUNT_SOURCE_URL), NULL); parent_source_url = camel_url_to_string (parent, CAMEL_URL_HIDE_PASSWORD); uri = camel_url_copy (parent); camel_url_set_user (uri, name); proxy_source_url = camel_url_to_string (uri, CAMEL_URL_HIDE_PASSWORD); - dstAccount = e_account_new(); - e_account_set_string(dstAccount, E_ACCOUNT_ID_ADDRESS, email); + dstAccount = e_account_new (); + e_account_set_string (dstAccount, E_ACCOUNT_ID_ADDRESS, email); dstAccount->enabled = TRUE; - e_account_set_string(dstAccount, E_ACCOUNT_SOURCE_URL, proxy_source_url); + e_account_set_string (dstAccount, E_ACCOUNT_SOURCE_URL, proxy_source_url); e_account_set_string (dstAccount, E_ACCOUNT_TRANSPORT_URL, proxy_source_url); e_account_set_string (dstAccount, E_ACCOUNT_NAME, email); e_account_set_string (dstAccount, E_ACCOUNT_ID_NAME, name); e_account_set_string (dstAccount, E_ACCOUNT_PROXY_PARENT_UID, srcAccount->uid); - e_account_list_add(accounts, dstAccount); + e_account_list_add (accounts, dstAccount); e_account_list_change (accounts, srcAccount); - e_account_list_save(accounts); + e_account_list_save (accounts); g_object_set_data ((GObject *)dstAccount, "permissions", GINT_TO_POINTER(permissions)); - mail_get_store(e_account_get_string(dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount); + mail_get_store (e_account_get_string (dstAccount, E_ACCOUNT_SOURCE_URL), NULL, proxy_login_add_new_store, dstAccount); g_free (proxy_source_url); g_free (parent_source_url); @@ -395,7 +395,7 @@ proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data) } static void -proxy_login_tree_view_changed_cb(GtkDialog *dialog) +proxy_login_tree_view_changed_cb (GtkDialog *dialog) { proxyLoginPrivate *priv = pld->priv; GtkTreeSelection* account_select; @@ -412,7 +412,7 @@ proxy_login_tree_view_changed_cb(GtkDialog *dialog) gtk_tree_model_get (model, &iter, ACCOUNT_NAME, &account_mailid, -1); account_mailid = g_strrstr (account_mailid, "\n") + 1; account_name_tbox = e_builder_get_widget (priv->builder, "account_name"); - gtk_entry_set_text((GtkEntry*) account_name_tbox,account_mailid); + gtk_entry_set_text ((GtkEntry*) account_name_tbox,account_mailid); } static void @@ -459,14 +459,14 @@ proxy_login_update_tree (void) gtk_tree_store_clear (priv->store); if (proxy_list != NULL) { - n = g_list_length(proxy_list); + n = g_list_length (proxy_list); for (i=0;istore, &iter, NULL); gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(proxy_name, "\n", proxy_email, NULL), -1); } - gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree),GTK_TREE_MODEL (priv->store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree),GTK_TREE_MODEL (priv->store)); } g_free (file_name); @@ -513,7 +513,7 @@ gw_proxy_login_cb (GtkAction *action, EShellView *shell_view) if (cnc) g_object_unref (cnc); - pld = proxy_login_new(); + pld = proxy_login_new (); priv = pld->priv; priv->builder = gtk_builder_new (); diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h index 65e28cdf78..3c4ba8c392 100644 --- a/plugins/groupwise-features/proxy-login.h +++ b/plugins/groupwise-features/proxy-login.h @@ -58,5 +58,5 @@ proxyLogin* proxy_dialog_new (void); static void proxy_soap_login (gchar *email, GtkWindow *error_parent); gchar *parse_email_for_name (gchar *email); static void proxy_login_update_tree (void); -static void proxy_login_tree_view_changed_cb(GtkDialog *dialog); +static void proxy_login_tree_view_changed_cb (GtkDialog *dialog); static gint proxy_get_password (EAccount *account, gchar **user_name, gchar **password); diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 7b3cae23a8..5a01a6c281 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -347,7 +347,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa email, NULL); return -1; } - if (!g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) { + if (!g_ascii_strcasecmp (e_gw_connection_get_user_email (prd->cnc), email)) { e_alert_run_dialog_for_args (parent, "org.gnome.evolution.proxy:invalid-user", email, NULL); @@ -357,7 +357,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa /*check whether already exists*/ existing_list = priv->proxy_list; - for (;existing_list; existing_list = g_list_next(existing_list)) { + for (;existing_list; existing_list = g_list_next (existing_list)) { new_proxy = (proxyHandler *) existing_list->data; if (!g_ascii_strcasecmp (new_proxy->proxy_email, email)) { if (new_proxy->flags & E_GW_PROXY_DELETED) { @@ -554,7 +554,7 @@ proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data) /* Handle case where the structure is new and deleted*/ if ( !((aclInstance->flags & E_GW_PROXY_NEW) && (aclInstance->flags & E_GW_PROXY_DELETED))) { - if ( !E_IS_GW_CONNECTION(prd->cnc)) /* Add check in case the connection request fails*/ + if ( !E_IS_GW_CONNECTION (prd->cnc)) /* Add check in case the connection request fails*/ prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (button))); if (aclInstance->flags & E_GW_PROXY_NEW ) @@ -616,7 +616,7 @@ proxy_update_tree_view (EAccount *account) gtk_tree_store_clear (priv->store); list_iter = priv->proxy_list; - for (;list_iter; list_iter = g_list_next(list_iter)) { + for (;list_iter; list_iter = g_list_next (list_iter)) { aclInstance = (proxyHandler *) list_iter->data; if (!(aclInstance->flags & E_GW_PROXY_DELETED )) { @@ -630,7 +630,7 @@ proxy_update_tree_view (EAccount *account) g_object_unref (broken_image); /*Fixme : Desensitize buttons if the list is Null*/ - gtk_tree_view_set_model (GTK_TREE_VIEW(priv->tree), GTK_TREE_MODEL (priv->store)); + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->tree), GTK_TREE_MODEL (priv->store)); } GtkWidget* @@ -749,12 +749,12 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun prd->cnc = proxy_get_cnc (account, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (notebook)))); priv = prd->priv; - if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) + if (e_gw_connection_get_proxy_access_list (prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK) return FALSE; list_iter = priv->proxy_list; - for (;list_iter; list_iter = g_list_next(list_iter)) { + for (;list_iter; list_iter = g_list_next (list_iter)) { aclInstance = (proxyHandler *) list_iter->data; /* NOTE: All User Access is not supported */ @@ -773,7 +773,7 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkWidget *page, gint num, EAccoun } static void -proxy_cancel(GtkWidget *button, EAccount *account) +proxy_cancel (GtkWidget *button, EAccount *account) { proxyDialog *prd = NULL; proxyDialogPrivate *priv; @@ -830,7 +830,7 @@ proxy_get_item_from_list (EAccount *account, gchar *account_name) priv = prd->priv; list_iter = priv->proxy_list; - for (;list_iter; list_iter = g_list_next(list_iter)) { + for (;list_iter; list_iter = g_list_next (list_iter)) { iter = (proxyHandler *) list_iter->data; if ( g_str_equal (iter->proxy_email,account_name)) @@ -949,40 +949,40 @@ proxy_load_edit_dialog (EAccount *account, proxyHandler *edited) gtk_widget_set_sensitive (priv->account_name, FALSE); if (edited->permissions & E_GW_PROXY_MAIL_READ) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->mail_read), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->mail_read), TRUE); if (edited->permissions & E_GW_PROXY_MAIL_WRITE) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->mail_write), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->mail_write), TRUE); if (edited->permissions & E_GW_PROXY_APPOINTMENT_READ) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->app_read), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->app_read), TRUE); if (edited->permissions & E_GW_PROXY_APPOINTMENT_WRITE) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->app_write), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->app_write), TRUE); if (edited->permissions & E_GW_PROXY_NOTES_READ) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_read), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->note_read), TRUE); if (edited->permissions & E_GW_PROXY_NOTES_WRITE) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->note_write), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->note_write), TRUE); if (edited->permissions & E_GW_PROXY_TASK_READ) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_read), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->task_read), TRUE); if (edited->permissions & E_GW_PROXY_TASK_WRITE) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->task_write), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->task_write), TRUE); if (edited->permissions & E_GW_PROXY_GET_ALARMS) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->alarms), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->alarms), TRUE); if (edited->permissions & E_GW_PROXY_GET_NOTIFICATIONS) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->notifications), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->notifications), TRUE); if (edited->permissions & E_GW_PROXY_MODIFY_FOLDERS) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->options), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->options), TRUE); if (edited->permissions & E_GW_PROXY_READ_PRIVATE) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (priv->private), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->private), TRUE); } static void diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h index 0661239e59..5dc1bb47e6 100644 --- a/plugins/groupwise-features/proxy.h +++ b/plugins/groupwise-features/proxy.h @@ -55,7 +55,7 @@ GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data); static void proxy_add_account (GtkWidget *button, EAccount *account); static void proxy_remove_account (GtkWidget *button, EAccount *account); static void proxy_update_tree_view (EAccount *account); -static void proxy_cancel(GtkWidget *button, EAccount *account); +static void proxy_cancel (GtkWidget *button, EAccount *account); static void proxy_edit_account (GtkWidget *button, EAccount *account); void proxy_abort (GtkWidget *button, EConfigHookItemFactoryData *data); void proxy_commit (GtkWidget *button, EConfigHookItemFactoryData *data); diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 3951de9df1..21485a96c2 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -161,7 +161,7 @@ create_folder_done (struct _EMCreateFolder *m) (ssi->sf)->cnc = ccnc; (ssi->sf)->container_id = g_strdup (get_container_id ((ssi->sf)->cnc, m->full_name)); - share_folder(ssi->sf); + share_folder (ssi->sf); } m->done (m, m->user_data); @@ -233,7 +233,7 @@ create_folder (CamelStore *store, const gchar *full_name, void (* done) (struct } static void -users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) +users_dialog_response (GtkWidget *dialog, gint response, struct ShareInfo *ssi) { struct _EMFolderTreeModelStoreInfo *si; EMFolderSelector *emfs = ssi->emfs; @@ -242,7 +242,7 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) if (response != GTK_RESPONSE_OK) { gtk_widget_destroy ((GtkWidget *) emfs); - gtk_widget_destroy(dialog); + gtk_widget_destroy (dialog); return; } @@ -262,16 +262,16 @@ users_dialog_response(GtkWidget *dialog, gint response, struct ShareInfo *ssi) return; } - if (CAMEL_IS_VEE_STORE(store)) { + if (CAMEL_IS_VEE_STORE (store)) { EMVFolderRule *rule; /* ensures vfolder is running */ vfolder_load_storage (); - rule = em_vfolder_rule_new(); - e_filter_rule_set_name((EFilterRule *)rule, path); - vfolder_gui_add_rule(rule); - gtk_widget_destroy((GtkWidget *)emfs); + rule = em_vfolder_rule_new (); + e_filter_rule_set_name ((EFilterRule *)rule, path); + vfolder_gui_add_rule (rule); + gtk_widget_destroy ((GtkWidget *)emfs); } else { g_object_ref (emfs); ssi->d = dialog; @@ -292,7 +292,7 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m EGwConnection *cnc; CamelStore *store; - ssi = g_new0(struct ShareInfo, 1); + ssi = g_new0 (struct ShareInfo, 1); if (response != GTK_RESPONSE_OK) { gtk_widget_destroy ((GtkWidget *) emfs); return; @@ -309,17 +309,17 @@ new_folder_response (EMFolderSelector *emfs, gint response, EMFolderTreeModel *m users_dialog = gtk_dialog_new_with_buttons ( _("Users"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); w = gtk_label_new_with_mnemonic (_("Enter the users and set permissions")); - gtk_widget_show(w); + gtk_widget_show (w); content_area = gtk_dialog_get_content_area (GTK_DIALOG (users_dialog)); - gtk_box_pack_start(GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6); + gtk_box_pack_start (GTK_BOX (content_area), (GtkWidget *) w, TRUE, TRUE, 6); ssi->sf = share_folder_new (cnc, NULL); gtk_widget_set_sensitive (GTK_WIDGET ((ssi->sf)->table), TRUE); ssi->model = model; ssi->emfs = emfs; gtk_widget_reparent (GTK_WIDGET ((ssi->sf)->table), content_area); - gtk_widget_hide((GtkWidget*) emfs); + gtk_widget_hide ((GtkWidget*) emfs); gtk_window_resize (GTK_WINDOW (users_dialog), 350, 300); - gtk_widget_show(users_dialog); + gtk_widget_show (users_dialog); g_signal_connect (users_dialog, "response", G_CALLBACK (users_dialog_response), ssi); g_object_unref (store); @@ -343,11 +343,11 @@ gw_new_shared_folder_cb (GtkAction *action, EShellView *shell_view) uri = em_folder_tree_get_selected_uri (folder_tree); if (uri != NULL) em_folder_selector_set_selected ((EMFolderSelector *) dialog, uri); - g_free(uri); + g_free (uri); g_signal_connect (dialog, "response", G_CALLBACK (new_folder_response), gtk_tree_view_get_model (GTK_TREE_VIEW (folder_tree))); gtk_window_set_title (GTK_WINDOW (dialog), "New Shared Folder" ); - gtk_widget_show(dialog); + gtk_widget_show (dialog); } GtkWidget * @@ -364,7 +364,7 @@ org_gnome_shared_folder_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_d CamelFolder *folder = target->folder; folder_name = g_strdup (camel_folder_get_full_name (folder)); - folderuri = g_strdup(target->uri); + folderuri = g_strdup (target->uri); if (folderuri && folder_name) account = g_strrstr(folderuri, "groupwise"); else @@ -424,7 +424,7 @@ get_cnc (CamelStore *store) if (!store) return NULL; - service = CAMEL_SERVICE(store); + service = CAMEL_SERVICE (store); url = service->url; server_name = g_strdup (url->host); user = g_strdup (url->user); @@ -432,7 +432,7 @@ get_cnc (CamelStore *store) use_ssl = g_strdup (camel_url_get_param (url, "use_ssl")); if (property_value == NULL) port = g_strdup ("7191"); - else if (strlen(property_value) == 0) + else if (strlen (property_value) == 0) port = g_strdup ("7191"); else port = g_strdup (property_value); @@ -456,7 +456,7 @@ get_cnc (CamelStore *store) } gchar * -get_container_id(EGwConnection *cnc, const gchar *fname) +get_container_id (EGwConnection *cnc, const gchar *fname) { GList *container_list = NULL; gchar *id = NULL; diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 365b7c1fb1..d27a463f5b 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -45,18 +45,18 @@ static void share_folder_class_init (ShareFolderClass *class); static void share_folder_init (ShareFolder *sf); static void share_folder_destroy (GtkObject *obj); static void share_folder_finalise (GObject *obj); -static void free_user_node(EShUsers *user); -static void free_node(SharedUser *user); -static void free_all(ShareFolder *sf); -static SharedUser * find_node(GList *list, gchar *email); +static void free_user_node (EShUsers *user); +static void free_node (SharedUser *user); +static void free_all (ShareFolder *sf); +static SharedUser * find_node (GList *list, gchar *email); static void get_container_list (ShareFolder *sf); -static void user_selected(GtkTreeSelection *selection, ShareFolder *sf); +static void user_selected (GtkTreeSelection *selection, ShareFolder *sf); static void not_shared_clicked (GtkRadioButton *button, ShareFolder *sf); static void shared_clicked (GtkRadioButton *button, ShareFolder *sf); -static void add_clicked(GtkButton *button, ShareFolder *sf); -static void remove_clicked(GtkButton *button, ShareFolder *sf); -static void not_ok_clicked(GtkButton *button, ShareFolder *sf); -static void not_cancel_clicked(GtkButton *button, GtkWidget *window); +static void add_clicked (GtkButton *button, ShareFolder *sf); +static void remove_clicked (GtkButton *button, ShareFolder *sf); +static void not_ok_clicked (GtkButton *button, ShareFolder *sf); +static void not_cancel_clicked (GtkButton *button, GtkWidget *window); static void share_folder_construct (ShareFolder *sf); GType share_folder_get_type (void); @@ -100,7 +100,7 @@ share_folder_finalise (GObject *obj) { ShareFolder *sf = (ShareFolder *) obj; g_object_unref (sf->builder); - free_all(sf); + free_all (sf); G_OBJECT_CLASS (parent_class)->finalize (obj); } @@ -127,28 +127,28 @@ share_folder_init (ShareFolder *sf) } static void -free_user_node(EShUsers *user) +free_user_node (EShUsers *user) { if (user) { - g_free(user->email); + g_free (user->email); user->email = NULL; } return; } static void -free_node(SharedUser *usr) +free_node (SharedUser *usr) { EShUsers *user = usr->user_node; if (user) { - g_free(user->email); + g_free (user->email); user->email = NULL; } return; } static SharedUser * -find_node(GList *list, gchar *email) +find_node (GList *list, gchar *email) { SharedUser *user = NULL; EShUsers *usr = NULL; @@ -156,15 +156,15 @@ find_node(GList *list, gchar *email) gint i; if (list) { - tmp = g_list_first(list); + tmp = g_list_first (list); for (i=0; tmp; i++) { user = tmp->data; usr = user->user_node; - if (!g_ascii_strcasecmp(usr->email, email)) { + if (!g_ascii_strcasecmp (usr->email, email)) { return user; /*if found, it returns that user*/ } - tmp= g_list_next(tmp); + tmp= g_list_next (tmp); } } return NULL; @@ -193,15 +193,15 @@ display_container (EGwContainer *container , ShareFolder *sf) EShUsers *user = NULL; sf->gcontainer = container; - if (!(byme = e_gw_container_get_is_shared_by_me(container))) - tome = e_gw_container_get_is_shared_to_me(container); + if (!(byme = e_gw_container_get_is_shared_by_me (container))) + tome = e_gw_container_get_is_shared_to_me (container); if (byme || tome) { e_gw_container_get_user_list (sf->gcontainer, &user_list); sf->users = g_list_length (user_list); if (sf->users != 0) { sf->is_shared = TRUE; - gtk_toggle_button_set_active((GtkToggleButton *) sf->shared, TRUE); - shared_clicked(sf->shared , sf); + gtk_toggle_button_set_active ((GtkToggleButton *) sf->shared, TRUE); + shared_clicked (sf->shared , sf); if (tome) { g_print ("Entered: inside too\n"); @@ -270,16 +270,16 @@ get_container_list (ShareFolder *sf) gchar *id_shared = NULL; gchar *id_unshared = NULL; - id_shared = g_strdup(e_gw_container_get_id (container->data)); + id_shared = g_strdup (e_gw_container_get_id (container->data)); /* this has to be done since id changes after the folder is shared*/ if ( g_str_has_suffix (id_shared, "35")) { tail = g_strsplit(id_shared, "@", 2); id_unshared = g_strconcat(tail[0], "@", "13", NULL); - g_strfreev(tail); + g_strfreev (tail); } - if ((id_shared && !g_ascii_strcasecmp(id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp(id_unshared, sf->container_id))) { + if ((id_shared && !g_ascii_strcasecmp (id_shared, sf->container_id)) ||(id_unshared && !g_ascii_strcasecmp (id_unshared, sf->container_id))) { display_container (E_GW_CONTAINER (container->data), sf); g_free (id_shared); @@ -317,7 +317,7 @@ not_shared_clicked (GtkRadioButton *button, ShareFolder *sf) } static void -add_clicked(GtkButton *button, ShareFolder *sf) +add_clicked (GtkButton *button, ShareFolder *sf) { const gchar *email = NULL; const gchar *self_email = NULL; @@ -359,7 +359,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) } usr = g_new0 (EShUsers, 1); new_user = g_new0 (SharedUser, 1); - usr->email = g_strdup(email); + usr->email = g_strdup (email); usr->rights = rights; new_user->user_node = usr; new_user->flag = 1; @@ -368,7 +368,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) /* have to add code for rights*/ gtk_list_store_set (GTK_LIST_STORE (sf->model), &(sf->iter), 0, msg, -1); - g_free(msg); + g_free (msg); sf->users_list = g_list_append (sf->users_list, new_user); sf->flag_for_ok = 0; } @@ -378,7 +378,7 @@ add_clicked(GtkButton *button, ShareFolder *sf) } static void -remove_clicked(GtkButton *button, ShareFolder *sf) +remove_clicked (GtkButton *button, ShareFolder *sf) { SharedUser *usr = NULL; @@ -388,7 +388,7 @@ remove_clicked(GtkButton *button, ShareFolder *sf) usr = find_node (sf->users_list, email); if (usr->flag & 0x1) { sf->users_list = g_list_remove (sf->users_list, usr); - free_node(usr); + free_node (usr); } else { usr->flag = 0; usr->flag |= 0x4; @@ -474,7 +474,7 @@ share_folder (ShareFolder *sf) } static void -not_ok_clicked(GtkButton *button, ShareFolder *sf) +not_ok_clicked (GtkButton *button, ShareFolder *sf) { gchar *subj = NULL; @@ -498,13 +498,13 @@ not_ok_clicked(GtkButton *button, ShareFolder *sf) } static void -not_cancel_clicked(GtkButton *button, GtkWidget *window) +not_cancel_clicked (GtkButton *button, GtkWidget *window) { - gtk_widget_destroy(window); + gtk_widget_destroy (window); } static void -notification_clicked(GtkButton *button, ShareFolder *sf) +notification_clicked (GtkButton *button, ShareFolder *sf) { static GtkBuilder *builder; GtkButton *not_ok; @@ -520,7 +520,7 @@ notification_clicked(GtkButton *button, ShareFolder *sf) vbox = GTK_WIDGET (e_builder_get_widget (builder, "vbox191")); gtk_container_add (GTK_CONTAINER (sf->window), vbox); sf->subject = GTK_ENTRY (e_builder_get_widget (builder, "entry3")); - gtk_entry_set_text(GTK_ENTRY (sf->subject) , sf->sub); + gtk_entry_set_text (GTK_ENTRY (sf->subject) , sf->sub); sf->message = GTK_TEXT_VIEW (e_builder_get_widget (builder, "textview1")); not_ok = GTK_BUTTON (e_builder_get_widget (builder, "nOK")); g_signal_connect ((gpointer) not_ok, "clicked", G_CALLBACK (not_ok_clicked), sf); @@ -552,7 +552,7 @@ user_selected (GtkTreeSelection *selection, ShareFolder *sf) { GtkTreeModel *model; - gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); if (gtk_tree_selection_get_selected (selection, &model, &sf->iter)) gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), TRUE); } @@ -572,7 +572,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) return; } gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 1, &right , -1); - usr = find_node(sf->users_list, email); + usr = find_node (sf->users_list, email); if (!usr) { gtk_tree_path_free (path); return; @@ -591,7 +591,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) } static void -edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) +edit_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) { gboolean right = FALSE; SharedUser *usr = NULL; @@ -605,7 +605,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) return; } gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 2, &right , -1); - usr = find_node(sf->users_list, email); + usr = find_node (sf->users_list, email); if (!usr) { gtk_tree_path_free (path); return; @@ -625,7 +625,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) } static void -delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) +delete_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) { gboolean right = FALSE; SharedUser *usr = NULL; @@ -639,7 +639,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf ) return; } gtk_tree_model_get ((GtkTreeModel *) sf->model, &(sf->iter), 0, &email, 3, &right , -1); - usr = find_node(sf->users_list, email); + usr = find_node (sf->users_list, email); if (!usr) { gtk_tree_path_free (path); return; @@ -700,14 +700,14 @@ share_folder_construct (ShareFolder *sf) sf->remove = GTK_BUTTON(e_builder_get_widget(sf->builder, "Remove")); g_signal_connect ((GtkWidget *) sf->remove, "clicked", G_CALLBACK (remove_clicked), sf); - gtk_widget_set_sensitive(GTK_WIDGET (sf->remove), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (sf->remove), FALSE); sf->notification = GTK_BUTTON (e_builder_get_widget (sf->builder, "Notification")); g_signal_connect((GtkWidget *) sf->notification, "clicked", G_CALLBACK (notification_clicked), sf); sf->name = GTK_ENTRY (e_builder_get_widget (sf->builder, "entry4")); /*TODO:connect name and label*/ - gtk_widget_hide (GTK_WIDGET(sf->name)); + gtk_widget_hide (GTK_WIDGET (sf->name)); box = GTK_WIDGET (e_builder_get_widget (sf->builder, "hbox227")); gtk_box_pack_start (GTK_BOX (box), (GtkWidget *) name_selector_entry, TRUE, TRUE, 0); gtk_widget_show ((GtkWidget *) name_selector_entry); @@ -757,7 +757,7 @@ share_folder_new (EGwConnection *ccnc, gchar *id) new->cnc = ccnc; new->container_id = id; if (ccnc && id) - get_container_list(new); + get_container_list (new); return (ShareFolder *) new; } diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 4df979d4ef..2f4bf0c9f1 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -91,7 +91,7 @@ struct _ShareFolderClass { GType share_folderget_type (void); struct _ShareFolder * share_folder_new (EGwConnection *ccnc, gchar *id); -void share_folder(struct _ShareFolder *sf); +void share_folder (struct _ShareFolder *sf); gchar * get_container_id (EGwConnection *cnc, const gchar *fname); EGwConnection * get_cnc (CamelStore *store); diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index d350ef08ee..2ff2764a12 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -50,7 +50,7 @@ format_date (const gchar * value) time = e_gw_connection_get_date_from_string (value); str = ctime (&time); - str[strlen(str)-1] = '\0'; + str[strlen (str)-1] = '\0'; return str; } @@ -126,7 +126,7 @@ gw_track_message_status_cb (GtkAction *action, win = (GtkScrolledWindow *) gtk_scrolled_window_new (NULL, NULL); gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (win)); vbox = (GtkVBox *) gtk_vbox_new (FALSE, 12); - gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET(vbox)); + gtk_scrolled_window_add_with_viewport (win, GTK_WIDGET (vbox)); gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0); gtk_scrolled_window_set_policy (win, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -140,7 +140,7 @@ gw_track_message_status_cb (GtkAction *action, gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_label_set_use_markup (GTK_LABEL (widget), TRUE); gtk_table_attach (table, widget , 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - widget = gtk_label_new (camel_mime_message_get_subject(msg)); + widget = gtk_label_new (camel_mime_message_get_subject (msg)); gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5); gtk_table_attach (table, widget , 1, 2, row, row + 1, GTK_FILL, 0, 0, 0); row++; @@ -162,7 +162,7 @@ gw_track_message_status_cb (GtkAction *action, /* creation date */ time = camel_mime_message_get_date (msg, NULL); time_str = ctime (&time); - time_str[strlen(time_str)-1] = '\0' ; + time_str[strlen (time_str)-1] = '\0' ; boldmsg = g_strdup_printf ("%s", _("Creation date:")); widget = gtk_label_new (boldmsg); g_free (boldmsg); @@ -186,7 +186,7 @@ gw_track_message_status_cb (GtkAction *action, gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (table), FALSE, TRUE, 0); cnc = get_cnc (camel_folder_get_parent_store (folder)); - if (E_IS_GW_CONNECTION(cnc)) { + if (E_IS_GW_CONNECTION (cnc)) { GSList *recipient_list; e_gw_connection_get_item ( cnc, get_container_id (cnc, "Sent Items"), @@ -211,46 +211,46 @@ gw_track_message_status_cb (GtkAction *action, if (recipient->delivered_date) { label = g_string_append (label, _("Delivered: ")); - label = g_string_append (label, format_date(recipient->delivered_date)); + label = g_string_append (label, format_date (recipient->delivered_date)); label = g_string_append_c (label, '\n'); } if (recipient->opened_date) { label = g_string_append (label, _("Opened: ")); - label = g_string_append (label, format_date(recipient->opened_date)); + label = g_string_append (label, format_date (recipient->opened_date)); label = g_string_append_c (label, '\n'); } if (recipient->accepted_date) { label = g_string_append (label, _("Accepted: ")); - label = g_string_append (label, format_date(recipient->accepted_date)); + label = g_string_append (label, format_date (recipient->accepted_date)); label = g_string_append_c (label, '\n'); } if (recipient->deleted_date) { label = g_string_append (label, _("Deleted: ")); - label = g_string_append (label, format_date(recipient->deleted_date)); + label = g_string_append (label, format_date (recipient->deleted_date)); label = g_string_append_c (label, '\n'); } if (recipient->declined_date) { label = g_string_append (label, _("Declined: ")); - label = g_string_append (label, format_date(recipient->declined_date)); + label = g_string_append (label, format_date (recipient->declined_date)); label = g_string_append_c (label, '\n'); } if (recipient->completed_date) { label = g_string_append (label, _("Completed: ")); - label = g_string_append (label, format_date(recipient->completed_date)); + label = g_string_append (label, format_date (recipient->completed_date)); label = g_string_append_c (label, '\n'); } if (recipient->undelivered_date) { label = g_string_append (label, _("Undelivered: ")); - label = g_string_append (label, format_date(recipient->undelivered_date)); + label = g_string_append (label, format_date (recipient->undelivered_date)); label = g_string_append_c (label, '\n'); } - detail = GTK_LABEL(gtk_label_new (label->str)); + detail = GTK_LABEL (gtk_label_new (label->str)); g_string_free (label, TRUE); gtk_label_set_selectable (detail, TRUE); gtk_label_set_use_markup (detail, TRUE); - gtk_table_attach (table, GTK_WIDGET(detail) , 1, 2, row, row+1, GTK_FILL, 0, 0, 0); + gtk_table_attach (table, GTK_WIDGET (detail) , 1, 2, row, row+1, GTK_FILL, 0, 0, 0); row++; } } diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index f03c08e919..ad2757f683 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -97,28 +97,28 @@ imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data) temp = mail_config_get_account_by_source_url (account->source->url); - url = camel_url_new (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), NULL); + url = camel_url_new (e_account_get_string (account, E_ACCOUNT_SOURCE_URL), NULL); model = gtk_tree_view_get_model (ui->custom_headers_tree); - if (gtk_tree_model_get_iter_first(model, &iter)) { + if (gtk_tree_model_get_iter_first (model, &iter)) { do { header = NULL; gtk_tree_model_get (model, &iter, 0, &header, -1); - str = g_string_append (str, g_strstrip(header)); + str = g_string_append (str, g_strstrip (header)); str = g_string_append (str, " "); g_free (header); - } while (gtk_tree_model_iter_next(model, &iter)); + } while (gtk_tree_model_iter_next (model, &iter)); } - header = g_strstrip(g_strdup(str->str)); + header = g_strstrip (g_strdup (str->str)); camel_url_set_param (url, "imap_custom_headers", header); g_free (header); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->all_headers))) { + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ui->all_headers))) { camel_url_set_param (url, "all_headers", "1"); camel_url_set_param (url, "basic_headers", NULL); - } else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->basic_headers))) { + } else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ui->basic_headers))) { camel_url_set_param (url, "basic_headers", "1"); camel_url_set_param (url, "all_headers", NULL); } else { @@ -191,8 +191,8 @@ epif_add_header (GtkButton *button, EPImapFeaturesData *ui) GtkTreeSelection *selection; model = gtk_tree_view_get_model (ui->custom_headers_tree); - gtk_tree_store_append (GTK_TREE_STORE(model), &iter, NULL); - gtk_tree_store_set (GTK_TREE_STORE(model), &iter, 0, gtk_entry_get_text (ui->entry_header), -1); + gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); + gtk_tree_store_set (GTK_TREE_STORE (model), &iter, 0, gtk_entry_get_text (ui->entry_header), -1); selection = gtk_tree_view_get_selection (ui->custom_headers_tree); gtk_tree_selection_select_iter (selection, &iter); @@ -223,7 +223,7 @@ epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui) if (gtk_tree_selection_get_selected (select, &model, &iter)) { path = gtk_tree_model_get_path (model, &iter); - gtk_tree_store_remove(GTK_TREE_STORE(model), &iter); + gtk_tree_store_remove (GTK_TREE_STORE (model), &iter); if (gtk_tree_path_prev (path)) { gtk_tree_model_get_iter (model, &iter, path); @@ -241,7 +241,7 @@ epif_remove_header_clicked (GtkButton *button, EPImapFeaturesData *ui) static void epif_fetch_all_headers_toggled (GtkWidget *all_option, EPImapFeaturesData *ui) { - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(all_option))) + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (all_option))) gtk_widget_set_sensitive (ui->custom_headers_box, FALSE); else gtk_widget_set_sensitive (ui->custom_headers_box, TRUE); @@ -288,10 +288,10 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) ui->remove_header = GTK_BUTTON(e_builder_get_widget (builder, "removeHeader")); ui->entry_header = GTK_ENTRY (e_builder_get_widget (builder, "customHeaderEntry")); - url = camel_url_new (e_account_get_string(account, E_ACCOUNT_SOURCE_URL), NULL); + url = camel_url_new (e_account_get_string (account, E_ACCOUNT_SOURCE_URL), NULL); ui->store = gtk_tree_store_new (1, G_TYPE_STRING); - gtk_tree_view_set_model (ui->custom_headers_tree, GTK_TREE_MODEL(ui->store)); + gtk_tree_view_set_model (ui->custom_headers_tree, GTK_TREE_MODEL (ui->store)); selection = gtk_tree_view_get_selection (ui->custom_headers_tree); @@ -304,7 +304,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data) ui->custom_headers_array = g_strsplit (custom_headers, " ", -1); while (ui->custom_headers_array[i] ) { - if (strlen(g_strstrip(ui->custom_headers_array[i]))) { + if (strlen (g_strstrip (ui->custom_headers_array[i]))) { gtk_tree_store_append (ui->store, &iter, NULL); gtk_tree_store_set (ui->store, &iter, 0, ui->custom_headers_array[i], -1); diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index 5e46cb42b6..f0ca0fd807 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -132,7 +132,7 @@ struct _itip_puri { void format_itip (EPlugin *ep, EMFormatHookTarget *target); GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data); -static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri); +static void itip_attachment_frame (EMFormat *emf, CamelStream *stream, EMFormatPURI *puri); gint e_plugin_lib_enable (EPlugin *ep, gint enable); typedef struct { @@ -229,7 +229,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet { EIterator *it; - it = e_list_get_iterator((EList *)pitip->accounts); + it = e_list_get_iterator ((EList *)pitip->accounts); if (!pitip->to_address && pitip->msg) { EAccount *account = em_utils_guess_account (pitip->msg, pitip->folder); @@ -245,12 +245,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet /* Look through the list of attendees to find the user's address */ if (!pitip->to_address) - while (e_iterator_is_valid(it)) { - const EAccount *account = e_iterator_get(it); + while (e_iterator_is_valid (it)) { + const EAccount *account = e_iterator_get (it); icalproperty *prop = NULL; if (!account->enabled) { - e_iterator_next(it); + e_iterator_next (it); continue; } @@ -285,7 +285,7 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet break; } - e_iterator_next(it); + e_iterator_next (it); } e_iterator_reset (it); @@ -300,12 +300,12 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet * general. Hence, we choose to iterate through the accounts list again. */ if (!pitip->to_address) - while (e_iterator_is_valid(it)) { - const EAccount *account = e_iterator_get(it); + while (e_iterator_is_valid (it)) { + const EAccount *account = e_iterator_get (it); icalproperty *prop = NULL; if (!account->enabled) { - e_iterator_next(it); + e_iterator_next (it); continue; } @@ -340,10 +340,10 @@ find_to_address (struct _itip_puri *pitip, icalcomponent *ical_comp, icalparamet break; } - e_iterator_next(it); + e_iterator_next (it); } - g_object_unref(it); + g_object_unref (it); } static void @@ -387,12 +387,12 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp) if (param) pitip->from_name = g_strdup (icalparameter_get_cn (param)); - it = e_list_get_iterator((EList *)pitip->accounts); - while (e_iterator_is_valid(it)) { - const EAccount *account = e_iterator_get(it); + it = e_list_get_iterator ((EList *)pitip->accounts); + while (e_iterator_is_valid (it)) { + const EAccount *account = e_iterator_get (it); if (!account->enabled) { - e_iterator_next(it); + e_iterator_next (it); continue; } @@ -402,9 +402,9 @@ find_from_address (struct _itip_puri *pitip, icalcomponent *ical_comp) break; } - e_iterator_next(it); + e_iterator_next (it); } - g_object_unref(it); + g_object_unref (it); g_free (organizer_sentby_clean); g_free (organizer_clean); } @@ -1723,7 +1723,7 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean * pitip->delegator_address = g_strdup (itip_strip_mailto (delfrom)); } } - g_free(my_address); + g_free (my_address); prop = NULL; /* Determine any delegate sections */ @@ -2017,7 +2017,7 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data) } } else { /* Either not a recurring appointment or "apply-to-all" is not selected. So just delete this instance alone */ - camel_folder_summary_remove_uid(pitip->folder->summary, pitip->uid); + camel_folder_summary_remove_uid (pitip->folder->summary, pitip->uid); camel_folder_change_info_remove_uid (changes, pitip->uid); } camel_folder_changed (pitip->folder, changes); @@ -2180,7 +2180,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject gboolean response_enabled; gboolean have_alarms = FALSE; - info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid); + info = (struct _itip_puri *) em_format_find_puri ((EMFormat *)efh, pobject->classid); /* Accounts */ info->accounts = itip_addresses_get (); @@ -2552,7 +2552,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) !camel_folder_get_message_user_flag (target->format->folder, target->format->uid, "$has_cal")) camel_folder_set_message_user_flag (target->format->folder, target->format->uid, "$has_cal", TRUE); - puri = (struct _itip_puri *)em_format_add_puri(target->format, sizeof(struct _itip_puri), classid, target->part, itip_attachment_frame); + puri = (struct _itip_puri *)em_format_add_puri (target->format, sizeof (struct _itip_puri), classid, target->part, itip_attachment_frame); em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object); @@ -2748,12 +2748,12 @@ itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data) } static void -itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) +itip_attachment_frame (EMFormat *emf, CamelStream *stream, EMFormatPURI *puri) { struct _itip_puri *info = (struct _itip_puri *)puri; d(printf("writing to frame content, handler is '%s'\n", info->handle->mime_type)); - info->handle->handler(emf, stream, info->puri.part, info->handle, FALSE); - camel_stream_close(stream, NULL); + info->handle->handler (emf, stream, info->puri.part, info->handle, FALSE); + camel_stream_close (stream, NULL); } diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index a46af56fa5..022c2c92d6 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -553,7 +553,7 @@ new_notify_status (EMEventTargetFolder *t) if (is_part_enabled (GCONF_KEY_STATUS_NOTIFICATION)) { gchar *safetext; - safetext = g_markup_escape_text(msg, strlen(msg)); + safetext = g_markup_escape_text (msg, strlen (msg)); if (notify) { notify_notification_update ( notify, _("New email"), @@ -581,7 +581,7 @@ new_notify_status (EMEventTargetFolder *t) 500, notification_callback, notify); } } - g_free(safetext); + g_free (safetext); } #endif @@ -688,17 +688,17 @@ do_play_sound (gboolean beep, gboolean use_theme, const gchar *file) if (!beep) { #ifdef HAVE_CANBERRA if (!use_theme && file && *file) - ca_context_play(mailnotification, 0, + ca_context_play (mailnotification, 0, CA_PROP_MEDIA_FILENAME, file, NULL); else - ca_context_play(mailnotification, 0, + ca_context_play (mailnotification, 0, CA_PROP_EVENT_ID,"message-new-email", NULL); #endif } else - gdk_beep(); + gdk_beep (); } struct _SoundConfigureWidgets @@ -740,8 +740,8 @@ sound_play_cb (GtkWidget *widget, gpointer data) return; file = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (scw->filechooser)); - do_play_sound (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (scw->beep)), - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (scw->use_theme)), + do_play_sound (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scw->beep)), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (scw->use_theme)), file); g_free (file); } @@ -805,15 +805,15 @@ enable_sound (gint enable) { #ifdef HAVE_CANBERRA if (enable) { - ca_context_create(&mailnotification); - ca_context_change_props( + ca_context_create (&mailnotification); + ca_context_change_props ( mailnotification, CA_PROP_APPLICATION_NAME, "mailnotification Plugin", NULL); } else - ca_context_destroy(mailnotification); + ca_context_destroy (mailnotification); #endif } diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 70520e1155..254451ce7d 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -165,7 +165,7 @@ emla_list_action_do (CamelFolder *folder, } /* get URL portion */ - url = g_strndup(headerpos, end - headerpos); + url = g_strndup (headerpos, end - headerpos); if (strncmp (url, "mailto:", 6) == 0) { if (emla_action_headers[t].interactive) diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 9cbbfdc950..5649bd8661 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -336,12 +336,12 @@ mark_all_as_read (CamelFolder *folder) gint i; uids = camel_folder_get_uids (folder); - camel_folder_freeze(folder); + camel_folder_freeze (folder); for (i=0;ilen;i++) camel_folder_set_message_flags ( folder, uids->pdata[i], CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN); - camel_folder_thaw(folder); + camel_folder_thaw (folder); camel_folder_free_uids (folder, uids); } diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c index 996f07810f..0817bdc674 100644 --- a/plugins/plugin-manager/plugin-manager.c +++ b/plugins/plugin-manager/plugin-manager.c @@ -198,7 +198,7 @@ eppm_enable_toggled (GtkCellRendererToggle *renderer, const gchar *path_string, g_warning ("%s", plugin->name); - gtk_list_store_set (GTK_LIST_STORE(m->model), &iter, + gtk_list_store_set (GTK_LIST_STORE (m->model), &iter, COL_PLUGIN_ENABLED, plugin->enabled, -1); } diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index f4d5c168be..630b5e3ab4 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -34,9 +34,9 @@ #include #include -void org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t); -void org_gnome_prefer_plain_text_html(gpointer ep, EMFormatHookTarget *t); -GtkWidget *org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); +void org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t); +void org_gnome_prefer_plain_text_html (gpointer ep, EMFormatHookTarget *t); +GtkWidget *org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data); enum { EPP_NORMAL, @@ -94,7 +94,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream if (!mp || !CAMEL_IS_MULTIPART (mp)) return; - nparts = camel_multipart_get_number(mp); + nparts = camel_multipart_get_number (mp); for (i = 0; i < nparts; i++) { part = camel_multipart_get_part (mp, i); @@ -111,7 +111,7 @@ export_as_attachments (CamelMultipart *mp, EMFormat *format, CamelStream *stream } void -org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t) +org_gnome_prefer_plain_multipart_alternative (gpointer ep, EMFormatHookTarget *t) { CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content ((CamelMedium *)t->part); CamelMimePart *part, *display_part = NULL; @@ -161,14 +161,14 @@ org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t) t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); } return; - } else if (!CAMEL_IS_MULTIPART(mp)) { - em_format_format_source(t->format, t->stream, t->part); + } else if (!CAMEL_IS_MULTIPART (mp)) { + em_format_format_source (t->format, t->stream, t->part); return; } - nparts = camel_multipart_get_number(mp); + nparts = camel_multipart_get_number (mp); for (i=0; iformat->part_id, ".alternative-prefer-plain.%d", displayid); em_format_part_as(t->format, t->stream, display_part, "text/plain"); - g_string_truncate(t->format->part_id, partidlen); + g_string_truncate (t->format->part_id, partidlen); } /* all other parts are attachments */ if (epp_show_suppressed) export_as_attachments (mp, t->format, t->stream, display_part); - g_string_truncate(t->format->part_id, partidlen); + g_string_truncate (t->format->part_id, partidlen); } static struct { @@ -211,9 +211,9 @@ update_info_label (GtkWidget *info_label, guint mode) } static void -epp_mode_changed(GtkComboBox *dropdown, GtkWidget *info_label) +epp_mode_changed (GtkComboBox *dropdown, GtkWidget *info_label) { - epp_mode = gtk_combo_box_get_active(dropdown); + epp_mode = gtk_combo_box_get_active (dropdown); if (epp_mode > 2) epp_mode = 0; @@ -231,7 +231,7 @@ epp_show_suppressed_toggled (GtkToggleButton *check, gpointer data) } GtkWidget * -org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) +org_gnome_prefer_plain_config_mode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) { /*EMConfigTargetPrefs *ep = (EMConfigTargetPrefs *)data->target;*/ GtkComboBox *dropdown; @@ -249,20 +249,20 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem gtk_widget_show (check); g_signal_connect (check, "toggled", G_CALLBACK (epp_show_suppressed_toggled), NULL); - dropdown = (GtkComboBox *)gtk_combo_box_new(); - cell = gtk_cell_renderer_text_new(); - store = gtk_list_store_new(1, G_TYPE_STRING); + dropdown = (GtkComboBox *)gtk_combo_box_new (); + cell = gtk_cell_renderer_text_new (); + store = gtk_list_store_new (1, G_TYPE_STRING); for (i = 0; i < G_N_ELEMENTS (epp_options); i++) { - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, _(epp_options[i].label), -1); + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, _(epp_options[i].label), -1); } - gtk_cell_layout_pack_start((GtkCellLayout *)dropdown, cell, TRUE); + gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE); gtk_cell_layout_set_attributes((GtkCellLayout *)dropdown, cell, "text", 0, NULL); - gtk_combo_box_set_model(dropdown, (GtkTreeModel *)store); + gtk_combo_box_set_model (dropdown, (GtkTreeModel *)store); /*gtk_combo_box_set_active(dropdown, -1);*/ - gtk_combo_box_set_active(dropdown, epp_mode); - gtk_widget_show((GtkWidget *)dropdown); + gtk_combo_box_set_active (dropdown, epp_mode); + gtk_widget_show ((GtkWidget *)dropdown); dropdown_label = gtk_label_new_with_mnemonic (_("HTML _Mode")); gtk_widget_show (dropdown_label); @@ -278,20 +278,20 @@ org_gnome_prefer_plain_config_mode(struct _EPlugin *epl, struct _EConfigHookItem g_signal_connect (dropdown, "changed", G_CALLBACK(epp_mode_changed), info); g_object_get (data->parent, "n-rows", &i, NULL); - gtk_table_attach((GtkTable *)data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_table_attach((GtkTable *)data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0); - gtk_table_attach((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); - gtk_table_attach((GtkTable *)data->parent, info, 1, 2, i + 2, i + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); + gtk_table_attach ((GtkTable *)data->parent, check, 0, 2, i, i + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0); + gtk_table_attach ((GtkTable *)data->parent, dropdown_label, 0, 1, i + 1, i + 2, 0, 0, 0, 0); + gtk_table_attach ((GtkTable *)data->parent, (GtkWidget *)dropdown, 1, 2, i + 1, i + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); + gtk_table_attach ((GtkTable *)data->parent, info, 1, 2, i + 2, i + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0); /* since this isnt dynamic, we don't need to track each item */ return (GtkWidget *)dropdown; } -gint e_plugin_lib_enable(EPlugin *ep, gint enable); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable(EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, gint enable) { gchar *key; gint i; @@ -302,11 +302,11 @@ e_plugin_lib_enable(EPlugin *ep, gint enable) if (enable) { GConfValue *val; - epp_gconf = gconf_client_get_default(); + epp_gconf = gconf_client_get_default (); key = gconf_client_get_string(epp_gconf, "/apps/evolution/eplugin/prefer_plain/mode", NULL); if (key) { for (i = 0; i < G_N_ELEMENTS (epp_options); i++) { - if (!strcmp(epp_options[i].key, key)) { + if (!strcmp (epp_options[i].key, key)) { epp_mode = i; break; } @@ -324,7 +324,7 @@ e_plugin_lib_enable(EPlugin *ep, gint enable) epp_show_suppressed = TRUE; } else { if (epp_gconf) { - g_object_unref(epp_gconf); + g_object_unref (epp_gconf); epp_gconf = NULL; } } diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c index 1a50b6e740..9744a684de 100644 --- a/plugins/profiler/profiler.c +++ b/plugins/profiler/profiler.c @@ -43,7 +43,7 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) } void -org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) +org_gnome_evolution_profiler_event (EPlugin *ep, EProfileEventTarget *t) { static FILE *fp; @@ -54,7 +54,7 @@ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t) fp = fopen(name, "w"); if (fp) fprintf(stderr, "Generating profiling data in '%s'\n", name); - g_free(name); + g_free (name); } if (fp) diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 4b913744cc..dcd28cbd65 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -83,7 +83,7 @@ static void pst_process_journal (PstImporter *m, pst_item *item); static void pst_import_file (PstImporter *m); gchar *foldername_to_utf8 (const gchar *pstname); -gchar *string_to_utf8(const gchar *string); +gchar *string_to_utf8 (const gchar *string); void contact_set_date (EContact *contact, EContactField id, FILETIME *date); struct icaltimetype get_ical_date (FILETIME *date, gboolean is_date); gchar *rfc2445_datetime_format (FILETIME *ft); @@ -512,7 +512,7 @@ pst_import_folders (PstImporter *m, pst_desc_tree *topitem) } else { while (d_ptr != topitem && d_ptr->next == NULL) { if (m->folder_uri) { - g_free(m->folder_uri); + g_free (m->folder_uri); } m->folder_uri = g_strdup (m->parent_uri); @@ -613,7 +613,7 @@ pst_process_item (PstImporter *m, pst_desc_tree *d_ptr) * @return utf8 representation (caller should free), or NULL for error. */ gchar * -string_to_utf8(const gchar *string) +string_to_utf8 (const gchar *string) { gchar *utf8; @@ -632,7 +632,7 @@ foldername_to_utf8 (const gchar *pstname) { gchar *utf8name, *folder_name; - utf8name = string_to_utf8(pstname); + utf8name = string_to_utf8 (pstname); if (utf8name == NULL) { folder_name = camel_url_encode (pstname, NULL); @@ -694,7 +694,7 @@ pst_create_folder (PstImporter *m) dest_len = strlen (dest); dest_end = dest + dest_len; - pos = dest + strlen(parent); + pos = dest + strlen (parent); while (pos != NULL && pos < dest_end) { pos = g_strstr_len (pos+1, dest_end-pos, "/"); @@ -753,7 +753,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach) attach_rc = pst_attach_to_mem (&m->pst, attach); camel_mime_part_set_content (part, (gchar *) attach_rc.data, attach_rc.size, mimetype); - free(attach_rc.data); + free (attach_rc.data); } return part; @@ -787,7 +787,7 @@ pst_process_email (PstImporter *m, pst_item *item) camel_mime_message_set_subject (msg, "(lost subject)"); } else { camel_mime_message_set_subject (msg, subj); - g_free(subj); + g_free (subj); } } @@ -886,7 +886,7 @@ pst_process_email (PstImporter *m, pst_item *item) for (attach = item->attach; attach; attach = attach->next) { if (attach->data.data || attach->i_id) { - part = attachment_to_part(m, attach); + part = attachment_to_part (m, attach); camel_multipart_add_part (mp, part); g_object_unref (part); } @@ -1192,9 +1192,9 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta CamelStream *stream; struct stat st; - part = attachment_to_part(m, attach); + part = attachment_to_part (m, attach); - orig_filename = camel_mime_part_get_filename(part); + orig_filename = camel_mime_part_get_filename (part); if (orig_filename == NULL) { g_warning("Ignoring unnamed attachment"); @@ -1209,24 +1209,24 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta g_free (tmp); g_free (filename); - dirname = g_path_get_dirname(path); - if (g_mkdir_with_parents(dirname, 0777) == -1) { + dirname = g_path_get_dirname (path); + if (g_mkdir_with_parents (dirname, 0777) == -1) { g_warning("Could not create directory %s: %s", dirname, g_strerror(errno)); - g_free(dirname); + g_free (dirname); attach = attach->next; continue; } - g_free(dirname); + g_free (dirname); - if (g_access(path, F_OK) == 0) { - if (g_access(path, W_OK) != 0) { + if (g_access (path, F_OK) == 0) { + if (g_access (path, W_OK) != 0) { g_warning("Could not write file %s - file exists", path); attach = attach->next; continue; } } - if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) { + if (g_stat (path, &st) != -1 && !S_ISREG (st.st_mode)) { g_warning("Could not write file %s - not a file", path); attach = attach->next; continue; @@ -1392,7 +1392,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const gcha } e_cal_component_add_alarm (ec, alarm); - e_cal_component_alarm_free(alarm); + e_cal_component_alarm_free (alarm); } @@ -1441,7 +1441,7 @@ pst_process_appointment (PstImporter *m, pst_item *item) if (!e_cal_create_object (m->calendar, e_cal_component_get_icalcomponent (ec), NULL, NULL)) { g_warning("Creation of appointment failed"); - g_free(ec); + g_free (ec); } g_object_unref (ec); @@ -1465,7 +1465,7 @@ pst_process_task (PstImporter *m, pst_item *item) if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) { g_warning("Creation of task failed"); - g_free(ec); + g_free (ec); } g_object_unref (ec); @@ -1512,7 +1512,7 @@ pst_process_journal (PstImporter *m, pst_item *item) if (!e_cal_create_object (m->journal, e_cal_component_get_icalcomponent (ec), NULL, NULL)) { g_warning("Creation of journal entry failed"); - g_free(ec); + g_free (ec); } g_object_unref (ec); diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index e75dc79b2d..97c90080fe 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -39,7 +39,7 @@ write_calendar (gchar *uid, ESourceList *source_list, GOutputStream *stream, gin ECal *client = NULL; GList *objects; icaltimezone *utc; - time_t start = time(NULL), end; + time_t start = time (NULL), end; icalcomponent *top_level; gchar *email = NULL; GList *users = NULL; diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index 69cce8b0d2..b6bc9422a7 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -339,36 +339,36 @@ url_editor_dialog_construct (UrlEditorDialog *dialog) e_load_ui_builder_definition (dialog->builder, "publish-calendar.ui"); #define GW(name) ((dialog->name) = e_builder_get_widget (dialog->builder, #name)) - GW(type_selector); - GW(fb_duration_label); - GW(fb_duration_spin); - GW(fb_duration_combo); - GW(publish_frequency); - - GW(events_swin); - - GW(publish_service); - GW(server_entry); - GW(file_entry); - - GW(port_entry); - GW(username_entry); - GW(password_entry); - GW(remember_pw); - - GW(optional_label); - - GW(port_hbox); - GW(username_hbox); - GW(password_hbox); - GW(server_hbox); - GW(file_hbox); - - GW(port_label); - GW(username_label); - GW(password_label); - GW(server_label); - GW(file_label); + GW (type_selector); + GW (fb_duration_label); + GW (fb_duration_spin); + GW (fb_duration_combo); + GW (publish_frequency); + + GW (events_swin); + + GW (publish_service); + GW (server_entry); + GW (file_entry); + + GW (port_entry); + GW (username_entry); + GW (password_entry); + GW (remember_pw); + + GW (optional_label); + + GW (port_hbox); + GW (username_hbox); + GW (password_hbox); + GW (server_hbox); + GW (file_hbox); + + GW (port_label); + GW (username_label); + GW (password_label); + GW (server_label); + GW (file_label); #undef GW uri = dialog->uri; diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 0b33453ff3..277350e5de 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -571,7 +571,7 @@ em_junk_sa_respawn_spamd () } gboolean -em_junk_sa_check_junk(EPlugin *ep, EMJunkTarget *target) +em_junk_sa_check_junk (EPlugin *ep, EMJunkTarget *target) { GByteArray *out = NULL; const gchar *argv[7]; @@ -801,7 +801,7 @@ em_junk_sa_validate_binary (EPlugin *ep) } static void -em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data) +em_junk_sa_setting_notify (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer data) { GConfValue *value; gchar *tkey; @@ -811,17 +811,17 @@ em_junk_sa_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, if (!(value = gconf_entry_get_value (entry))) return; - tkey = strrchr(entry->key, '/'); + tkey = strrchr (entry->key, '/'); g_return_if_fail (tkey != NULL); if (!strcmp(tkey, "local_only")) - em_junk_sa_local_only = gconf_value_get_bool(value); + em_junk_sa_local_only = gconf_value_get_bool (value); else if (!strcmp(tkey, "use_daemon")) - em_junk_sa_use_daemon = gconf_value_get_bool(value); + em_junk_sa_use_daemon = gconf_value_get_bool (value); else if (!strcmp(tkey, "socket_path")) { G_LOCK (socket_path); g_free (em_junk_sa_preferred_socket_path); - em_junk_sa_preferred_socket_path = g_strdup (gconf_value_get_string(value)); + em_junk_sa_preferred_socket_path = g_strdup (gconf_value_get_string (value)); G_UNLOCK (socket_path); } } @@ -834,7 +834,7 @@ e_plugin_lib_enable (EPlugin *ep, gint enable) if (is_installed) em_junk_sa_tested = FALSE; - em_junk_sa_init(); + em_junk_sa_init (); return 0; } @@ -845,7 +845,7 @@ em_junk_sa_init (void) G_LOCK (init); if (!em_junk_sa_gconf) { - em_junk_sa_gconf = gconf_client_get_default(); + em_junk_sa_gconf = gconf_client_get_default (); gconf_client_add_dir (em_junk_sa_gconf, "/apps/evolution/mail/junk/sa", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); em_junk_sa_local_only = gconf_client_get_bool (em_junk_sa_gconf, "/apps/evolution/mail/junk/sa/local_only", NULL); @@ -908,7 +908,7 @@ em_junk_sa_finalize (void) { d(fprintf (stderr, "em_junk_sa_finalize\n")); - g_object_unref(em_junk_sa_gconf); + g_object_unref (em_junk_sa_gconf); em_junk_sa_kill_spamd (); } diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c index c3f566de4b..58dd9ac5af 100644 --- a/plugins/save-calendar/csv-format.c +++ b/plugins/save-calendar/csv-format.c @@ -243,7 +243,7 @@ add_string_to_csv (GString *line, const gchar *value, CsvConfig *config) { /* Will add a string to the record and will check for the need for quotes */ - if ((value) && (strlen(value)>0)) { + if ((value) && (strlen (value)>0)) { gboolean needquotes = string_needsquotes (value, config); if (needquotes) @@ -261,7 +261,7 @@ static gchar * userstring_to_systemstring (const gchar *userstring) { const gchar *text = userstring; - gint i=0, len = strlen(text); + gint i=0, len = strlen (text); GString *str = g_string_new (""); gchar *retval = NULL; @@ -340,11 +340,11 @@ do_save_calendar_csv (FormatHandler *handler, config = g_new (CsvConfig, 1); - tmp = gtk_entry_get_text (GTK_ENTRY(d->delimiter_entry)); + tmp = gtk_entry_get_text (GTK_ENTRY (d->delimiter_entry)); config->delimiter = userstring_to_systemstring (tmp?tmp:", "); - tmp = gtk_entry_get_text (GTK_ENTRY(d->newline_entry)); + tmp = gtk_entry_get_text (GTK_ENTRY (d->newline_entry)); config->newline = userstring_to_systemstring (tmp?tmp:"\\n"); - tmp = gtk_entry_get_text (GTK_ENTRY(d->quote_entry)); + tmp = gtk_entry_get_text (GTK_ENTRY (d->quote_entry)); config->quote = userstring_to_systemstring (tmp?tmp:"\""); config->header = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (d->header_check)); @@ -379,10 +379,10 @@ do_save_calendar_csv (FormatHandler *handler, }; line = g_string_new (""); - for (i=0;i0) - line = g_string_append(line, config->delimiter); - line = g_string_append(line, _(labels[i])); + line = g_string_append (line, config->delimiter); + line = g_string_append (line, _(labels[i])); } line = g_string_append (line, config->newline); diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c index acbb6557c6..8014fe9ddf 100644 --- a/plugins/save-calendar/rdf-format.c +++ b/plugins/save-calendar/rdf-format.c @@ -205,7 +205,7 @@ do_save_calendar_rdf (FormatHandler *handler, ESourceSelector *selector, ECalSou 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)) { - xmlBufferPtr buffer=xmlBufferCreate(); + xmlBufferPtr buffer=xmlBufferCreate (); xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0"); xmlNodePtr fnode; diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c index b7872a68d4..facb915566 100644 --- a/plugins/save-calendar/save-calendar.c +++ b/plugins/save-calendar/save-calendar.c @@ -118,7 +118,7 @@ ask_destination_and_save (ESourceSelector *selector, ECalSourceType type) GtkWidget *extra_widget = gtk_vbox_new (FALSE, 0); GtkWidget *hbox = gtk_hbox_new (FALSE, 0); GtkLabel *label = GTK_LABEL (gtk_label_new_with_mnemonic (_("_Format:"))); - GtkComboBox *combo = GTK_COMBO_BOX(gtk_combo_box_new ()); + GtkComboBox *combo = GTK_COMBO_BOX (gtk_combo_box_new ()); GtkTreeModel *model = GTK_TREE_MODEL (gtk_list_store_new (N_DEST_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER)); GtkCellRenderer *renderer=NULL; diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 483d9400eb..6b0857875e 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -131,8 +131,8 @@ commit_changes (UIData *ui) gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1); /* Check if the keyword and value are not empty */ - if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) - && (g_utf8_strlen(g_strstrip(value), -1) > 0)) { + if ((keyword) && (value) && (g_utf8_strlen (g_strstrip (keyword), -1) > 0) + && (g_utf8_strlen (g_strstrip (value), -1) > 0)) { key = g_strdup_printf("%s=%s", keyword, value); clue_list = g_slist_append (clue_list, key); } @@ -252,7 +252,7 @@ clue_add_clicked (GtkButton *button, UIData *ui) gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) clue_foreach_check_isempty, ui); /* Disconnect from signal so that we can create an empty row */ - g_signal_handlers_disconnect_matched(G_OBJECT(model), G_SIGNAL_MATCH_FUNC, 0, 0, NULL, clue_check_isempty, ui); + g_signal_handlers_disconnect_matched (G_OBJECT (model), G_SIGNAL_MATCH_FUNC, 0, 0, NULL, clue_check_isempty, ui); /* TODO : Trim and check for blank strings */ new_clue = g_strdup (""); @@ -265,7 +265,7 @@ clue_add_clicked (GtkButton *button, UIData *ui) if (path) { gtk_tree_view_set_cursor (GTK_TREE_VIEW (ui->treeview), path, focus_col, TRUE); - gtk_tree_view_row_activated(GTK_TREE_VIEW(ui->treeview), path, focus_col); + gtk_tree_view_row_activated (GTK_TREE_VIEW (ui->treeview), path, focus_col); gtk_tree_path_free (path); } @@ -291,17 +291,17 @@ clue_remove_clicked (GtkButton *button, UIData *ui) /* Get the path and move to the previous node :) */ path = gtk_tree_model_get_path (model, &iter); if (path) - valid = gtk_tree_path_prev(path); + valid = gtk_tree_path_prev (path); gtk_list_store_remove (GTK_LIST_STORE (model), &iter); len = gtk_tree_model_iter_n_children (model, NULL); if (len > 0) { - if (gtk_list_store_iter_is_valid (GTK_LIST_STORE(model), &iter)) { + if (gtk_list_store_iter_is_valid (GTK_LIST_STORE (model), &iter)) { gtk_tree_selection_select_iter (selection, &iter); } else { if (path && valid) { - gtk_tree_model_get_iter(model, &iter, path); + gtk_tree_model_get_iter (model, &iter, path); gtk_tree_selection_select_iter (selection, &iter); } } @@ -310,7 +310,7 @@ clue_remove_clicked (GtkButton *button, UIData *ui) gtk_widget_set_sensitive (ui->clue_remove, FALSE); } - gtk_widget_grab_focus(ui->treeview); + gtk_widget_grab_focus (ui->treeview); gtk_tree_path_free (path); commit_changes (ui); @@ -344,7 +344,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) GtkCellRenderer *renderer_key, *renderer_value; GtkTreeSelection *selection; GtkTreeIter iter; - GConfClient *gconf = gconf_client_get_default(); + GConfClient *gconf = gconf_client_get_default (); GtkWidget *hbox; GSList *clue_list = NULL, *list; GtkTreeModel *model; @@ -444,7 +444,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) gchar **temp = g_strsplit (list->data, "=", 2); gtk_list_store_append (ui->store, &iter); gtk_list_store_set (ui->store, &iter, CLUE_KEYWORD_COLUMN, temp[0], CLUE_VALUE_COLUMN, temp[1], -1); - g_strfreev(temp); + g_strfreev (temp); } if (clue_list) { @@ -483,7 +483,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes template = g_object_get_data (G_OBJECT (action), "template"); /* The new message we are creating */ - new = camel_mime_message_new(); + new = camel_mime_message_new (); /* make the exact copy of the template message, with all its attachments and message structure */ @@ -499,7 +499,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes header = ((CamelMimePart *)message)->headers; while (header) { if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) { - camel_medium_add_header((CamelMedium *) new, + camel_medium_add_header ((CamelMedium *) new, header->name, header->value); } diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 35f152a373..03577a4667 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -49,26 +49,26 @@ gint verbose = 0; gint saveRTF = 0; gint saveintermediate = 0; gboolean loaded = FALSE; -void processTnef(TNEFStruct *tnef, const gchar *tmpdir); -void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir); -void saveVCard(TNEFStruct *tnef, const gchar *tmpdir); -void saveVTask(TNEFStruct *tnef, const gchar *tmpdir); +void processTnef (TNEFStruct *tnef, const gchar *tmpdir); +void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir); +void saveVCard (TNEFStruct *tnef, const gchar *tmpdir); +void saveVTask (TNEFStruct *tnef, const gchar *tmpdir); -void org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t); +void org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t); /* Other Prototypes */ -void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); -void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); -void quotedfprint(FILE *fptr, variableLength *vl); -void cstylefprint(FILE *fptr, variableLength *vl); -void printRtf(FILE *fptr, variableLength *vl); -void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef); -guchar getRruleCount(guchar a, guchar b); -guchar getRruleMonthNum(guchar a, guchar b); -gchar * getRruleDayname(guchar a); +void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); +void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]); +void quotedfprint (FILE *fptr, variableLength *vl); +void cstylefprint (FILE *fptr, variableLength *vl); +void printRtf (FILE *fptr, variableLength *vl); +void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef); +guchar getRruleCount (guchar a, guchar b); +guchar getRruleMonthNum (guchar a, guchar b); +gchar * getRruleDayname (guchar a); void -org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) +org_gnome_format_tnef (gpointer ep, EMFormatHookTarget *t) { gchar *tmpdir, *name; CamelStream *out; @@ -86,43 +86,43 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) name = g_build_filename(tmpdir, ".evo-attachment.tnef", NULL); - out = camel_stream_fs_new_with_name(name, O_RDWR|O_CREAT, 0666, NULL); + out = camel_stream_fs_new_with_name (name, O_RDWR|O_CREAT, 0666, NULL); if (out == NULL) goto fail; content = camel_medium_get_content ((CamelMedium *)t->part); if (content == NULL) goto fail; - if (camel_data_wrapper_decode_to_stream(content, out, NULL) == -1 - || camel_stream_close(out, NULL) == -1) { + if (camel_data_wrapper_decode_to_stream (content, out, NULL) == -1 + || camel_stream_close (out, NULL) == -1) { g_object_unref (out); goto fail; } 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); + processTnef (&tnef, tmpdir); - TNEFFree(&tnef); + TNEFFree (&tnef); /* Extraction done */ - dir = opendir(tmpdir); + dir = opendir (tmpdir); if (dir == NULL) goto fail; - mainpart = camel_mime_part_new(); + mainpart = camel_mime_part_new (); - mp = camel_multipart_new(); + mp = camel_multipart_new (); camel_data_wrapper_set_mime_type((CamelDataWrapper *)mp, "multipart/mixed"); - camel_multipart_set_boundary(mp, NULL); + camel_multipart_set_boundary (mp, NULL); camel_medium_set_content ((CamelMedium *)mainpart, (CamelDataWrapper *)mp); - while ((d = readdir(dir))) { + while ((d = readdir (dir))) { CamelMimePart *part; CamelDataWrapper *content; CamelStream *stream; @@ -134,42 +134,42 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) || !strcmp(d->d_name, ".evo-attachment.tnef")) continue; - path = g_build_filename(tmpdir, d->d_name, NULL); + path = g_build_filename (tmpdir, d->d_name, NULL); - stream = camel_stream_fs_new_with_name(path, O_RDONLY, 0, NULL); - content = camel_data_wrapper_new(); - camel_data_wrapper_construct_from_stream(content, stream, NULL); + stream = camel_stream_fs_new_with_name (path, O_RDONLY, 0, NULL); + content = camel_data_wrapper_new (); + camel_data_wrapper_construct_from_stream (content, stream, NULL); g_object_unref (stream); - part = camel_mime_part_new(); - camel_mime_part_set_encoding(part, CAMEL_TRANSFER_ENCODING_BINARY); + part = camel_mime_part_new (); + camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BINARY); camel_medium_set_content ((CamelMedium *)part, content); g_object_unref (content); - type = em_format_snoop_type(part); + type = em_format_snoop_type (part); if (type) - camel_data_wrapper_set_mime_type((CamelDataWrapper *)part, type); + camel_data_wrapper_set_mime_type ((CamelDataWrapper *)part, type); - camel_mime_part_set_filename(part, d->d_name); + camel_mime_part_set_filename (part, d->d_name); - g_free(path); + g_free (path); - camel_multipart_add_part(mp, part); + camel_multipart_add_part (mp, part); g_object_unref (part); } - closedir(dir); + closedir (dir); len = t->format->part_id->len; g_string_append_printf(t->format->part_id, ".tnef"); - if (camel_multipart_get_number(mp) > 0) + if (camel_multipart_get_number (mp) > 0) em_format_part_as(t->format, t->stream, mainpart, "multipart/mixed"); else if (t->item->handler.old) - t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE); + t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); - g_string_truncate(t->format->part_id, len); + g_string_truncate (t->format->part_id, len); g_object_unref (mp); g_object_unref (mainpart); @@ -177,30 +177,30 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) goto ok; fail: if (t->item->handler.old) - t->item->handler.old->handler(t->format, t->stream, t->part, t->item->handler.old, FALSE); + t->item->handler.old->handler (t->format, t->stream, t->part, t->item->handler.old, FALSE); ok: - g_free(name); - g_free(tmpdir); + g_free (name); + g_free (tmpdir); } -gint e_plugin_lib_enable(EPlugin *ep, gint enable); +gint e_plugin_lib_enable (EPlugin *ep, gint enable); gint -e_plugin_lib_enable(EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, gint enable) { if (loaded) return 0; loaded = TRUE; if (enable) { - bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); } return 0; } -void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { +void processTnef (TNEFStruct *tnef, const gchar *tmpdir) { variableLength *filename; variableLength *filedata; Attachment *p; @@ -216,23 +216,23 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { /* ie: it's a Contact Card, Task, or Meeting request (vCal/vCard) */ if (tnef->messageClass[0] != 0) { if (strcmp(tnef->messageClass, "IPM.Contact") == 0) { - saveVCard(tnef, tmpdir); + saveVCard (tnef, tmpdir); } if (strcmp(tnef->messageClass, "IPM.Task") == 0) { - saveVTask(tnef, tmpdir); + saveVTask (tnef, tmpdir); } if (strcmp(tnef->messageClass, "IPM.Appointment") == 0) { - saveVCalendar(tnef, tmpdir); + saveVCalendar (tnef, tmpdir); foundCal = 1; } } - if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8,0x24))) != MAPI_UNDEFINED) { + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8,0x24))) != MAPI_UNDEFINED) { if (strcmp(filename->data, "IPM.Appointment") == 0) { /* If it's "indicated" twice, we don't want to save 2 calendar entries. */ if (foundCal == 0) { - saveVCalendar(tnef, tmpdir); + saveVCalendar (tnef, tmpdir); } } } @@ -240,26 +240,26 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { if (strcmp(tnef->messageClass, "IPM.Microsoft Mail.Note") == 0) { if ((saveRTF == 1) && (tnef->subject.size > 0)) { /* Description */ - if ((filename=MAPIFindProperty(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, PR_RTF_COMPRESSED))) + if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, PR_RTF_COMPRESSED))) != MAPI_UNDEFINED) { variableLength buf; - if ((buf.data = (gchar *) DecompressRTF(filename, &buf.size)) != NULL) { + if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) { sprintf(ifilename, "%s/%s.rtf", tmpdir, tnef->subject.data); - for (i=0; iMAPI), - PROP_TAG(PT_OBJECT, PR_ATTACH_DATA_OBJ))) + if ((filedata = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_OBJECT, PR_ATTACH_DATA_OBJ))) == MAPI_UNDEFINED) { - if ((filedata = MAPIFindProperty(&(p->MAPI), - PROP_TAG(PT_BINARY, PR_ATTACH_DATA_OBJ))) + if ((filedata = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_BINARY, PR_ATTACH_DATA_OBJ))) == MAPI_UNDEFINED) { /* Nope, standard TNEF stuff. */ filedata = &(p->FileData); @@ -294,43 +294,43 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { /* 16-byte identifier first. */ TNEFStruct emb_tnef; DWORD signature; - memcpy(&signature, filedata->data+16, sizeof(DWORD)); - if (TNEFCheckForSignature(signature) == 0) { + memcpy (&signature, filedata->data+16, sizeof (DWORD)); + if (TNEFCheckForSignature (signature) == 0) { /* Has a TNEF signature, so process it. */ - TNEFInitialize(&emb_tnef); + TNEFInitialize (&emb_tnef); emb_tnef.Debug = tnef->Debug; - if (TNEFParseMemory((guchar *) filedata->data+16, + if (TNEFParseMemory ((guchar *) filedata->data+16, filedata->size-16, &emb_tnef) != -1) { - processTnef(&emb_tnef, tmpdir); + processTnef (&emb_tnef, tmpdir); RealAttachment = 0; } - TNEFFree(&emb_tnef); + TNEFFree (&emb_tnef); } } else { TNEFStruct emb_tnef; DWORD signature; - memcpy(&signature, filedata->data, sizeof(DWORD)); - if (TNEFCheckForSignature(signature) == 0) { + memcpy (&signature, filedata->data, sizeof (DWORD)); + if (TNEFCheckForSignature (signature) == 0) { /* Has a TNEF signature, so process it. */ - TNEFInitialize(&emb_tnef); + TNEFInitialize (&emb_tnef); emb_tnef.Debug = tnef->Debug; - if (TNEFParseMemory((guchar *) filedata->data, + if (TNEFParseMemory ((guchar *) filedata->data, filedata->size, &emb_tnef) != -1) { - processTnef(&emb_tnef, tmpdir); + processTnef (&emb_tnef, tmpdir); RealAttachment = 0; } - TNEFFree(&emb_tnef); + TNEFFree (&emb_tnef); } } if ((RealAttachment == 1) || (saveintermediate == 1)) { gchar tmpname[20]; /* Ok, it's not an embedded stream, so now we */ /* process it. */ - if ((filename = MAPIFindProperty(&(p->MAPI), - PROP_TAG(PT_STRING8, PR_ATTACH_LONG_FILENAME))) + if ((filename = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_STRING8, PR_ATTACH_LONG_FILENAME))) == MAPI_UNDEFINED) { - if ((filename = MAPIFindProperty(&(p->MAPI), - PROP_TAG(PT_STRING8, PR_DISPLAY_NAME))) + if ((filename = MAPIFindProperty (&(p->MAPI), + PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { filename = &(p->Title); } @@ -341,7 +341,7 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { filename->data = tmpname; } sprintf(ifilename, "%s/%s", tmpdir, filename->data); - for (i=0; idata + 16, - sizeof(BYTE), + fwrite (filedata->data + 16, + sizeof (BYTE), filedata->size - 16, fptr); } else { - fwrite(filedata->data, - sizeof(BYTE), + fwrite (filedata->data, + sizeof (BYTE), filedata->size, fptr); } - fclose(fptr); + fclose (fptr); } } } /* if size>0 */ @@ -367,7 +367,7 @@ void processTnef(TNEFStruct *tnef, const gchar *tmpdir) { } /* while p!= null */ } -void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { +void saveVCard (TNEFStruct *tnef, const gchar *tmpdir) { gchar ifilename[512]; FILE *fptr; variableLength *vl; @@ -375,8 +375,8 @@ void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { dtr thedate; gint boolean, i; - if ((vl = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { - if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) { + if ((vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_NAME))) == MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) == MAPI_UNDEFINED) { if (tnef->subject.size > 0) { sprintf(ifilename, "%s/%s.vcard", tmpdir, tnef->subject.data); } else { @@ -388,7 +388,7 @@ void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { } else { sprintf(ifilename, "%s/%s.vcard", tmpdir, vl->data); } - for (i=0; iMapiProperties), PROP_TAG(PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COMPANY_NAME))) != MAPI_UNDEFINED) { if (vl->size > 0) { if ((vl->size == 1) && (vl->data[0] == 0)) { } else { fprintf(fptr,"ORG:%s", vl->data); - if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DEPARTMENT_NAME))) != MAPI_UNDEFINED) { fprintf(fptr,";%s", vl->data); } fprintf(fptr, "\n"); @@ -427,160 +427,160 @@ void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { fprintProperty(tnef, fptr, PT_STRING8, PR_BODY, "NOTE:%s\n"); if (tnef->body.size > 0) { fprintf(fptr, "NOTE;QUOTED-PRINTABLE:"); - quotedfprint(fptr, &(tnef->body)); + quotedfprint (fptr, &(tnef->body)); fprintf(fptr,"\n"); } /* Business Address */ boolean = 0; - if ((pobox = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { boolean = 1; } - if ((street = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_STREET_ADDRESS))) != MAPI_UNDEFINED) { + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STREET_ADDRESS))) != MAPI_UNDEFINED) { boolean = 1; } - if ((city = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_LOCALITY))) != MAPI_UNDEFINED) { + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_LOCALITY))) != MAPI_UNDEFINED) { boolean = 1; } - if ((state = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((zip = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_POSTAL_CODE))) != MAPI_UNDEFINED) { + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_POSTAL_CODE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((country = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_COUNTRY))) != MAPI_UNDEFINED) { + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_COUNTRY))) != MAPI_UNDEFINED) { boolean = 1; } if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;WORK:"); if (pobox != MAPI_UNDEFINED) { - quotedfprint(fptr, pobox); + quotedfprint (fptr, pobox); } fprintf(fptr, ";;"); if (street != MAPI_UNDEFINED) { - quotedfprint(fptr, street); + quotedfprint (fptr, street); } fprintf(fptr, ";"); if (city != MAPI_UNDEFINED) { - quotedfprint(fptr, city); + quotedfprint (fptr, city); } fprintf(fptr, ";"); if (state != MAPI_UNDEFINED) { - quotedfprint(fptr, state); + quotedfprint (fptr, state); } fprintf(fptr, ";"); if (zip != MAPI_UNDEFINED) { - quotedfprint(fptr, zip); + quotedfprint (fptr, zip); } fprintf(fptr, ";"); if (country != MAPI_UNDEFINED) { - quotedfprint(fptr, country); + quotedfprint (fptr, country); } fprintf(fptr,"\n"); - if ((vl = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x801b))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801b))) != MAPI_UNDEFINED) { fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:"); - quotedfprint(fptr, vl); + quotedfprint (fptr, vl); fprintf(fptr,"\n"); } } /* Home Address */ boolean = 0; - if ((pobox = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { boolean = 1; } - if ((street = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_STREET))) != MAPI_UNDEFINED) { + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STREET))) != MAPI_UNDEFINED) { boolean = 1; } - if ((city = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_CITY))) != MAPI_UNDEFINED) { + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_CITY))) != MAPI_UNDEFINED) { boolean = 1; } - if ((state = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((zip = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((country = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_HOME_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_HOME_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { boolean = 1; } if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;HOME:"); if (pobox != MAPI_UNDEFINED) { - quotedfprint(fptr, pobox); + quotedfprint (fptr, pobox); } fprintf(fptr, ";;"); if (street != MAPI_UNDEFINED) { - quotedfprint(fptr, street); + quotedfprint (fptr, street); } fprintf(fptr, ";"); if (city != MAPI_UNDEFINED) { - quotedfprint(fptr, city); + quotedfprint (fptr, city); } fprintf(fptr, ";"); if (state != MAPI_UNDEFINED) { - quotedfprint(fptr, state); + quotedfprint (fptr, state); } fprintf(fptr, ";"); if (zip != MAPI_UNDEFINED) { - quotedfprint(fptr, zip); + quotedfprint (fptr, zip); } fprintf(fptr, ";"); if (country != MAPI_UNDEFINED) { - quotedfprint(fptr, country); + quotedfprint (fptr, country); } fprintf(fptr,"\n"); - if ((vl = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x801a))) != MAPI_UNDEFINED) { + if ((vl = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x801a))) != MAPI_UNDEFINED) { fprintf(fptr, "LABEL;QUOTED-PRINTABLE;WORK:"); - quotedfprint(fptr, vl); + quotedfprint (fptr, vl); fprintf(fptr,"\n"); } } /* Other Address */ boolean = 0; - if ((pobox = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { + if ((pobox = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POST_OFFICE_BOX))) != MAPI_UNDEFINED) { boolean = 1; } - if ((street = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_STREET))) != MAPI_UNDEFINED) { + if ((street = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STREET))) != MAPI_UNDEFINED) { boolean = 1; } - if ((city = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_CITY))) != MAPI_UNDEFINED) { + if ((city = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_CITY))) != MAPI_UNDEFINED) { boolean = 1; } - if ((state = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { + if ((state = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_STATE_OR_PROVINCE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((zip = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { + if ((zip = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_POSTAL_CODE))) != MAPI_UNDEFINED) { boolean = 1; } - if ((country = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_OTHER_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { + if ((country = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_OTHER_ADDRESS_COUNTRY))) != MAPI_UNDEFINED) { boolean = 1; } if (boolean == 1) { fprintf(fptr, "ADR;QUOTED-PRINTABLE;OTHER:"); if (pobox != MAPI_UNDEFINED) { - quotedfprint(fptr, pobox); + quotedfprint (fptr, pobox); } fprintf(fptr, ";;"); if (street != MAPI_UNDEFINED) { - quotedfprint(fptr, street); + quotedfprint (fptr, street); } fprintf(fptr, ";"); if (city != MAPI_UNDEFINED) { - quotedfprint(fptr, city); + quotedfprint (fptr, city); } fprintf(fptr, ";"); if (state != MAPI_UNDEFINED) { - quotedfprint(fptr, state); + quotedfprint (fptr, state); } fprintf(fptr, ";"); if (zip != MAPI_UNDEFINED) { - quotedfprint(fptr, zip); + quotedfprint (fptr, zip); } fprintf(fptr, ";"); if (country != MAPI_UNDEFINED) { - quotedfprint(fptr, country); + quotedfprint (fptr, country); } fprintf(fptr,"\n"); } @@ -606,22 +606,22 @@ void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n"); /* Email addresses */ - if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8083))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8084)); + if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8083))) == MAPI_UNDEFINED) { + vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8084)); } if (vl != MAPI_UNDEFINED) { if (vl->size > 0) fprintf(fptr, "EMAIL:%s\n", vl->data); } - if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8093))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8094)); + if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8093))) == MAPI_UNDEFINED) { + vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x8094)); } if (vl != MAPI_UNDEFINED) { if (vl->size > 0) fprintf(fptr, "EMAIL:%s\n", vl->data); } - if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) { - vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x80a4)); + if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a3))) == MAPI_UNDEFINED) { + vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x80a4)); } if (vl != MAPI_UNDEFINED) { if (vl->size > 0) @@ -632,98 +632,98 @@ void saveVCard(TNEFStruct *tnef, const gchar *tmpdir) { fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n"); /* Birthday */ - if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) { fprintf(fptr, "BDAY:"); - MAPISysTimetoDTR((guchar *) vl->data, &thedate); + MAPISysTimetoDTR ((guchar *) vl->data, &thedate); fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay); } /* Anniversary */ - if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_SYSTIME, PR_WEDDING_ANNIVERSARY))) != MAPI_UNDEFINED) { fprintf(fptr, "X-EVOLUTION-ANNIVERSARY:"); - MAPISysTimetoDTR((guchar *) vl->data, &thedate); + MAPISysTimetoDTR ((guchar *) vl->data, &thedate); fprintf(fptr, "%i-%02i-%02i\n", thedate.wYear, thedate.wMonth, thedate.wDay); } fprintf(fptr, "END:VCARD\n"); - fclose(fptr); + fclose (fptr); } } -guchar getRruleCount(guchar a, guchar b) { +guchar getRruleCount (guchar a, guchar b) { return ((a << 8) | b); } -guchar getRruleMonthNum(guchar a, guchar b) { +guchar getRruleMonthNum (guchar a, guchar b) { switch (a) { case 0x00: switch (b) { case 0x00: /* Jan */ - return(1); + return (1); case 0xA3: /* May */ - return(5); + return (5); case 0xAE: /* Nov */ - return(11); + return (11); } break; case 0x60: switch (b) { case 0xAE: /* Feb */ - return(2); + return (2); case 0x51: /* Jun */ - return(6); + return (6); } break; case 0xE0: switch (b) { case 0x4B: /* Mar */ - return(3); + return (3); case 0x56: /* Sep */ - return(9); + return (9); } break; case 0x40: switch (b) { case 0xFA: /* Apr */ - return(4); + return (4); } break; case 0x20: if (b == 0xFA) { /* Jul */ - return(7); + return (7); } break; case 0x80: if (b == 0xA8) { /* Aug */ - return(8); + return (8); } break; case 0xA0: if (b == 0xFF) { /* Oct */ - return(10); + return (10); } break; case 0xC0: if (b == 0x56) { - return(12); + return (12); } } /* Error */ - return(0); + return (0); } -gchar * getRruleDayname(guchar a) { +gchar * getRruleDayname (guchar a) { static gchar daystring[25]; *daystring = 0; @@ -750,14 +750,14 @@ gchar * getRruleDayname(guchar a) { strcat(daystring, "SA,"); } - if (strlen(daystring)) { - daystring[strlen(daystring) - 1] = 0; + if (strlen (daystring)) { + daystring[strlen (daystring) - 1] = 0; } - return(daystring); + return (daystring); } -void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) +void printRrule (FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) { variableLength *filename; @@ -772,27 +772,27 @@ void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) 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 ((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) { fprintf(fptr, ";COUNT=%d", - getRruleCount(recur_data[0x1B], recur_data[0x1A])); + 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) { 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])); + 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"); @@ -805,7 +805,7 @@ void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) } } else if (recur_data[0x06] == 0x03) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d;INTERVAL=%d", - getRruleDayname(recur_data[0x16]), + getRruleDayname (recur_data[0x16]), recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A], recur_data[0x0E]); if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { @@ -815,12 +815,12 @@ void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) } } else if (recur_data[0x04] == 0x0D) { fprintf(fptr, "YEARLY;BYMONTH=%d", - getRruleMonthNum(recur_data[0x0A], recur_data[0x0B])); + 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) { fprintf(fptr, ";BYDAY=%s;BYSETPOS=%d", - getRruleDayname(recur_data[0x16]), + getRruleDayname (recur_data[0x16]), recur_data[0x1A] == 0x05 ? -1 : recur_data[0x1A]); } if (recur_data[0x1E] == 0x22 || recur_data[0x1E] == 0x21) { @@ -831,7 +831,7 @@ void printRrule(FILE *fptr, gchar *recur_data, gint size, TNEFStruct *tnef) fprintf(fptr, "\n"); } -void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { +void saveVCalendar (TNEFStruct *tnef, const gchar *tmpdir) { gchar ifilename[256]; variableLength *filename; gchar *charptr, *charptr2; @@ -876,10 +876,10 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { this entry. so as long as it's incorrectly interpreted the same way every time, it should be ok :) */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, 0x3))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, 0x23))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, 0x3))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, 0x23))) == MAPI_UNDEFINED) { filename = NULL; } } @@ -893,13 +893,13 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { /* Sequence */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_LONG, 0x8201))) != MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_LONG, 0x8201))) != MAPI_UNDEFINED) { dword_ptr = (DWORD*)filename->data; fprintf(fptr, "SEQUENCE:%i\n", (gint) *dword_ptr); } - if ((filename=MAPIFindProperty(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, PR_SENDER_SEARCH_KEY))) + if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, PR_SENDER_SEARCH_KEY))) != MAPI_UNDEFINED) { charptr = filename->data; charptr2 = strstr(charptr, ":"); @@ -912,8 +912,8 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } /* Required Attendees */ - if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, 0x823b))) != MAPI_UNDEFINED) { + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, 0x823b))) != MAPI_UNDEFINED) { /* We have a list of required participants, so write them out. */ if (filename->size > 1) { @@ -934,8 +934,8 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } } /* Optional attendees */ - if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, 0x823c))) != MAPI_UNDEFINED) { + if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, 0x823c))) != MAPI_UNDEFINED) { /* The list of optional participants */ if (filename->size > 1) { charptr = filename->data-1; @@ -955,8 +955,8 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } } } - } else if ((filename = MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, 0x8238))) != MAPI_UNDEFINED) { + } else if ((filename = MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, 0x8238))) != MAPI_UNDEFINED) { if (filename->size > 1) { charptr = filename->data-1; while (charptr != NULL) { @@ -978,33 +978,33 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } /* Summary */ filename = NULL; - if ((filename=MAPIFindProperty(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC))) + if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, PR_CONVERSATION_TOPIC))) != MAPI_UNDEFINED) { fprintf(fptr, "SUMMARY:"); - cstylefprint(fptr, filename); + cstylefprint (fptr, filename); fprintf(fptr, "\n"); } /* Description */ - if ((filename=MAPIFindProperty(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, PR_RTF_COMPRESSED))) + if ((filename=MAPIFindProperty (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, PR_RTF_COMPRESSED))) != MAPI_UNDEFINED) { variableLength buf; - if ((buf.data = (gchar *) DecompressRTF(filename, &buf.size)) != NULL) { + if ((buf.data = (gchar *) DecompressRTF (filename, &buf.size)) != NULL) { fprintf(fptr, "DESCRIPTION:"); - printRtf(fptr, &buf); - free(buf.data); + printRtf (fptr, &buf); + free (buf.data); } } /* Location */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, 0x0002))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_STRING8, 0x8208))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, 0x0002))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_STRING8, 0x8208))) == MAPI_UNDEFINED) { filename = NULL; } } @@ -1013,52 +1013,52 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } /* Date Start */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_SYSTIME, 0x820d))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_SYSTIME, 0x8516))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_SYSTIME, 0x820d))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_SYSTIME, 0x8516))) == MAPI_UNDEFINED) { filename=NULL; } } if (filename != NULL) { fprintf(fptr, "DTSTART:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } /* Date End */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_SYSTIME, 0x820e))) == MAPI_UNDEFINED) { - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_SYSTIME, 0x8517))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_SYSTIME, 0x820e))) == MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_SYSTIME, 0x8517))) == MAPI_UNDEFINED) { filename=NULL; } } if (filename != NULL) { fprintf(fptr, "DTEND:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } /* Date Stamp */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_SYSTIME, 0x8202))) != MAPI_UNDEFINED) { fprintf(fptr, "CREATED:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } /* Class */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) { + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_BOOLEAN, 0x8506))) != MAPI_UNDEFINED) { dword_ptr = (DWORD*)filename->data; - dword_val = SwapDWord((BYTE*)dword_ptr); + dword_val = SwapDWord ((BYTE*)dword_ptr); fprintf(fptr, "CLASS:" ); if (*dword_ptr == 1) { fprintf(fptr,"PRIVATE\n"); @@ -1068,19 +1068,19 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) { } /* Recurrence */ filename = NULL; - if ((filename=MAPIFindUserProp(&(tnef->MapiProperties), - PROP_TAG(PT_BINARY, 0x8216))) != MAPI_UNDEFINED) { - printRrule(fptr, filename->data, filename->size, tnef); + if ((filename=MAPIFindUserProp (&(tnef->MapiProperties), + PROP_TAG (PT_BINARY, 0x8216))) != MAPI_UNDEFINED) { + printRrule (fptr, filename->data, filename->size, tnef); } /* Wrap it up */ fprintf(fptr, "END:VEVENT\n"); fprintf(fptr, "END:VCALENDAR\n"); - fclose(fptr); + fclose (fptr); } } -void saveVTask(TNEFStruct *tnef, const gchar *tmpdir) { +void saveVTask (TNEFStruct *tnef, const gchar *tmpdir) { variableLength *vl; variableLength *filename; gint index,i; @@ -1091,18 +1091,18 @@ void saveVTask(TNEFStruct *tnef, const gchar *tmpdir) { DWORD *dword_ptr; DWORD dword_val; - vl = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_CONVERSATION_TOPIC)); + vl = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_CONVERSATION_TOPIC)); if (vl == MAPI_UNDEFINED) { return; } - index = strlen(vl->data); + index = strlen (vl->data); while (vl->data[index] == ' ') vl->data[index--] = 0; sprintf(ifilename, "%s/%s.ics", tmpdir, vl->data); - for (i=0; imessageID[0] != 0) { fprintf(fptr,"UID:%s\n", tnef->messageID); } - filename = MAPIFindUserProp(&(tnef->MapiProperties), \ - PROP_TAG(PT_STRING8, 0x8122)); + filename = MAPIFindUserProp (&(tnef->MapiProperties), \ + PROP_TAG (PT_STRING8, 0x8122)); if (filename != MAPI_UNDEFINED) { fprintf(fptr, "ORGANIZER:%s\n", filename->data); } - if ((filename = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) { - filename = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x811f)); + if ((filename = MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) { + filename = MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (PT_STRING8, 0x811f)); } if ((filename != MAPI_UNDEFINED) && (filename->size > 1)) { charptr = filename->data-1; @@ -1145,50 +1145,50 @@ void saveVTask(TNEFStruct *tnef, const gchar *tmpdir) { if (tnef->subject.size > 0) { fprintf(fptr,"SUMMARY:"); - cstylefprint(fptr,&(tnef->subject)); + cstylefprint (fptr,&(tnef->subject)); fprintf(fptr,"\n"); } if (tnef->body.size > 0) { fprintf(fptr,"DESCRIPTION:"); - cstylefprint(fptr,&(tnef->body)); + cstylefprint (fptr,&(tnef->body)); fprintf(fptr,"\n"); } - filename = MAPIFindProperty(&(tnef->MapiProperties), \ - PROP_TAG(PT_SYSTIME, PR_CREATION_TIME)); + filename = MAPIFindProperty (&(tnef->MapiProperties), \ + PROP_TAG (PT_SYSTIME, PR_CREATION_TIME)); if (filename != MAPI_UNDEFINED) { fprintf(fptr, "DTSTAMP:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } - filename = MAPIFindUserProp(&(tnef->MapiProperties), \ - PROP_TAG(PT_SYSTIME, 0x8517)); + filename = MAPIFindUserProp (&(tnef->MapiProperties), \ + PROP_TAG (PT_SYSTIME, 0x8517)); if (filename != MAPI_UNDEFINED) { fprintf(fptr, "DUE:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } - filename = MAPIFindProperty(&(tnef->MapiProperties), \ - PROP_TAG(PT_SYSTIME, PR_LAST_MODIFICATION_TIME)); + filename = MAPIFindProperty (&(tnef->MapiProperties), \ + PROP_TAG (PT_SYSTIME, PR_LAST_MODIFICATION_TIME)); if (filename != MAPI_UNDEFINED) { fprintf(fptr, "LAST-MODIFIED:"); - MAPISysTimetoDTR((guchar *) filename->data, &thedate); + MAPISysTimetoDTR ((guchar *) filename->data, &thedate); fprintf(fptr,"%04i%02i%02iT%02i%02i%02iZ\n", thedate.wYear, thedate.wMonth, thedate.wDay, thedate.wHour, thedate.wMinute, thedate.wSecond); } /* Class */ - filename = MAPIFindUserProp(&(tnef->MapiProperties), \ - PROP_TAG(PT_BOOLEAN, 0x8506)); + filename = MAPIFindUserProp (&(tnef->MapiProperties), \ + PROP_TAG (PT_BOOLEAN, 0x8506)); if (filename != MAPI_UNDEFINED) { dword_ptr = (DWORD*)filename->data; - dword_val = SwapDWord((BYTE*)dword_ptr); + dword_val = SwapDWord ((BYTE*)dword_ptr); fprintf(fptr, "CLASS:" ); if (*dword_ptr == 1) { fprintf(fptr,"PRIVATE\n"); @@ -1198,36 +1198,36 @@ void saveVTask(TNEFStruct *tnef, const gchar *tmpdir) { } fprintf(fptr, "END:VTODO\n"); fprintf(fptr, "END:VCALENDAR\n"); - fclose(fptr); + fclose (fptr); } } -void fprintProperty(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { +void fprintProperty (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; - if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindProperty (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { if ((vl->size == 1) && (vl->data[0] == 0)) { } else { - fprintf(fptr, text, vl->data); + fprintf (fptr, text, vl->data); } } } } -void fprintUserProp(TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { +void fprintUserProp (TNEFStruct *tnef, FILE *fptr, DWORD proptype, DWORD propid, const gchar text[]) { variableLength *vl; - if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(proptype, propid))) != MAPI_UNDEFINED) { + if ((vl=MAPIFindUserProp (&(tnef->MapiProperties), PROP_TAG (proptype, propid))) != MAPI_UNDEFINED) { if (vl->size > 0) { if ((vl->size == 1) && (vl->data[0] == 0)) { } else { - fprintf(fptr, text, vl->data); + fprintf (fptr, text, vl->data); } } } } -void quotedfprint(FILE *fptr, variableLength *vl) { +void quotedfprint (FILE *fptr, variableLength *vl) { gint index; for (index=0;indexsize-1; index++) { @@ -1240,7 +1240,7 @@ void quotedfprint(FILE *fptr, variableLength *vl) { } } -void cstylefprint(FILE *fptr, variableLength *vl) { +void cstylefprint (FILE *fptr, variableLength *vl) { gint index; for (index=0;indexsize-1; index++) { @@ -1260,7 +1260,7 @@ void cstylefprint(FILE *fptr, variableLength *vl) { } } -void printRtf(FILE *fptr, variableLength *vl) { +void printRtf (FILE *fptr, variableLength *vl) { gint index; gchar *byte; gint brace_ct; @@ -1282,7 +1282,7 @@ void printRtf(FILE *fptr, variableLength *vl) { if (*byte == '\\') { key = 1; } - if (isspace(*byte)) { + if (isspace (*byte)) { key = 0; } if ((brace_ct == 1) && (key == 0)) { diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c index 8d822e6c9e..6ce62e4bdd 100644 --- a/plugins/webdav-account-setup/webdav-contacts-source.c +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -49,13 +49,13 @@ typedef struct { } ui_data; GtkWidget * -plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data); +plugin_webdav_contacts (EPlugin *epl, EConfigHookItemFactoryData *data); gint -e_plugin_lib_enable(EPlugin *ep, gint enable); +e_plugin_lib_enable (EPlugin *ep, gint enable); static void -ensure_webdav_contacts_source_group(void) +ensure_webdav_contacts_source_group (void) { ESourceList *source_list; @@ -70,7 +70,7 @@ ensure_webdav_contacts_source_group(void) } static void -remove_webdav_contacts_source_group(void) +remove_webdav_contacts_source_group (void) { ESourceList *source_list; ESourceGroup *group; @@ -86,21 +86,21 @@ remove_webdav_contacts_source_group(void) 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); + e_source_list_remove_group (source_list, group); + e_source_list_sync (source_list, NULL); } } - g_object_unref(source_list); + g_object_unref (source_list); } static void -set_ui_from_source(ui_data *data) +set_ui_from_source (ui_data *data) { ESource *source = data->source; - const gchar *url = e_source_get_uri(source); + const gchar *url = e_source_get_uri (source); SoupURI *suri = soup_uri_new (url); gchar *url_ui; const gchar *property; @@ -120,7 +120,7 @@ set_ui_from_source(ui_data *data) } else { avoid_ifmatch = FALSE; } - gtk_toggle_button_set_active(data->avoid_ifmatch_toggle, avoid_ifmatch); + gtk_toggle_button_set_active (data->avoid_ifmatch_toggle, avoid_ifmatch); /* it's really a http or https protocol */ if (suri) @@ -149,8 +149,8 @@ static void set_source_from_ui (ui_data *data) { ESource *source = data->source; - gboolean avoid_ifmatch = gtk_toggle_button_get_active(data->avoid_ifmatch_toggle); - const gchar *url = gtk_entry_get_text(data->url_entry); + gboolean avoid_ifmatch = gtk_toggle_button_get_active (data->avoid_ifmatch_toggle); + const gchar *url = gtk_entry_get_text (data->url_entry); SoupURI *suri = soup_uri_new (url); gchar *url_noprotocol; gboolean use_ssl; @@ -197,7 +197,7 @@ destroy_ui_data (gpointer data) } GtkWidget * -plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) +plugin_webdav_contacts (EPlugin *epl, EConfigHookItemFactoryData *data) { EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; ESource *source; @@ -222,62 +222,62 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) return NULL; } - uidata = g_malloc0(sizeof(uidata[0])); + uidata = g_malloc0 (sizeof (uidata[0])); uidata->source = source; /* Build up the UI */ parent = data->parent; - vbox = gtk_widget_get_ancestor(gtk_widget_get_parent(parent), GTK_TYPE_VBOX); + 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); + vbox2 = gtk_vbox_new (FALSE, 6); + gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); - section = gtk_label_new(NULL); + section = gtk_label_new (NULL); buff = g_strconcat ("", _("Server"), "", NULL); - gtk_label_set_markup(GTK_LABEL(section), buff); + gtk_label_set_markup (GTK_LABEL (section), buff); g_free (buff); - gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0); - gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0); + gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0); + gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0); - hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); - gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); + hbox = GTK_BOX (gtk_hbox_new (FALSE, 10)); + gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (hbox), TRUE, TRUE, 0); spacer = gtk_label_new(" "); - gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0); + gtk_box_pack_start (hbox, spacer, FALSE, FALSE, 0); label = gtk_label_new(_("URL:")); - gtk_box_pack_start(hbox, label, FALSE, FALSE, 0); + gtk_box_pack_start (hbox, label, FALSE, FALSE, 0); - uidata->url_entry = GTK_ENTRY(gtk_entry_new()); - gtk_box_pack_start(hbox, GTK_WIDGET(uidata->url_entry), TRUE, TRUE, 0); + uidata->url_entry = GTK_ENTRY (gtk_entry_new ()); + gtk_box_pack_start (hbox, GTK_WIDGET (uidata->url_entry), TRUE, TRUE, 0); - hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); - gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); + hbox = GTK_BOX (gtk_hbox_new (FALSE, 10)); + gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (hbox), TRUE, TRUE, 0); spacer = gtk_label_new(" "); - gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0); + gtk_box_pack_start (hbox, spacer, FALSE, FALSE, 0); label = gtk_label_new_with_mnemonic(_("User_name:")); - gtk_box_pack_start(hbox, label, FALSE, FALSE, 0); + gtk_box_pack_start (hbox, label, FALSE, FALSE, 0); - uidata->username_entry = GTK_ENTRY(gtk_entry_new()); - gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0); + uidata->username_entry = GTK_ENTRY (gtk_entry_new ()); + gtk_box_pack_start (hbox, GTK_WIDGET (uidata->username_entry), TRUE, TRUE, 0); - hbox = GTK_BOX(gtk_hbox_new(FALSE, 10)); - gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0); + hbox = GTK_BOX (gtk_hbox_new (FALSE, 10)); + gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (hbox), TRUE, TRUE, 0); spacer = gtk_label_new(" "); - gtk_box_pack_start(hbox, spacer, FALSE, FALSE, 0); + gtk_box_pack_start (hbox, spacer, FALSE, FALSE, 0); - uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON( - gtk_check_button_new_with_mnemonic( + uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON ( + gtk_check_button_new_with_mnemonic ( _("_Avoid IfMatch (needed on Apache < 2.2.8)"))); - gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle), + gtk_box_pack_start (hbox, GTK_WIDGET (uidata->avoid_ifmatch_toggle), FALSE, FALSE, 0); - set_ui_from_source(uidata); + set_ui_from_source (uidata); - gtk_widget_show_all(vbox2); + gtk_widget_show_all (vbox2); uidata->box = vbox2; g_object_set_data_full(G_OBJECT(epl), "wwidget", uidata, destroy_ui_data); @@ -291,12 +291,12 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) } gint -e_plugin_lib_enable(EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, gint enable) { if (enable) { - ensure_webdav_contacts_source_group(); + ensure_webdav_contacts_source_group (); } else { - remove_webdav_contacts_source_group(); + remove_webdav_contacts_source_group (); } return 0; } -- cgit