/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2002 Match Grun
+ * Copyright (C) 2001-2012 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/*
#include <stdio.h>
#include <string.h>
+#include "utils.h"
#include "addritem.h"
#include "mgutils.h"
+#include "codeconv.h"
/**
* Create new email address 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.
* \param item E-Mail item to free.
*/
void addritem_free_item_email( ItemEMail *item ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(item) );
* \param value ID.
*/
void addritem_attrib_set_id( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->uid = mgu_replace_string( item->uid, value );
}
* \param value Name.
*/
void addritem_attrib_set_name( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->name = mgu_replace_string( item->name, value );
}
* \param value Value.
*/
void addritem_attrib_set_value( UserAttribute *item, const gchar *value ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
item->value = mgu_replace_string( item->value, value );
}
* \param item Attribute object to free.
*/
void addritem_free_attribute( UserAttribute *item ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
g_free( item->uid );
g_free( item->name );
g_free( item->value );
ADDRITEM_NAME(person) = NULL;
ADDRITEM_PARENT(person) = NULL;
ADDRITEM_SUBTYPE(person) = 0;
+ person->picture = NULL;
person->firstName = NULL;
person->lastName = NULL;
person->nickName = NULL;
person->listAttrib = NULL;
person->externalID = NULL;
person->isOpened = FALSE;
+ person->status = NONE;
return person;
}
if( item ) {
itemNew = addritem_create_item_person();
ADDRITEM_NAME(itemNew) = g_strdup( ADDRITEM_NAME(item) );
+ itemNew->picture = g_strdup( ADDRITEM_ID(itemNew) );
itemNew->firstName = g_strdup( item->firstName );
itemNew->lastName = g_strdup( item->lastName );
itemNew->nickName = g_strdup( item->nickName );
itemNew->externalID = g_strdup( item->externalID );
+ itemNew->status = item->status;
}
return itemNew;
}
/**
- * Specify ID for person object.
+ * Specify picture for person object.
* \param person Person object.
- * \param value ID.
+ * \param value Picture.
*/
-void addritem_person_set_id( ItemPerson *person, const gchar *value ) {
- ADDRITEM_ID(person) = mgu_replace_string( ADDRITEM_ID(person), value );
+void addritem_person_set_picture( ItemPerson *person, const gchar *value ) {
+ if (!value || g_utf8_validate(value, -1, NULL))
+ person->picture = mgu_replace_string( person->picture, value );
+ else {
+ gchar *out = conv_codeset_strdup(value,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ if (out)
+ person->picture = mgu_replace_string( person->picture, out );
+ g_free(out);
+ }
}
+/**
+ * Get picture for person object.
+ * \param person Person object.
+ * \param value Picture.
+ */
+gchar *addritem_person_get_picture( ItemPerson *person) {
+ if (person->picture)
+ return g_strdup(person->picture);
+ return NULL;
+}
/**
* Specify first name for person object.
* \param person Person object.
* \param value Name.
*/
void addritem_person_set_first_name( ItemPerson *person, const gchar *value ) {
- person->firstName = mgu_replace_string( person->firstName, value );
+ if (!value || g_utf8_validate(value, -1, NULL))
+ person->firstName = mgu_replace_string( person->firstName, value );
+ else {
+ gchar *out = conv_codeset_strdup(value,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ if (out)
+ person->firstName = mgu_replace_string( person->firstName, out );
+ g_free(out);
+ }
}
/**
* \param value name.
*/
void addritem_person_set_last_name( ItemPerson *person, const gchar *value ) {
- person->lastName = mgu_replace_string( person->lastName, value );
+ if (!value || g_utf8_validate(value, -1, NULL))
+ person->lastName = mgu_replace_string( person->lastName, value );
+ else {
+ gchar *out = conv_codeset_strdup(value,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ if (out)
+ person->lastName = mgu_replace_string( person->lastName, out );
+ g_free(out);
+ }
}
/**
* \param value name.
*/
void addritem_person_set_nick_name( ItemPerson *person, const gchar *value ) {
- person->nickName = mgu_replace_string( person->nickName, value );
+ if (!value || g_utf8_validate(value, -1, NULL))
+ person->nickName = mgu_replace_string( person->nickName, value );
+ else {
+ gchar *out = conv_codeset_strdup(value,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ if (out)
+ person->nickName = mgu_replace_string( person->nickName, out );
+ g_free(out);
+ }
}
/**
* \param value name.
*/
void addritem_person_set_common_name( ItemPerson *person, const gchar *value ) {
- ADDRITEM_NAME(person) = mgu_replace_string( ADDRITEM_NAME(person), value );
+ if (!value || g_utf8_validate(value, -1, NULL))
+ ADDRITEM_NAME(person) = mgu_replace_string( ADDRITEM_NAME(person), value );
+ else {
+ gchar *out = conv_codeset_strdup(value,
+ conv_get_locale_charset_str_no_utf8(),
+ CS_INTERNAL);
+ if (out)
+ ADDRITEM_NAME(person) = mgu_replace_string( ADDRITEM_NAME(person), out );
+ g_free(out);
+ }
}
/**
person->isOpened = value;
}
-/**
- * Test whether person's data is empty.
- * \param person Person to test.
- * \return <i>TRUE</i> if empty.
- */
-gboolean addritem_person_empty( ItemPerson *person ) {
- gchar *t;
-
- if( person == NULL ) return FALSE;
-
- t = ADDRITEM_NAME(person);
- if( t != NULL && strlen( t ) > 0 ) return FALSE;
-
- t = person->firstName;
- if( t != NULL && strlen( t ) > 0 ) return FALSE;
-
- t = person->lastName;
- if( t != NULL && strlen( t ) > 0 ) return FALSE;
-
- t = person->nickName;
- if( t != NULL && strlen( t ) > 0 ) return FALSE;
-
- if( person->listEMail != NULL ) return FALSE;
- if( person->listAttrib != NULL ) return FALSE;
-
- return TRUE;
-}
-
/**
* Free linked list of item addresses; both addresses and the list are freed.
* It is assumed that addresses are *NOT* contained within some other
* \param person Person object to free.
*/
void addritem_free_item_person( ItemPerson *person ) {
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(person) );
g_free( ADDRITEM_NAME(person) );
+ g_free( person->picture );
g_free( person->firstName );
g_free( person->lastName );
g_free( person->nickName );
ADDRITEM_NAME(person) = NULL;
ADDRITEM_PARENT(person) = NULL;
ADDRITEM_SUBTYPE(person) = 0;
+ person->picture = NULL;
person->firstName = NULL;
person->lastName = NULL;
person->nickName = NULL;
* \param stream Output stream.
*/
void addritem_print_item_email( ItemEMail *item, FILE *stream ) {
- g_return_if_fail( item != NULL );
+ cm_return_if_fail( item != NULL );
fprintf( stream, "\t\tt/id: %d : '%s'\n", ADDRITEM_TYPE(item), ADDRITEM_ID(item) );
fprintf( stream, "\t\tsubty: %d\n", ADDRITEM_SUBTYPE(item) );
fprintf( stream, "\t\talis: '%s'\n", ADDRITEM_NAME(item) );
* \param item Attribute to print.
* \param stream Output stream.
*/
-void addritem_print_attribute( UserAttribute *item, FILE *stream ) {
- g_return_if_fail( item != NULL );
+static void addritem_print_attribute( UserAttribute *item, FILE *stream ) {
+ cm_return_if_fail( item != NULL );
fprintf( stream, "\t\tuid : '%s'\n", item->uid );
fprintf( stream, "\t\tname : '%s'\n", item->name );
fprintf( stream, "\t\tvalue: '%s'\n", item->value );
*/
void addritem_print_item_person( ItemPerson *person, FILE *stream ) {
GList *node;
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
fprintf( stream, "Person:\n" );
fprintf( stream, "\tt/uid: %d : '%s'\n", ADDRITEM_TYPE(person), ADDRITEM_ID(person) );
fprintf( stream, "\tsubty: %d\n", ADDRITEM_SUBTYPE(person) );
fprintf( stream, "\tcommn: '%s'\n", ADDRITEM_NAME(person) );
+ fprintf( stream, "\tphoto: '%s'\n", person->picture );
fprintf( stream, "\tfirst: '%s'\n", person->firstName );
fprintf( stream, "\tlast : '%s'\n", person->lastName );
fprintf( stream, "\tnick : '%s'\n", person->nickName );
addritem_print_attribute( node->data, stream );
node = g_list_next( node );
}
+ gchar *current_status;
+ switch (person->status) {
+ case NONE: current_status = g_strdup("Unchanged"); break;
+ case ADD_ENTRY: current_status = g_strdup("New"); break;
+ case UPDATE_ENTRY: current_status = g_strdup("Updated"); break;
+ case DELETE_ENTRY: current_status = g_strdup("Deleted"); break;
+ default: current_status = g_strdup("Unknown");
+ }
+ fprintf( stream, "\t\tStatus: %s\n", current_status );
+ if ( current_status )
+ g_free(current_status);
fprintf( stream, "\t===\n" );
}
gboolean addritem_person_add_email( ItemPerson *person, ItemEMail *email ) {
GList *node;
- g_return_val_if_fail( person != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( person != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
node = person->listEMail;
while( node ) {
return TRUE;
}
-/**
- * Return email object with specified ID for specified person.
- * \param person Person object.
- * \param eid EMail ID.
- * \return EMail object, or <i>NULL</i> 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 <i>NULL</i> 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.
gboolean found = FALSE;
GList *node;
- g_return_val_if_fail( person != NULL, NULL );
+ cm_return_val_if_fail( person != NULL, NULL );
if( email == NULL ) return NULL;
/* Look for email */
void addritem_person_add_attribute(
ItemPerson *person, UserAttribute *attrib )
{
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
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 <i>NULL</i> 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.
- * \param aid Attribute ID to remove.
- * \return UserAttribute object, or <i>NULL</i> if not found. Note that
- * attribute object should still be freed after calling this method.
- */
-UserAttribute *addritem_person_remove_attrib_id(
- 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 );
- }
-
- /* Remove email from person's address list */
- if( person->listAttrib ) {
- person->listAttrib = g_list_remove( person->listAttrib, attrib );
- }
- return attrib;
-}
-
-/**
- * Remove attribute from person.
+ * Remove user attribute from specified person.
* \param person Person.
* \param attrib Attribute to remove.
- * \return UserAttribute object to remove. Note that attribute object should
- * still be freed.
*/
-UserAttribute *addritem_person_remove_attribute(
- ItemPerson *person, UserAttribute *attrib )
-{
- gboolean found = FALSE;
- GList *node;
-
- g_return_val_if_fail( person != NULL, NULL );
- if( attrib == NULL ) return NULL;
+void addritem_person_remove_attribute( ItemPerson *person, const gchar *attrib ) {
+ cm_return_if_fail( person != NULL && attrib != NULL );
+ GList *attrib_list;
- /* Look for attribute */
- node = person->listAttrib;
- while( node ) {
- if( node-> data == attrib ) {
- found = TRUE;
+ attrib_list = person->listAttrib;
+ while (attrib_list) {
+ UserAttribute *user_attrib = attrib_list->data;
+ if (strcmp(user_attrib->name, attrib) == 0) {
+ person->listAttrib = g_list_remove(person->listAttrib, (gconstpointer) user_attrib);
break;
}
- node = g_list_next( node );
- }
-
- if( found ) {
- /* Remove attribute */
- if( person->listAttrib ) {
- person->listAttrib = g_list_remove( person->listAttrib, attrib );
- }
+ attrib_list = g_list_next(attrib_list);
}
- return attrib;
}
+
/**
* Create new address book group object.
* \return Initialized group object.
ItemGroup *addritem_copy_item_group( ItemGroup *item ) {
ItemGroup *itemNew;
- itemNew = g_new0( ItemGroup, 1 );
+ itemNew = NULL;
if( item ) {
itemNew = addritem_create_item_group();
ADDRITEM_NAME(itemNew) = g_strdup( ADDRITEM_NAME(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.
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.
*/
void addritem_free_item_group( ItemGroup *group ) {
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( group != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(group) );
gboolean addritem_group_add_email( ItemGroup *group, ItemEMail *email ) {
GList *node;
- g_return_val_if_fail( group != NULL, FALSE );
- g_return_val_if_fail( email != NULL, FALSE );
+ cm_return_val_if_fail( group != NULL, FALSE );
+ cm_return_val_if_fail( email != NULL, FALSE );
node = group->listEMail;
while( node ) {
}
/**
- * Remove email address object for specified group.
+ * Remove person object for specified group.
* \param group Group from which to remove address.
* \param email EMail to remove
* \return EMail object, or <i>NULL if email not found in group. Note that
* 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;
+ItemPerson *addritem_folder_remove_person( ItemFolder *group, ItemPerson *person ) {
+ if( group && person ) {
+ GList *node = group->listPerson;
while( node ) {
- if( node->data == email ) {
- group->listEMail = g_list_remove( group->listEMail, email );
- return email;
- }
- node = g_list_next( node );
- }
- }
- 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 <i>NULL</i> 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;
+ if( node->data == person ) {
+ group->listPerson = g_list_remove( group->listPerson, person );
+ return person;
}
node = g_list_next( node );
}
GList *node;
ItemPerson *person;
ItemEMail *item;
- g_return_if_fail( group != NULL );
+ cm_return_if_fail( group != NULL );
fprintf( stream, "Group:\n" );
fprintf( stream, "\tt/u: %d : '%s'\n", ADDRITEM_TYPE(group), ADDRITEM_ID(group) );
fprintf( stream, "\tsub: %d\n", ADDRITEM_SUBTYPE(group) );
folder->listGroup = NULL;
folder->folderType = ADDRFOLDER_NONE;
folder->folderData = NULL;
+ folder->isHidden = FALSE;
return folder;
}
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.
folder->remarks = mgu_replace_string( folder->remarks, value );
}
+/**
+ * Specify visibility of folder.
+ * \param folder Folder.
+ * \param value Set to <code>TRUE</code> to hide folder.
+ */
+void addritem_folder_set_hidden( ItemFolder *folder, const gboolean value ) {
+ folder->isHidden = value;
+}
+
/**
* Free address folder. Note: this does not free up the lists of children
* (folders, groups and person). This should be done prior to calling this
* \param folder Folder to free.
*/
void addritem_free_item_folder( ItemFolder *folder ) {
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( folder != NULL );
/* Free internal stuff */
g_free( ADDRITEM_ID(folder) );
folder->listPerson = NULL;
folder->folderType = ADDRFOLDER_NONE;
folder->folderData = NULL;
+ folder->isHidden = FALSE;
g_free( folder );
}
-/**
- * Free up folders recursively. Note: this only frees up the lists of
- * children and *NOT* the children objects (folders, groups and person).
- * 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 ) {
- GList *node = parent->listFolder;
-
- while( node ) {
- ItemFolder *folder = node->data;
- addritem_free_item_folder_recurse( folder );
- node = g_list_next( node );
- }
- g_list_free( parent->listPerson );
- g_list_free( parent->listGroup );
- g_list_free( parent->listFolder );
- parent->listPerson = NULL;
- parent->listGroup = NULL;
- 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.
* \return <i>TRUE</i> if person added.
*/
gboolean addritem_folder_add_person( ItemFolder *folder, ItemPerson *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listPerson = g_list_append( folder->listPerson, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
* \return <i>TRUE</i> if folder added.
*/
gboolean addritem_folder_add_folder( ItemFolder *folder, ItemFolder *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listFolder = g_list_append( folder->listFolder, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
* \return <i>TRUE</i> if group added.
*/
gboolean addritem_folder_add_group( ItemFolder *folder, ItemGroup *item ) {
- g_return_val_if_fail( folder != NULL, FALSE );
- g_return_val_if_fail( item != NULL, FALSE );
+ cm_return_val_if_fail( folder != NULL, FALSE );
+ cm_return_val_if_fail( item != NULL, FALSE );
folder->listGroup = g_list_append( folder->listGroup, item );
ADDRITEM_PARENT(item) = ADDRITEM_OBJECT(folder);
/* ItemPerson *person; */
ItemFolder *parent;
- g_return_if_fail( folder != NULL );
+ cm_return_if_fail( folder != NULL );
fprintf( stream, "Folder:\n" );
fprintf( stream, "\tt/u: %d : '%s'\n", ADDRITEM_TYPE(folder), ADDRITEM_ID(folder) );
fprintf( stream, "\tnam: '%s'\n", ADDRITEM_NAME(folder) );
fprintf( stream, "\trem: '%s'\n", folder->remarks );
fprintf( stream, "\ttyp: %d\n", folder->folderType );
+ fprintf( stream, "\thid: %s\n", folder->isHidden ? "hidden" : "visible" );
fprintf( stream, "\t---\n" );
parent = ( ItemFolder * ) ADDRITEM_PARENT(folder);
if( parent ) {
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
GList *list = NULL;
GList *node = NULL;
- g_return_val_if_fail( folder != NULL, NULL );
+ cm_return_val_if_fail( folder != NULL, NULL );
node = folder->listPerson;
while( node ) {
ItemPerson *person = node->data;
- list = g_list_append( list, person );
+ list = g_list_prepend( list, person );
node = g_list_next( node );
}
- return list;
+ return g_list_reverse(list);
}
/**
GList *list = NULL;
GList *node = NULL;
- g_return_val_if_fail( folder != NULL, NULL );
+ cm_return_val_if_fail( folder != NULL, NULL );
node = folder->listGroup;
while( node ) {
ItemGroup *group = node->data;
- list = g_list_append( list, group );
+ list = g_list_prepend( list, group );
node = g_list_next( node );
}
- return list;
-}
-
-/**
- * Move person's email item.
- * \param person Person.
- * \param itemMove Item to move.
- * \param itemTarget Target item before which to move item.
- * \return Reference to item that was moved, or <i>NULL</i> if null arguments
- * supplied.
- */
-
-ItemEMail *addritem_move_email_before(
- ItemPerson *person, ItemEMail *itemMove, ItemEMail *itemTarget )
-{
- gint posT, posM;
-
- g_return_val_if_fail( person != NULL, NULL );
-
- if( itemTarget == NULL ) return NULL;
- if( itemMove == NULL ) return NULL;
- if( itemMove == itemTarget ) return itemMove;
-
- posT = g_list_index( person->listEMail, itemTarget );
- if( posT < 0 ) return NULL;
- posM = g_list_index( person->listEMail, itemMove );
- if( posM < 0 ) return NULL;
- person->listEMail = g_list_remove( person->listEMail, itemMove );
- person->listEMail = g_list_insert( person->listEMail, itemMove, posT );
- return itemMove;
-}
-
-/**
- * Move person's email item.
- * \param person Person.
- * \param itemMove Item to move.
- * \param itemTarget Target item after which to move item.
- * \return Reference to item that was moved, or <i>NULL</i> if null arguments
- * supplied.
- */
-ItemEMail *addritem_move_email_after(
- ItemPerson *person, ItemEMail *itemMove, ItemEMail *itemTarget )
-{
- gint posT, posM;
-
- g_return_val_if_fail( person != NULL, NULL );
-
- if( itemTarget == NULL ) return NULL;
- if( itemMove == NULL ) return NULL;
- if( itemMove == itemTarget ) return itemMove;
-
- posT = g_list_index( person->listEMail, itemTarget );
- if( posT < 0 ) return NULL;
- posM = g_list_index( person->listEMail, itemMove );
- if( posM < 0 ) return NULL;
- person->listEMail = g_list_remove( person->listEMail, itemMove );
- person->listEMail = g_list_insert( person->listEMail, itemMove, 1+posT );
- return itemMove;
+ return g_list_reverse(list);
}
/**
gchar *p;
gint len, i;
- g_return_if_fail( person != NULL );
+ cm_return_if_fail( person != NULL );
name = ADDRITEM_NAME(person);
if( name == NULL ) return;
}
}
- if( person->firstName ) {
- g_free( person->firstName );
- }
+ g_free( person->firstName );
person->firstName = fName;
if( person->firstName )
g_strstrip( person->firstName );
- if( person->lastName ) {
- g_free( person->lastName );
- }
+ g_free( person->lastName );
person->lastName = lName;
if( person->lastName )
g_strstrip( person->lastName );
projects / claws.git / blobdiff