From: Colin Leroy Date: Sat, 20 Jan 2007 21:37:49 +0000 (+0000) Subject: 2007-01-20 [colin] 2.7.1cvs42 X-Git-Tag: rel_2_8_0~96 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f2ac8b4dae45e5030d9384d69237399e0cc1ac07;hp=e58a9713f9ffbff6d67a6a927d722167934faa92 2007-01-20 [colin] 2.7.1cvs42 * src/addritem.c * src/addritem.h Same --- diff --git a/ChangeLog b/ChangeLog index 2bff8ae71..bac8ce73d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-20 [colin] 2.7.1cvs42 + + * src/addritem.c + * src/addritem.h + Same + 2007-01-20 [colin] 2.7.1cvs41 * src/account.c diff --git a/PATCHSETS b/PATCHSETS index 91db06103..cad381687 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2299,3 +2299,4 @@ ( cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/editldap.c; ) > 2.7.1cvs39.patchset ( cvs diff -u -r 1.61.2.56 -r 1.61.2.57 src/account.c; cvs diff -u -r 1.22.2.12 -r 1.22.2.13 src/addrbook.c; cvs diff -u -r 1.15.2.9 -r 1.15.2.10 src/addrcache.c; cvs diff -u -r 1.60.2.77 -r 1.60.2.78 src/addressbook.c; cvs diff -u -r 1.5.10.15 -r 1.5.10.16 src/addrgather.c; cvs diff -u -r 1.28.2.21 -r 1.28.2.22 src/addrindex.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/addrquery.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/addrselect.c; cvs diff -u -r 1.2.4.15 -r 1.2.4.16 src/browseldap.c; cvs diff -u -r 1.382.2.353 -r 1.382.2.354 src/compose.c; cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/editbook.c; cvs diff -u -r 1.5.12.11 -r 1.5.12.12 src/editjpilot.c; cvs diff -u -r 1.8.2.18 -r 1.8.2.19 src/editldap.c; cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/editldap_basedn.c; cvs diff -u -r 1.5.12.10 -r 1.5.12.11 src/editvcard.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/exporthtml.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/exportldif.c; cvs diff -u -r 1.213.2.131 -r 1.213.2.132 src/folder.c; cvs diff -u -r 1.207.2.144 -r 1.207.2.145 src/folderview.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/image_viewer.c; cvs diff -u -r 1.179.2.154 -r 1.179.2.155 src/imap.c; cvs diff -u -r 1.4.12.14 -r 1.4.12.15 src/importmutt.c; cvs diff -u -r 1.1.14.14 -r 1.1.14.15 src/importpine.c; cvs diff -u -r 1.18.2.22 -r 1.18.2.23 src/jpilot.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/ldapquery.c; cvs diff -u -r 1.115.2.128 -r 1.115.2.129 src/main.c; cvs diff -u -r 1.274.2.167 -r 1.274.2.168 src/mainwindow.c; cvs diff -u -r 1.75.2.33 -r 1.75.2.34 src/matcher.c; cvs diff -u -r 1.94.2.120 -r 1.94.2.121 src/messageview.c; cvs diff -u -r 1.79.2.51 -r 1.79.2.52 src/mh.c; cvs diff -u -r 1.83.2.99 -r 1.83.2.100 src/mimeview.c; cvs diff -u -r 1.16.2.49 -r 1.16.2.50 src/msgcache.c; cvs diff -u -r 1.6.10.10 -r 1.6.10.11 src/mutt.c; cvs diff -u -r 1.101.2.35 -r 1.101.2.36 src/news.c; cvs diff -u -r 1.6.2.9 -r 1.6.2.10 src/pine.c; cvs diff -u -r 1.105.2.83 -r 1.105.2.84 src/prefs_account.c; cvs diff -u -r 1.204.2.120 -r 1.204.2.121 src/prefs_common.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_compose_writing.c; cvs diff -u -r 1.3.2.12 -r 1.3.2.13 src/prefs_ext_prog.c; cvs diff -u -r 1.52.2.35 -r 1.52.2.36 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/prefs_fonts.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_message.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_other.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_quote.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/prefs_receive.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_send.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/prefs_spelling.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/prefs_summaries.c; cvs diff -u -r 1.30.2.31 -r 1.30.2.32 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_wrapping.c; cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/privacy.c; cvs diff -u -r 1.49.2.88 -r 1.49.2.89 src/procmime.c; cvs diff -u -r 1.150.2.87 -r 1.150.2.88 src/procmsg.c; cvs diff -u -r 1.3.2.25 -r 1.3.2.26 src/ssl_manager.c; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/statusbar.c; cvs diff -u -r 1.395.2.280 -r 1.395.2.281 src/summaryview.c; cvs diff -u -r 1.43.2.59 -r 1.43.2.60 src/toolbar.c; cvs diff -u -r 1.14.2.8 -r 1.14.2.9 src/vcard.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/common/hooks.c; cvs diff -u -r 1.6.2.8 -r 1.6.2.9 src/common/log.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/common/passcrypt.c; cvs diff -u -r 1.13.2.24 -r 1.13.2.25 src/common/socket.c; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/common/ssl.c; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 src/common/ssl_certificate.c; cvs diff -u -r 1.2.4.17 -r 1.2.4.18 src/common/template.c; cvs diff -u -r 1.36.2.95 -r 1.36.2.96 src/common/utils.c; cvs diff -u -r 1.1.4.72 -r 1.1.4.73 src/etpan/imap-thread.c; cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/gtk/sslcertwindow.h; ) > 2.7.1cvs40.patchset ( cvs diff -u -r 1.61.2.57 -r 1.61.2.58 src/account.c; cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/account.h; cvs diff -u -r 1.22.2.13 -r 1.22.2.14 src/addrbook.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/addrbook.h; cvs diff -u -r 1.15.2.10 -r 1.15.2.11 src/addrcache.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/addrcache.h; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/addrclip.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/addrclip.h; cvs diff -u -r 1.60.2.78 -r 1.60.2.79 src/addressbook.c; cvs diff -u -r 1.18.2.7 -r 1.18.2.8 src/addressbook.h; cvs diff -u -r 1.6.10.14 -r 1.6.10.15 src/addrharvest.c; cvs diff -u -r 1.4.12.4 -r 1.4.12.5 src/addrharvest.h; cvs diff -u -r 1.28.2.22 -r 1.28.2.23 src/addrindex.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/addrindex.h; cvs diff -u -r 1.14.2.21 -r 1.14.2.22 src/editaddress.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/editaddress.h; ) > 2.7.1cvs41.patchset +( cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/addritem.c; cvs diff -u -r 1.12.2.6 -r 1.12.2.7 src/addritem.h; ) > 2.7.1cvs42.patchset diff --git a/configure.ac b/configure.ac index a35283cda..b44223a70 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=41 +EXTRA_VERSION=42 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addritem.c b/src/addritem.c index 76649175b..d71b281b5 100644 --- a/src/addritem.c +++ b/src/addritem.c @@ -81,15 +81,6 @@ ItemEMail *addritem_copyfull_item_email( ItemEMail *item ) { return itemNew; } -/** - * Specify ID for email. - * \param email E-Mail item. - * \param value ID. - */ -void addritem_email_set_id( ItemEMail *email, const gchar *value ) { - ADDRITEM_ID(email) = mgu_replace_string( ADDRITEM_ID(email), value ); -} - /** * Specify alias for email. * \param email E-Mail item. @@ -256,15 +247,6 @@ ItemPerson *addritem_copy_item_person( ItemPerson *item ) { return itemNew; } -/** - * Specify ID for person object. - * \param person Person object. - * \param value ID. - */ -void addritem_person_set_id( ItemPerson *person, const gchar *value ) { - ADDRITEM_ID(person) = mgu_replace_string( ADDRITEM_ID(person), value ); -} - /** * Specify first name for person object. * \param person Person object. @@ -471,7 +453,7 @@ void addritem_print_item_email( ItemEMail *item, FILE *stream ) { * \param item Attribute to print. * \param stream Output stream. */ -void addritem_print_attribute( UserAttribute *item, FILE *stream ) { +static void addritem_print_attribute( UserAttribute *item, FILE *stream ) { g_return_if_fail( item != NULL ); fprintf( stream, "\t\tuid : '%s'\n", item->uid ); fprintf( stream, "\t\tname : '%s'\n", item->name ); @@ -534,72 +516,6 @@ gboolean addritem_person_add_email( ItemPerson *person, ItemEMail *email ) { return TRUE; } -/** - * Return email object with specified ID for specified person. - * \param person Person object. - * \param eid EMail ID. - * \return EMail object, or NULL if not found. - */ -ItemEMail *addritem_person_get_email( ItemPerson *person, const gchar *eid ) { - ItemEMail *email = NULL; - GList *node; - - g_return_val_if_fail( person != NULL, NULL ); - if( eid == NULL || *eid == '\0' ) return NULL; - - /* Look for email */ - node = person->listEMail; - while( node ) { - AddrItemObject *objE = node->data; - gchar *ide = ADDRITEM_ID(objE); - if( ide ) { - if( strcmp( ide, eid ) == 0 ) { - email = ( ItemEMail * ) objE; - } - } - node = g_list_next( node ); - } - return email; -} - -/** - * Remove email address with specified ID for specified person. - * \param person Person object. - * \param eid EMail ID. - * \return EMail object, or NULL if not found. Note that object should - * still be freed after calling this function. - */ -ItemEMail *addritem_person_remove_email_id( ItemPerson *person, const gchar *eid ) { - ItemEMail *email = NULL; - GList *node; - - g_return_val_if_fail( person != NULL, NULL ); - if( eid == NULL || *eid == '\0' ) return NULL; - - /* Look for email */ - node = person->listEMail; - while( node ) { - AddrItemObject *objE = node->data; - gchar *ide = ADDRITEM_ID(objE); - if( ide ) { - if( strcmp( ide, eid ) == 0 ) { - email = ( ItemEMail * ) objE; - } - } - node = g_list_next( node ); - } - - if( email ) { - /* Remove email from person's address list */ - if( person->listEMail ) { - person->listEMail = g_list_remove( person->listEMail, email ); - } - /* Unlink reference to person. */ - ADDRITEM_PARENT(email) = NULL; - } - return email; -} - /** * Remove email address for specified person. * \param person Person. @@ -649,36 +565,6 @@ void addritem_person_add_attribute( person->listAttrib = g_list_append( person->listAttrib, attrib ); } -/** - * Return attribute with specified ID for person. - * \param person Person object. - * \param aid Attribute ID. - * \return Reference to UserAttribute object, or NULL if not found. - */ -UserAttribute *addritem_person_get_attribute( - ItemPerson *person, const gchar *aid ) -{ - UserAttribute *attrib = NULL; - GList *node; - - g_return_val_if_fail( person != NULL, NULL ); - if( aid == NULL || *aid == '\0' ) return NULL; - - /* Look for attribute */ - node = person->listAttrib; - while( node ) { - UserAttribute *attr = node->data; - gchar *ida = attr->uid; - if( ida ) { - if( strcmp( ida, aid ) == 0 ) { - attrib = attr; - } - } - node = g_list_next( node ); - } - return attrib; -} - /** * Remove attribute with specified ID from person. * \param person Person object. @@ -785,15 +671,6 @@ ItemGroup *addritem_copy_item_group( ItemGroup *item ) { return itemNew; } -/** - * Specify ID to be used for group. - * \param group Group object. - * \param value ID of group. - */ -void addritem_group_set_id( ItemGroup *group, const gchar *value ) { - ADDRITEM_ID(group) = mgu_replace_string( ADDRITEM_ID(group), value ); -} - /** * Specify name to be used for group. * \param group Group object. @@ -803,15 +680,6 @@ void addritem_group_set_name( ItemGroup *group, const gchar *value ) { ADDRITEM_NAME(group) = mgu_replace_string( ADDRITEM_NAME(group), value ); } -/** - * Specify remarks to be used for group. - * \param group Group object. - * \param value Remarks for group. - */ -void addritem_group_set_remarks( ItemGroup *group, const gchar *value ) { - group->remarks = mgu_replace_string( group->remarks, value ); -} - /** * Free address group object. * \param group Group to free. @@ -860,29 +728,6 @@ gboolean addritem_group_add_email( ItemGroup *group, ItemEMail *email ) { return TRUE; } -/** - * Remove email address object for specified group. - * \param group Group from which to remove address. - * \param email EMail to remove - * \return EMail object, or NULL if email not found in group. Note that - * this object is referenced (linked) to a group and should *NOT* - * be freed. An E-Mail object object should only be freed after - * removing from a person. - */ -ItemEMail *addritem_group_remove_email( ItemGroup *group, ItemEMail *email ) { - if( group && email ) { - GList *node = group->listEMail; - while( node ) { - if( node->data == email ) { - group->listEMail = g_list_remove( group->listEMail, email ); - return email; - } - node = g_list_next( node ); - } - } - return NULL; -} - /** * Remove person object for specified group. * \param group Group from which to remove address. @@ -906,30 +751,6 @@ ItemPerson *addritem_folder_remove_person( ItemFolder *group, ItemPerson *person return NULL; } -/** - * Remove email address of specified ID for specified group. - * \param group Group from which to remove address. - * \param eid EMail ID. - * \return EMail object, or NULL if email not found in group. Note that - * this object is referenced (linked) to a group and should *NOT* be - * freed. An E-Mail object should only be freed after removing from a - * person. - */ -ItemEMail *addritem_group_remove_email_id( ItemGroup *group, const gchar *eid ) { - if( group ) { - GList *node = group->listEMail; - while( node ) { - ItemEMail *email = ( ItemEMail * ) node->data; - if( strcmp( ADDRITEM_ID( email ), eid ) == 0 ) { - group->listEMail = g_list_remove( group->listEMail, email ); - return email; - } - node = g_list_next( node ); - } - } - return NULL; -} - /** * Print address group item for debug. * \param group Group to print. @@ -1006,15 +827,6 @@ ItemFolder *addritem_copy_item_folder( ItemFolder *item ) { return itemNew; } -/** - * Specify ID to be used for folder. - * \param folder Folder. - * \param value ID. - */ -void addritem_folder_set_id( ItemFolder *folder, const gchar *value ) { - ADDRITEM_ID(folder) = mgu_replace_string( ADDRITEM_ID(folder), value ); -} - /** * Specify name to be used for folder. * \param folder Folder. @@ -1082,7 +894,7 @@ void addritem_free_item_folder( ItemFolder *folder ) { * This should be done prior to calling this function. * \param parent Parent folder object to be processed. */ -void addritem_free_item_folder_recurse( ItemFolder *parent ) { +static void addritem_free_item_folder_recurse( ItemFolder *parent ) { GList *node = parent->listFolder; while( node ) { @@ -1098,25 +910,6 @@ void addritem_free_item_folder_recurse( ItemFolder *parent ) { parent->listFolder = NULL; } -/** - * Free up list of person objects contained in specified folder. - * \param folder Folder to process. - */ -void addritem_folder_free_person( ItemFolder *folder ) { - GList *node; - - g_return_if_fail( folder != NULL ); - - /* Free up folder of persons. */ - node = folder->listPerson; - while( node ) { - ItemPerson *person = node->data; - addritem_free_item_person( person ); - person = NULL; - node = g_list_next( node ); - } -} - /** * Add person into folder. * \param folder Folder. @@ -1238,32 +1031,6 @@ void addritem_print_item_folder( ItemFolder *folder, FILE *stream ) { fprintf( stream, "\t###\n" ); } -/** - * Print address item for debug. - * \param aio Address item to format. - * \param stream Output stream. - */ -void addritem_print_item( AddrItemObject *aio, FILE *stream ) { - g_return_if_fail( aio != NULL ); - - if( aio->type == ITEMTYPE_PERSON ) { - ItemPerson *item = ( ItemPerson * ) aio; - addritem_print_item_person( item, stream ); - } - else if( aio->type == ITEMTYPE_EMAIL ) { - ItemEMail *item = ( ItemEMail * ) aio; - addritem_print_item_email( item, stream ); - } - else if( aio->type == ITEMTYPE_GROUP ) { - ItemGroup *item = ( ItemGroup * ) aio; - addritem_print_item_group( item, stream ); - } - else if( aio->type == ITEMTYPE_FOLDER ) { - ItemFolder *item = ( ItemFolder * ) aio; - addritem_print_item_folder( item, stream ); - } -} - /** * Return link list of persons for specified folder. Note that the list contains * references to items and should be g_free() when done. Do *NOT* attempt to use the diff --git a/src/addritem.h b/src/addritem.h index 4e082ba3a..a04f04917 100644 --- a/src/addritem.h +++ b/src/addritem.h @@ -113,7 +113,6 @@ struct _ItemGroup { ItemEMail *addritem_create_item_email ( void ); ItemEMail *addritem_copy_item_email ( ItemEMail *item ); ItemEMail *addritem_copyfull_item_email ( ItemEMail *item ); -void addritem_email_set_id ( ItemEMail *email, const gchar *value ); void addritem_email_set_alias ( ItemEMail *email, const gchar *value ); void addritem_email_set_address ( ItemEMail *email, const gchar *value ); void addritem_email_set_remarks ( ItemEMail *email, const gchar *value ); @@ -128,7 +127,6 @@ void addritem_free_attribute ( UserAttribute *item ); ItemPerson *addritem_create_item_person ( void ); ItemPerson *addritem_copy_item_person ( ItemPerson *item ); -void addritem_person_set_id ( ItemPerson *person, const gchar *value ); void addritem_person_set_first_name ( ItemPerson *person, const gchar *value ); void addritem_person_set_last_name ( ItemPerson *person, const gchar *value ); void addritem_person_set_nick_name ( ItemPerson *person, const gchar *value ); @@ -143,46 +141,34 @@ void addritem_free_list_attribute ( GList *list ); ItemGroup *addritem_create_item_group ( void ); ItemGroup *addritem_copy_item_group ( ItemGroup *item ); void addritem_free_item_group ( ItemGroup *group ); -void addritem_group_set_id ( ItemGroup *group, const gchar *value ); void addritem_group_set_name ( ItemGroup *group, const gchar *value ); -void addritem_group_set_remarks ( ItemGroup *group, const gchar *value ); void addritem_print_item_email ( ItemEMail *item, FILE *stream ); -void addritem_print_attribute ( UserAttribute *item, FILE *stream ); void addritem_print_item_person ( ItemPerson *person, FILE *stream ); void addritem_print_item_group ( ItemGroup *group, FILE *stream ); void addritem_print_item_folder ( ItemFolder *folder, FILE *stream ); -void addritem_print_item ( AddrItemObject *aio, FILE *stream ); gboolean addritem_person_add_email ( ItemPerson *person, ItemEMail *email ); -ItemEMail *addritem_person_get_email ( ItemPerson *person, const gchar *eid ); -ItemEMail *addritem_person_remove_email_id ( ItemPerson *person, const gchar *eid ); ItemEMail *addritem_person_remove_email ( ItemPerson *person, ItemEMail *email ); void addritem_person_add_attribute ( ItemPerson *person, UserAttribute *attrib ); -UserAttribute *addritem_person_get_attribute ( ItemPerson *person, const gchar *aid ); UserAttribute *addritem_person_remove_attrib_id ( ItemPerson *person, const gchar *aid ); UserAttribute *addritem_person_remove_attribute ( ItemPerson *person, UserAttribute *attrib ); ItemFolder *addritem_create_item_folder ( void ); ItemFolder *addritem_copy_item_folder ( ItemFolder *item ); -void addritem_folder_set_id ( ItemFolder *folder, const gchar *value ); void addritem_folder_set_name ( ItemFolder *folder, const gchar *value ); void addritem_folder_set_remarks ( ItemFolder *folder, const gchar *value ); void addritem_folder_set_hidden ( ItemFolder *folder, const gboolean value ); void addritem_free_item_folder ( ItemFolder *folder ); -void addritem_free_item_folder_recurse ( ItemFolder *parent ); gboolean addritem_group_add_email ( ItemGroup *group, ItemEMail *email ); -ItemEMail *addritem_group_remove_email ( ItemGroup *group, ItemEMail *email ); -ItemEMail *addritem_group_remove_email_id( ItemGroup *group, const gchar *eid ); gboolean addritem_folder_add_person ( ItemFolder *folder, ItemPerson *item ); ItemPerson *addritem_folder_remove_person( ItemFolder *group, ItemPerson *person ); gboolean addritem_folder_add_folder ( ItemFolder *folder, ItemFolder *item ); gboolean addritem_folder_add_group ( ItemFolder *folder, ItemGroup *item ); -void addritem_folder_free_person ( ItemFolder *folder ); GList *addritem_folder_get_person_list ( ItemFolder *folder ); GList *addritem_folder_get_group_list ( ItemFolder *folder );