commit a83f97812174c6ba20697b1db26e36c289f59519
parent a3fe7b0f1041a3926447b9b0ad0f4c2a3636fb72
Author: Oliver Lowe <o@olowe.co>
Date: Mon, 4 Aug 2025 16:56:30 +0700
End of silly comment.
Diffstat:
37 files changed, 170 insertions(+), 348 deletions(-)
diff --git a/src/addr_compl.c b/src/addr_compl.c
@@ -70,7 +70,7 @@ enum {
* list, which contains all the completable strings, and store a
* reference to the address entry it belongs to.
* After calling the g_completion_complete(), we get a reference
- * to a valid email address.
+ * to a valid email address.
*
* Completion is very simplified. We never complete on another prefix,
* i.e. we neglect the next smallest possible prefix for the current
@@ -136,20 +136,20 @@ static GtkWidget *addr_compl_list_view_create (CompletionWindow *window);
static void addr_compl_create_list_view_columns (GtkWidget *list_view);
-static gboolean list_view_button_press (GtkWidget *widget,
+static gboolean list_view_button_press (GtkWidget *widget,
GdkEventButton *event,
CompletionWindow *window);
-static gboolean list_view_button_release (GtkWidget *widget,
+static gboolean list_view_button_release (GtkWidget *widget,
GdkEventButton *event,
CompletionWindow *window);
static gboolean addr_compl_selected (GtkTreeSelection *selector,
- GtkTreeModel *model,
+ GtkTreeModel *model,
GtkTreePath *path,
gboolean currently_selected,
gpointer data);
-
+
static gboolean addr_compl_defer_select_destruct(CompletionWindow *window);
/**
@@ -161,7 +161,7 @@ static gchar *completion_func(gpointer data)
cm_return_val_if_fail(data != NULL, NULL);
return ((completion_entry *)data)->string;
-}
+}
static gint addr_completion_func(const gchar *needle, const gchar *haystack,
gsize n)
@@ -292,7 +292,7 @@ static void free_completion_list(void)
GList *walk;
if (!g_completion_list)
return;
-
+
clear_completion_cache();
if (g_completion)
g_completion_clear_items(g_completion);
@@ -311,8 +311,8 @@ static void free_completion_list(void)
*/
static void free_all(void)
{
- free_completion_list();
- free_all_addresses();
+ free_completion_list();
+ free_all_addresses();
g_completion_free(g_completion);
g_completion = NULL;
}
@@ -339,12 +339,12 @@ void addr_compl_add_address1(const char *str, address_entry *ae)
* \param name Recipient name.
* \param address EMail address.
* \param alias Alias to append.
- * \param grp_emails the emails in case of a group. List should be freed later,
+ * \param grp_emails the emails in case of a group. List should be freed later,
* but not its strings
* \return <code>0</code> if entry appended successfully, or <code>-1</code>
* if failure.
*/
-static gint add_address(const gchar *name, const gchar *address,
+static gint add_address(const gchar *name, const gchar *address,
const gchar *nick, const gchar *alias, GList *grp_emails)
{
address_entry *ae;
@@ -379,7 +379,7 @@ static gint add_address(const gchar *name, const gchar *address,
/**
* Read address book, creating all entries in the completion index.
- */
+ */
static void read_address_book(gchar *folderpath) {
free_all_addresses();
free_completion_list();
@@ -388,7 +388,7 @@ static void read_address_book(gchar *folderpath) {
addrindex_load_completion( add_address, folderpath );
#else
GError* error = NULL;
-
+
addrcompl_initialize();
if (! addrindex_dbus_load_completion(add_address, &error)) {
g_warning("failed to populate address completion list");
@@ -533,7 +533,7 @@ static gchar *get_address_from_edit(GtkEntry *entry, gint *start_pos)
str = g_strdup(p);
return str;
-}
+}
static gchar *get_complete_address_from_name_email(const gchar *name, const gchar *email)
{
@@ -570,7 +570,7 @@ static void replace_address_in_edit(GtkEntry *entry, const gchar *newtext,
gchar *tmp;
ItemEMail *email = (ItemEMail *)cur->data;
ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(email);
-
+
gchar *addr = get_complete_address_from_name_email(
ADDRITEM_NAME(person), email->address);
if (addresses)
@@ -594,7 +594,7 @@ static void replace_address_in_edit(GtkEntry *entry, const gchar *newtext,
*
* \param str Search string to find.
* \return Zero if no match was found, otherwise the number of addresses; the
- * original prefix (search string) will appear at index 0.
+ * original prefix (search string) will appear at index 0.
*/
guint complete_address(const gchar *str)
{
@@ -784,7 +784,7 @@ gint end_address_completion(void)
invalidate_address_completion();
}
- return g_ref_count;
+ return g_ref_count;
}
/**
@@ -857,7 +857,7 @@ static CompletionWindow *addrcompl_create_window( void ) {
cw->in_mouse = FALSE;
cw->destroying = FALSE;
- return cw;
+ return cw;
}
/**
@@ -867,7 +867,7 @@ static CompletionWindow *addrcompl_create_window( void ) {
static void addrcompl_destroy_window( CompletionWindow *cw ) {
GdkDisplay *display;
GdkSeat *seat;
-
+
display = gdk_display_get_default();
seat = gdk_display_get_default_seat(display);
/* Stop all searches currently in progress */
@@ -880,7 +880,7 @@ static void addrcompl_destroy_window( CompletionWindow *cw ) {
_completionIdleID_ = 0;
}
- /* Now destroy window */
+ /* Now destroy window */
if( cw ) {
/* Clear references to widgets */
cw->entry = NULL;
@@ -895,7 +895,7 @@ static void addrcompl_destroy_window( CompletionWindow *cw ) {
cw->destroying = FALSE;
cw->in_mouse = FALSE;
}
-
+
/* Re-enable keyboard, required at least for Gtk3/Win32 */
gdk_seat_ungrab(seat);
}
@@ -911,10 +911,10 @@ static void addrcompl_free_window( CompletionWindow *cw ) {
g_free( cw->searchTerm );
cw->searchTerm = NULL;
- /* Clear references */
+ /* Clear references */
cw->listCount = 0;
- /* Free object */
+ /* Free object */
g_free( cw );
}
}
@@ -937,20 +937,20 @@ static void completion_window_advance_selection(GtkTreeView *list_view, gboolean
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
- if (forward) {
+ if (forward) {
forward = gtk_tree_model_iter_next(model, &iter);
- if (forward)
+ if (forward)
gtk_tree_selection_select_iter(selection, &iter);
} else {
GtkTreePath *prev;
prev = gtk_tree_model_get_path(model, &iter);
- if (!prev)
+ if (!prev)
return;
if (gtk_tree_path_prev(prev))
gtk_tree_selection_select_path(selection, prev);
-
+
gtk_tree_path_free(prev);
}
}
@@ -971,7 +971,7 @@ static void addrcompl_resize_window( CompletionWindow *cw ) {
gdk_window_get_position(gtk_widget_get_window(cw->window), &x, &y);
width = gdk_window_get_width(gtk_widget_get_window(cw->window));
-
+
gtk_widget_queue_resize_no_redraw(cw->list_view);
gtk_widget_get_preferred_size(cw->list_view, &r, NULL);
@@ -1012,7 +1012,7 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
GList *grp_emails = NULL;
store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(cw->list_view)));
GdkPixbuf *pixbuf;
-
+
if (!group_pixbuf) {
stock_pixbuf_gdk(STOCK_PIXMAP_ADDR_TWO, &group_pixbuf);
g_object_ref(G_OBJECT(group_pixbuf));
@@ -1033,14 +1033,14 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
pixbuf = email_pixbuf;
} else
pixbuf = NULL;
-
+
if (is_group && !_allowCommas_)
return;
gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
+ gtk_list_store_set(store, &iter,
ADDR_COMPL_ICON, pixbuf,
- ADDR_COMPL_ADDRESS, address,
- ADDR_COMPL_ISGROUP, is_group,
+ ADDR_COMPL_ADDRESS, address,
+ ADDR_COMPL_ISGROUP, is_group,
ADDR_COMPL_GROUPLIST, grp_emails,
-1);
cw->listCount++;
@@ -1207,7 +1207,7 @@ static void addrcompl_start_search( void ) {
#ifndef USE_ALT_ADDRBOOK
addrindex_start_search( _queryID_ );
#else
-
+
#endif
}
@@ -1244,8 +1244,8 @@ static void completion_window_apply_selection(GtkTreeView *list_view,
}
/* Process selected item */
- gtk_tree_model_get(model, &iter, ADDR_COMPL_ADDRESS, &text,
- ADDR_COMPL_ISGROUP, &is_group,
+ gtk_tree_model_get(model, &iter, ADDR_COMPL_ADDRESS, &text,
+ ADDR_COMPL_ISGROUP, &is_group,
ADDR_COMPL_GROUPLIST, &grp_emails,
-1);
@@ -1324,7 +1324,7 @@ void address_completion_unregister_entry(GtkEntry *entry)
g_object_set_data(G_OBJECT(entry), ENTRY_DATA_TAB_HOOK, NULL);
/* remove the hook */
- g_signal_handlers_disconnect_by_func(G_OBJECT(entry),
+ g_signal_handlers_disconnect_by_func(G_OBJECT(entry),
G_CALLBACK(address_completion_entry_key_pressed),
COMPLETION_UNIQUE_DATA);
}
@@ -1347,7 +1347,7 @@ static void address_completion_mainwindow_set_focus(GtkWindow *window,
GtkWidget *widget,
gpointer data)
{
-
+
if (widget && GTK_IS_ENTRY(widget) &&
g_object_get_data(G_OBJECT(widget), ENTRY_DATA_TAB_HOOK)) {
_allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), ENTRY_DATA_ALLOW_COMMAS));
@@ -1376,7 +1376,7 @@ static gboolean address_completion_entry_key_pressed(GtkEntry *entry,
ev->keyval = GDK_KEY_AudibleBell_Enable;
ev->state &= ~GDK_SHIFT_MASK;
- /* Create window */
+ /* Create window */
address_completion_create_completion_window(entry);
/* Start remote queries */
@@ -1435,17 +1435,17 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
#if (!defined(USE_LDAP) && !defined(GENERIC_UMPC))
/* Select the address if there is only one match */
if (ncount == 2) {
- /* Display selected address in entry field */
+ /* Display selected address in entry field */
gchar *addr = get_complete_address(1);
if (addr && !strstr(addr, " <!--___group___-->")) {
replace_address_in_edit(entry, addr, cursor_pos, FALSE, NULL);
/* Discard the window */
clear_completion_cache();
- }
+ }
g_free(addr);
}
/* Make sure that drop-down appears uniform! */
- else
+ else
#endif
if( ncount == 0 ) {
addrcompl_add_queue( searchTerm );
@@ -1514,11 +1514,11 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
g_signal_connect(G_OBJECT(list_view), "button_press_event",
G_CALLBACK(list_view_button_press),
_compWindow_);
-
+
g_signal_connect(G_OBJECT(list_view), "button_release_event",
G_CALLBACK(list_view_button_release),
_compWindow_);
-
+
g_signal_connect(G_OBJECT(window),
"button-press-event",
G_CALLBACK(completion_window_button_press),
@@ -1618,7 +1618,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
event->keyval == GDK_KEY_Down ||
event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
return TRUE;
- }
+ }
/* make tab move to next field */
if( event->keyval == GDK_KEY_Tab ) {
@@ -1659,7 +1659,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
(_allowCommas_ && event->keyval == GDK_KEY_comma)) {
/* User selected address with a key press */
- /* Display selected address in entry field */
+ /* Display selected address in entry field */
completion_window_apply_selection(
GTK_TREE_VIEW(list_view), GTK_ENTRY(entry),
event->keyval != GDK_KEY_comma);
@@ -1759,7 +1759,7 @@ static GtkListStore *addr_compl_create_store(void)
G_TYPE_POINTER,
-1);
}
-
+
static GtkWidget *addr_compl_list_view_create(CompletionWindow *window)
{
GtkTreeView *list_view;
@@ -1818,7 +1818,7 @@ static gboolean list_view_button_release(GtkWidget *widget, GdkEventButton *even
}
static gboolean addr_compl_selected(GtkTreeSelection *selector,
- GtkTreeModel *model,
+ GtkTreeModel *model,
GtkTreePath *path,
gboolean currently_selected,
gpointer data)
@@ -1827,7 +1827,7 @@ static gboolean addr_compl_selected(GtkTreeSelection *selector,
if (currently_selected)
return TRUE;
-
+
if (!window->in_mouse)
return TRUE;
@@ -1848,7 +1848,7 @@ static gboolean addr_compl_defer_select_destruct(CompletionWindow *window)
{
GtkEntry *entry = GTK_ENTRY(window->entry);
- completion_window_apply_selection(GTK_TREE_VIEW(window->list_view),
+ completion_window_apply_selection(GTK_TREE_VIEW(window->list_view),
entry, TRUE);
clear_completion_cache();
@@ -1883,7 +1883,3 @@ gboolean found_in_addressbook(const gchar *address)
g_free(addr);
return found;
}
-
-/*
- * End of Source.
- */
diff --git a/src/addrbook.c b/src/addrbook.c
@@ -258,7 +258,7 @@ void addrbook_dump_book(AddressBookFile *book, FILE *stream)
* \param book Address book.
* \param group Group to remove.
* \param value Name.
- * \return Group, or NULL if not found.
+ * \return Group, or NULL if not found.
*/
ItemGroup *addrbook_remove_group(AddressBookFile *book, ItemGroup *group)
{
@@ -366,7 +366,7 @@ ItemEMail *addrbook_person_remove_email(AddressBookFile *book,
* \param file XML file handle.
* \param person Person.
*/
-static void addrbook_parse_address(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_address(AddressBookFile *book, XMLFile *file,
ItemPerson *person)
{
GList *attr;
@@ -407,7 +407,7 @@ static void addrbook_parse_address(AddressBookFile *book, XMLFile *file,
* \param file XML file handle.
* \param person Person.
*/
-static void addrbook_parse_addr_list(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_addr_list(AddressBookFile *book, XMLFile *file,
ItemPerson *person)
{
guint prev_level;
@@ -445,7 +445,7 @@ static void addrbook_parse_attribute(XMLFile *file, ItemPerson *person)
if (!uAttr) uAttr = addritem_create_attribute();
if (strcmp(name, AB_ATTAG_UID) == 0)
addritem_attrib_set_id(uAttr, value);
- else if (strcmp(name, AB_ATTAG_NAME) == 0)
+ else if (strcmp(name, AB_ATTAG_NAME) == 0)
addritem_attrib_set_name(uAttr, value);
attr = g_list_next(attr);
}
@@ -471,7 +471,7 @@ static void addrbook_parse_attribute(XMLFile *file, ItemPerson *person)
* \param file XML file handle.
* \param person Person.
*/
-static void addrbook_parse_attr_list(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_attr_list(AddressBookFile *book, XMLFile *file,
ItemPerson *person)
{
guint prev_level;
@@ -504,7 +504,7 @@ static void addrbook_parse_person(AddressBookFile *book, XMLFile *file)
while (attr) {
name = ((XMLAttr *)attr->data)->name;
value = ((XMLAttr *)attr->data)->value;
- if (!person)
+ if (!person)
person = addritem_create_item_person();
if (strcmp(name, AB_ATTAG_UID) == 0) {
ADDRITEM_ID(person) = g_strdup(value);
@@ -543,7 +543,7 @@ static void addrbook_parse_person(AddressBookFile *book, XMLFile *file)
* \param file XML file handle.
* \param group Group.
*/
-static void addrbook_parse_member(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_member(AddressBookFile *book, XMLFile *file,
ItemGroup *group)
{
GList *attr;
@@ -565,7 +565,7 @@ static void addrbook_parse_member(AddressBookFile *book, XMLFile *file,
g_free(eid);
if (email) {
if (group) {
- addrcache_group_add_email(book->addressCache, group,
+ addrcache_group_add_email(book->addressCache, group,
email);
}
else {
@@ -581,7 +581,7 @@ static void addrbook_parse_member(AddressBookFile *book, XMLFile *file,
* \param file XML file handle.
* \param group Group.
*/
-static void addrbook_parse_member_list(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_member_list(AddressBookFile *book, XMLFile *file,
ItemGroup *group)
{
guint prev_level;
@@ -615,9 +615,9 @@ static void addrbook_parse_group(AddressBookFile *book, XMLFile *file)
while (attr) {
name = ((XMLAttr *)attr->data)->name;
value = ((XMLAttr *)attr->data)->value;
- if (!group)
+ if (!group)
group = addritem_create_item_group();
- if (strcmp(name, AB_ATTAG_UID) == 0)
+ if (strcmp(name, AB_ATTAG_UID) == 0)
ADDRITEM_ID(group) = g_strdup(value);
else if (strcmp(name, AB_ATTAG_NAME) == 0)
ADDRITEM_NAME(group) = g_strdup(value);
@@ -636,7 +636,7 @@ static void addrbook_parse_group(AddressBookFile *book, XMLFile *file)
} else {
if (group)
addritem_free_item_group(group);
- }
+ }
}
/**
@@ -645,7 +645,7 @@ static void addrbook_parse_group(AddressBookFile *book, XMLFile *file)
* \param file XML file handle.
* \param folder Folder.
*/
-static void addrbook_parse_folder_item(AddressBookFile *book, XMLFile *file,
+static void addrbook_parse_folder_item(AddressBookFile *book, XMLFile *file,
ItemFolder *folder)
{
GList *attr;
@@ -698,7 +698,7 @@ static void addrbook_parse_folder_list(AddressBookFile *book, XMLFile *file,
* \param book Address book.
* \param file XML file handle.
*/
-static void addrbook_parse_folder(AddressBookFile *book, XMLFile *file)
+static void addrbook_parse_folder(AddressBookFile *book, XMLFile *file)
{
GList *attr;
gchar *name, *value;
@@ -723,9 +723,9 @@ static void addrbook_parse_folder(AddressBookFile *book, XMLFile *file)
}
if (xml_compare_tag(file, AB_ELTAG_ITEM_LIST)) {
if (folder) {
- if (addrcache_hash_add_folder(book->addressCache,
+ if (addrcache_hash_add_folder(book->addressCache,
folder)) {
- book->tempList = g_list_append(book->tempList,
+ book->tempList = g_list_append(book->tempList,
folder);
/* We will resolve folder later */
ADDRITEM_PARENT(folder) = NULL;
@@ -775,7 +775,7 @@ static gboolean addrbook_read_tree(AddressBookFile *book, XMLFile *file)
/* Get next item tag (person, group or folder) */
if (xml_parse_next_tag(file))
longjmp( book->jumper, 1 );
-
+
if (xml_compare_tag(file, AB_ELTAG_PERSON))
addrbook_parse_person(book, file);
else if (xml_compare_tag(file, AB_ELTAG_GROUP))
@@ -824,14 +824,14 @@ static void addrbook_resolve_folder_items(AddressBookFile *book)
GList *node = NULL;
ItemFolder *rootFolder = book->addressCache->rootFolder;
nodeFolder = book->tempList;
-
+
while (nodeFolder) {
ItemFolder *folder = nodeFolder->data;
listRemove = NULL;
node = folder->listItems;
while (node) {
gchar *uid = node->data;
- AddrItemObject *aio = addrcache_get_object(book->addressCache,
+ AddrItemObject *aio = addrcache_get_object(book->addressCache,
uid);
if (aio) {
if (aio->type == ITEMTYPE_FOLDER) {
@@ -859,7 +859,7 @@ static void addrbook_resolve_folder_items(AddressBookFile *book)
}
node = g_list_next(node);
}
- rootFolder->listFolder = g_list_append(rootFolder->listFolder,
+ rootFolder->listFolder = g_list_append(rootFolder->listFolder,
folder);
/* Process remove list */
node = listRemove;
@@ -889,14 +889,14 @@ static void addrbook_resolve_folder_items(AddressBookFile *book)
/* Process remove list */
node = listRemove;
while (node) {
- rootFolder->listFolder = g_list_remove(rootFolder->listFolder,
+ rootFolder->listFolder = g_list_remove(rootFolder->listFolder,
node->data);
node = g_list_next(node);
}
g_list_free(listRemove);
/* Move all unparented persons and groups into root folder */
- g_hash_table_foreach(book->addressCache->itemHash,
+ g_hash_table_foreach(book->addressCache->itemHash,
addrbook_res_items_vis, book);
/* Free up some more */
@@ -928,7 +928,7 @@ gint addrbook_read_data(AddressBookFile *book)
addrcache_get_name( book->addressCache ) );
*/
- fileSpec = g_strconcat(book->path, G_DIR_SEPARATOR_S,
+ fileSpec = g_strconcat(book->path, G_DIR_SEPARATOR_S,
book->fileName, NULL);
book->retVal = MGU_OPEN_FILE;
addrcache_clear(book->addressCache);
@@ -964,14 +964,14 @@ gint addrbook_read_data(AddressBookFile *book)
static int addrbook_write_elem_s(FILE *fp, gint lvl, gchar *name)
{
gint i;
- for (i = 0; i < lvl; i++)
+ for (i = 0; i < lvl; i++)
if (claws_fputs(" ", fp) == EOF)
return -1;
if (claws_fputs("<", fp) == EOF)
return -1;
if (claws_fputs(name, fp) == EOF)
return -1;
-
+
return 0;
}
@@ -993,7 +993,7 @@ static int addrbook_write_elem_e(FILE *fp, gint lvl, gchar *name)
return -1;
if (claws_fputs(">\n", fp) == EOF)
return -1;
-
+
return 0;
}
@@ -1015,7 +1015,7 @@ static int addrbook_write_attr(FILE *fp, gchar *name, gchar *value)
return -1;
if (claws_fputs("\"", fp) == EOF)
return -1;
-
+
return 0;
}
@@ -1031,7 +1031,7 @@ typedef struct _HashLoopData {
* \param value Reference to person.
* \param data File pointer.
*/
-static void addrbook_write_item_person_vis(gpointer key, gpointer value,
+static void addrbook_write_item_person_vis(gpointer key, gpointer value,
gpointer d)
{
AddrItemObject *obj = (AddrItemObject *) value;
@@ -1121,7 +1121,7 @@ static void addrbook_write_item_person_vis(gpointer key, gpointer value,
* \param value Reference to group.
* \param data File pointer.
*/
-static void addrbook_write_item_group_vis(gpointer key, gpointer value,
+static void addrbook_write_item_group_vis(gpointer key, gpointer value,
gpointer d)
{
AddrItemObject *obj = (AddrItemObject *) value;
@@ -1180,7 +1180,7 @@ static void addrbook_write_item_group_vis(gpointer key, gpointer value,
* \param value Reference to folder.
* \param data File pointer.
*/
-static void addrbook_write_item_folder_vis(gpointer key, gpointer value,
+static void addrbook_write_item_folder_vis(gpointer key, gpointer value,
gpointer d)
{
AddrItemObject *obj = (AddrItemObject *) value;
@@ -1309,20 +1309,20 @@ static gint addrbook_write_to(AddressBookFile *book, gchar *newFile)
data.fp = fp;
data.error = FALSE;
- g_hash_table_foreach(book->addressCache->itemHash,
+ g_hash_table_foreach(book->addressCache->itemHash,
addrbook_write_item_person_vis, &data);
if (data.error)
goto fail;
/* Output all groups */
- g_hash_table_foreach(book->addressCache->itemHash,
+ g_hash_table_foreach(book->addressCache->itemHash,
addrbook_write_item_group_vis, &data);
if (data.error)
goto fail;
/* Output all folders */
- g_hash_table_foreach(book->addressCache->itemHash,
+ g_hash_table_foreach(book->addressCache->itemHash,
addrbook_write_item_folder_vis, &data);
if (data.error)
@@ -1360,7 +1360,7 @@ gint addrbook_save_data(AddressBookFile *book)
cm_return_val_if_fail(book != NULL, -1);
book->retVal = MGU_NO_FILE;
- if (book->fileName == NULL || *book->fileName == '\0')
+ if (book->fileName == NULL || *book->fileName == '\0')
return book->retVal;
if (book->path == NULL || *book->path == '\0')
return book->retVal;
@@ -1384,7 +1384,7 @@ gint addrbook_save_data(AddressBookFile *book)
* \param data User data.
* \return <i>TRUE</i> to indicate that entry freed.
*/
-static gboolean addrbook_free_simple_hash_vis(gpointer *key, gpointer *value,
+static gboolean addrbook_free_simple_hash_vis(gpointer *key, gpointer *value,
gpointer *data)
{
g_free(key);
@@ -1402,7 +1402,7 @@ static gboolean addrbook_free_simple_hash_vis(gpointer *key, gpointer *value,
* \param person Person to update.
* \param listEMail List of new email addresses.
*/
-void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
+void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
GList *listEMail)
{
GList *node;
@@ -1431,7 +1431,7 @@ void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
g_hash_table_insert(hashEMail, addr, email);
}
if (*alias != '\0' && ! g_hash_table_lookup(hashEMailAlias,
- alias))
+ alias))
g_hash_table_insert(hashEMailAlias, alias, email);
node = g_list_next(node);
@@ -1463,15 +1463,15 @@ void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
emailNew = (ItemEMail *)
g_hash_table_lookup(hashEMailAlias, alias);
}
-
+
if (emailNew)
/* Point to this entry */
nodeGrpEM->data = emailNew;
else if (g_hash_table_size(hashEMail)==1)
- /* If the person has just one e-mail address, then
+ /* If the person has just one e-mail address, then
change e-mail address in group list */
nodeGrpEM->data = listEMail->data;
- else
+ else
/* Mark for removal */
listRemove = g_list_append(listRemove, emailGrp);
}
@@ -1494,7 +1494,7 @@ void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
}
/* Clear hash table */
- g_hash_table_foreach_remove(hashEMail, (GHRFunc)
+ g_hash_table_foreach_remove(hashEMail, (GHRFunc)
addrbook_free_simple_hash_vis, NULL);
g_hash_table_destroy(hashEMail);
hashEMail = NULL;
@@ -1523,7 +1523,7 @@ void addrbook_update_address_list(AddressBookFile *book, ItemPerson *person,
if (ADDRITEM_ID(email) == NULL)
/* Allocate an ID for new address */
addrcache_id_email(book->addressCache, email);
-
+
addrcache_person_add_email( book->addressCache, person, email );
node = g_list_next( node );
}
@@ -1566,7 +1566,7 @@ ItemPerson *addrbook_add_address_list(AddressBookFile *book, ItemFolder *folder,
cm_return_val_if_fail(book != NULL, NULL);
- if (!f)
+ if (!f)
f = book->addressCache->rootFolder;
person = addritem_create_item_person();
addrcache_id_person(book->addressCache, person);
@@ -1590,7 +1590,7 @@ ItemPerson *addrbook_add_address_list(AddressBookFile *book, ItemFolder *folder,
* \param value Value stored in table.
* \param data Reference to address book.
*/
-static void addrbook_build_avail_email_vis(gpointer key, gpointer value,
+static void addrbook_build_avail_email_vis(gpointer key, gpointer value,
gpointer data)
{
AddrItemObject *obj = (AddrItemObject *) value;
@@ -1644,7 +1644,7 @@ GList *addrbook_get_available_email_list(AddressBookFile *book, ItemGroup *group
/* Build list of available email addresses which exclude those already in groups */
book->tempList = NULL;
book->tempHash = table;
- g_hash_table_foreach(book->addressCache->itemHash,
+ g_hash_table_foreach(book->addressCache->itemHash,
addrbook_build_avail_email_vis, book);
list = book->tempList;
book->tempList = NULL;
@@ -1668,7 +1668,7 @@ GList *addrbook_get_available_email_list(AddressBookFile *book, ItemGroup *group
* \param listEMail List of email items. This should <b>*NOT*</b> be
* <code>g_free()</code> when done.
*/
-void addrbook_update_group_list(AddressBookFile *book, ItemGroup *group,
+void addrbook_update_group_list(AddressBookFile *book, ItemGroup *group,
GList *listEMail)
{
GList *oldData;
@@ -1886,7 +1886,7 @@ GList *addrbook_get_bookfile_list(AddressBookFile *book) {
g_dir_close( dir );
g_free(adbookdir);
- book->maxValue = maxval;
+ book->maxValue = maxval;
book->retVal = MGU_SUCCESS;
return fileList;
}
@@ -1903,7 +1903,7 @@ gchar *addrbook_gen_new_file_name(gint fileNum) {
gint n = fileNum;
long int nmax;
- if (n < 1)
+ if (n < 1)
n = 1;
nmax = -1 + (long int) pow(10, FILE_NUMDIGITS);
if (fileNum > nmax)
@@ -1971,7 +1971,7 @@ static void addrbook_chkparse_attr_list(AddressBookFile *book, XMLFile *file)
prev_level = file->level;
if (xml_parse_next_tag(file))
longjmp(book->jumper, 1);
- if (file->level < prev_level)
+ if (file->level < prev_level)
return;
if (xml_compare_tag(file, AB_ELTAG_ATTRIBUTE)) {
addrbook_chkparse_attribute(book, file);
@@ -2016,12 +2016,12 @@ static void addrbook_chkparse_member_list(AddressBookFile *book, XMLFile *file)
for (;;) {
prev_level = file->level;
- if (xml_parse_next_tag(file))
+ if (xml_parse_next_tag(file))
longjmp(book->jumper, 1);
if (file->level < prev_level)
return;
-
+
if (xml_compare_tag(file, AB_ELTAG_MEMBER)) {
/* attr = xml_get_current_tag_attr(file); */
/* addrbook_show_attribs( attr ); */
@@ -2069,7 +2069,7 @@ static void addrbook_chkparse_folder_list(AddressBookFile *book, XMLFile *file)
if (file->level < prev_level)
return;
-
+
if (xml_compare_tag(file, AB_ELTAG_ITEM)) {
/* attr = xml_get_current_tag_attr(file); */
/* addrbook_show_attribs( attr ); */
@@ -2124,12 +2124,12 @@ static gboolean addrbook_chkread_tree(AddressBookFile *book, XMLFile *file)
retVal = TRUE;
for (;;) {
- if (!file->level)
+ if (!file->level)
break;
/* Get item tag */
if (xml_parse_next_tag(file))
longjmp(book->jumper, 1);
-
+
/* Get next tag (person, group or folder) */
if (xml_compare_tag(file, AB_ELTAG_PERSON))
addrbook_chkparse_person( book, file );
@@ -2204,8 +2204,8 @@ GList *addrbook_get_all_groups(AddressBookFile *book)
* <code>addrbook_free_xxx()</code> functions... this will destroy
* the address book data.
*/
-ItemPerson *addrbook_add_contact(AddressBookFile *book, ItemFolder *folder,
- const gchar *name,const gchar *address,
+ItemPerson *addrbook_add_contact(AddressBookFile *book, ItemFolder *folder,
+ const gchar *name,const gchar *address,
const gchar *remarks)
{
ItemPerson *person;
@@ -2230,7 +2230,7 @@ gchar *addrbook_guess_next_file(AddressBookFile *book)
fileList = addrbook_get_bookfile_list(book);
if (fileList)
fileNum = 1 + book->maxValue;
-
+
newFile = addrbook_gen_new_file_name(fileNum);
g_list_free(fileList);
fileList = NULL;
@@ -2240,18 +2240,13 @@ gchar *addrbook_guess_next_file(AddressBookFile *book)
void addrbook_delete_book_file(AddressBookFile *book)
{
gchar *book_path;
-
+
if (!book->path || !book->fileName)
return;
-
+
book_path = g_strconcat(book->path, G_DIR_SEPARATOR_S,
book->fileName, NULL);
claws_unlink(book_path);
g_free(book_path);
}
-/*
-* End of Source.
-*/
-
-
diff --git a/src/addrcache.c b/src/addrcache.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -1009,7 +1009,7 @@ ItemFolder *addrcache_remove_folder_delete( AddressCache *cache, ItemFolder *fol
* \param name Common name.
* \param address EMail address.
* \param remarks Remarks.
- * \return Person added. Do not *NOT* to use the
+ * \return Person added. Do not *NOT* to use the
* <code>addrbook_free_xxx()</code> functions...; this will destroy
* the address book data.
*/
@@ -1071,7 +1071,3 @@ ItemFolder *addrcache_add_new_folder( AddressCache *cache, ItemFolder *parent )
}
return folder;
}
-
-/*
-* End of Source.
-*/
diff --git a/src/addrclip.c b/src/addrclip.c
@@ -17,31 +17,31 @@
*/
/*
- * Contains address clipboard objects and related functions. The address
- * clipboard is implemented as a linked list of AddrSelectItem objects.
+ * Contains address clipboard objects and related functions. The address
+ * clipboard is implemented as a linked list of AddrSelectItem objects.
* The address clipboard offers two groups of functions:
*
* a) Cut, copy and paste of address item objects (ItemFolder, ItemGroup,
* ItemPerson) into a folder. With this method, we can paste ItemPerson
- * objects but not unattached ItemEMail objects into a folder. ItemEMail
- * objects are owned by an ItemPerson object. Any ItemEMail objects that
- * appear in the clipboard are ignored. If an ItemPerson object is found,
+ * objects but not unattached ItemEMail objects into a folder. ItemEMail
+ * objects are owned by an ItemPerson object. Any ItemEMail objects that
+ * appear in the clipboard are ignored. If an ItemPerson object is found,
* the ItemPerson *and* ItemEMail objects that it owns are pasted.
*
- * b) Copy and paste of ItemEMail address objects only into (below)
+ * b) Copy and paste of ItemEMail address objects only into (below)
* ItemPerson objects. All ItemEMail objects which are owned by
* ItemPerson and referenced by ItemGroup objects are pasted. Any
* ItemFolder objects in the clipboard, and any objects owned by
* ItemFolder objects are ignored.
*
- * Objects are inserted to the clipboard by copying (cloning)
+ * Objects are inserted to the clipboard by copying (cloning)
* AddrSelectItem objects from the address books selection list to the
* clipboard's internal selection list. The clipboard makes use of the
* object id's and address cache id's to access objects contained in
* the address cache. If the referenced object is not found, it is
* ignored. This eliminates the need to delete pointers in multiple
* linked lists when an address object is deleted.
- *
+ *
*/
#include "config.h"
@@ -269,9 +269,9 @@ static GList *addrclip_cache_add_person(
gchar *pictureFile;
gchar *newPictureFile;
- pictureFile = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S,
+ pictureFile = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S,
person->picture, ".png", NULL );
- newPictureFile = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S,
+ newPictureFile = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S, ADDRBOOK_DIR, G_DIR_SEPARATOR_S,
newPerson->picture, ".png", NULL );
if (file_exist(pictureFile, FALSE) && !file_exist(newPictureFile, FALSE)) {
debug_print("copying contact picture file: %s -> %s\n", person->picture, newPerson->picture);
@@ -465,7 +465,7 @@ static GList *addrclip_cache_add_folder(
}
/*
else if( ADDRITEM_TYPE(aio) == ITEMTYPE_EMAIL ) {
- }
+ }
*/
else if( ADDRITEM_TYPE(aio) == ITEMTYPE_GROUP ) {
haveGroups = TRUE; /* Process later */
@@ -759,7 +759,3 @@ GList *addrclip_paste_cut(
return folderGroup;
}
-/*
-* End of Source.
-*/
-
diff --git a/src/addrdefs.h b/src/addrdefs.h
@@ -37,7 +37,3 @@ typedef enum {
} AddrSearchType;
#endif /* __ADDRDEFS_H__ */
-
-/*
-* End of Source.
-*/
diff --git a/src/addressadd.c b/src/addressadd.c
@@ -598,7 +598,3 @@ gboolean addressadd_selection(const gchar *name, const gchar *address,
return retVal;
}
-/*
-* End of Source.
-*/
-
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -5392,7 +5392,3 @@ static void addressbook_drag_received_cb(GtkWidget *widget,
gtk_drag_finish(drag_context, TRUE, TRUE, time);
}
}
-
-/*
-* End of Source.
-*/
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
@@ -356,7 +356,7 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex )
}
gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
- AddressBookFile **book, ItemFolder **folder,
+ AddressBookFile **book, ItemFolder **folder,
const gchar* path)
{
gboolean retVal = FALSE;
@@ -368,7 +368,7 @@ gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
gtk_widget_show(addressbook_foldersel_dlg.window);
manage_window_set_transient(GTK_WINDOW(addressbook_foldersel_dlg.window));
gtk_window_set_modal(GTK_WINDOW(addressbook_foldersel_dlg.window), TRUE);
-
+
addressbook_foldersel_dlg.fiSelected = NULL;
addressbook_foldersel_load_data( addrIndex );
@@ -394,7 +394,3 @@ gboolean addressbook_foldersel_selection( AddressIndex *addrIndex,
return retVal;
}
-
-/*
-* End of Source.
-*/
diff --git a/src/addressitem.h b/src/addressitem.h
@@ -153,8 +153,3 @@ void addressbook_ads_set_name ( AdapterDSource *adapter,
ItemObjectType addressbook_type2item ( AddressObjectType abType );
#endif /* __ADDRESSITEM_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/addrgather.c b/src/addrgather.c
@@ -146,7 +146,7 @@ static void addrgather_size_allocate(
GtkWidget *widget, GtkAllocation *allocation )
{
cm_return_if_fail( allocation != NULL );
-
+
gtk_window_get_size(GTK_WINDOW(widget),
&prefs_common.addrgather_width, &prefs_common.addrgather_height);
}
@@ -520,13 +520,13 @@ static void addrgather_dlg_create(void)
GtkWidget *hbbox;
GtkWidget *hsbox;
static GdkGeometry geometry;
-
+
window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addrgather");
gtk_container_set_border_width(GTK_CONTAINER(window), 4);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
-
+
g_signal_connect(G_OBJECT(window), "delete_event",
G_CALLBACK(addrgather_dlg_delete_event), NULL);
g_signal_connect(G_OBJECT(window), "key_press_event",
@@ -613,7 +613,7 @@ void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *m
/* Create dialog */
if (!addrgather_dlg.window)
addrgather_dlg_create();
-
+
addrgather_dlg.done = FALSE;
gtk_notebook_set_current_page(GTK_NOTEBOOK(addrgather_dlg.notebook), PAGE_FIELDS);
@@ -670,8 +670,3 @@ void addrgather_dlg_execute(FolderItem *folderItem, gboolean sourceInd, GList *m
return _harv_addressBook_;
#endif
}
-/*
-* End of Source.
-*/
-
-
diff --git a/src/addrgather.h b/src/addrgather.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -40,8 +40,3 @@ void addrgather_dlg_execute( FolderItem *folderItem,
GList *msgList );
#endif
#endif /* __ADDR_GATHER_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/addrharvest.c b/src/addrharvest.c
@@ -204,7 +204,7 @@ void addrharvest_set_recurse(
* name Header name.
* Return: Header, or NULL if not found.
*/
-static HeaderEntry *addrharvest_find(
+static HeaderEntry *addrharvest_find(
AddressHarvester* harvester, const gchar *name ) {
HeaderEntry *retVal;
GList *node;
@@ -304,7 +304,7 @@ static gchar* get_namepart(const gchar* name, Namepart namepart) {
pos +=1;
part = g_strdup(pos);
}
- }
+ }
g_free(token);
return part;
}
@@ -527,7 +527,7 @@ static gchar *addrharvest_extract_address( gchar *buffer ) {
memmove( bp, ep, len );
*bp = ' ';
}
- }
+ }
}
return addr;
}
@@ -923,11 +923,3 @@ gboolean addrharvest_check_header( AddressHarvester *harvester ) {
}
return retVal;
}
-
-/*
- * ============================================================================
- * End of Source.
- * ============================================================================
- */
-
-
diff --git a/src/addrindex.c b/src/addrindex.c
@@ -2436,7 +2436,3 @@ gchar *addrindex_get_picture_file(const gchar *emailaddr)
return filename;
}
-
-/*
- * End of Source.
- */
diff --git a/src/addrindex.h b/src/addrindex.h
@@ -180,7 +180,3 @@ gboolean addrindex_load_person_ds( gint (*callBackFunc)
gchar *addrindex_get_picture_file(const gchar *emailaddr);
#endif /* __ADDRINDEX_H__ */
-
-/*
-* End of Source.
-*/
diff --git a/src/addritem.c b/src/addritem.c
@@ -263,7 +263,7 @@ 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,
+ gchar *out = conv_codeset_strdup(value,
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (out)
@@ -319,7 +319,7 @@ void addritem_person_set_first_name( ItemPerson *person, const gchar *value ) {
if (!value || g_utf8_validate(value, -1, NULL))
person->firstName = mgu_replace_string( person->firstName, value );
else {
- gchar *out = conv_codeset_strdup(value,
+ gchar *out = conv_codeset_strdup(value,
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (out)
@@ -337,7 +337,7 @@ void addritem_person_set_last_name( ItemPerson *person, const gchar *value ) {
if (!value || g_utf8_validate(value, -1, NULL))
person->lastName = mgu_replace_string( person->lastName, value );
else {
- gchar *out = conv_codeset_strdup(value,
+ gchar *out = conv_codeset_strdup(value,
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (out)
@@ -355,7 +355,7 @@ void addritem_person_set_nick_name( ItemPerson *person, const gchar *value ) {
if (!value || g_utf8_validate(value, -1, NULL))
person->nickName = mgu_replace_string( person->nickName, value );
else {
- gchar *out = conv_codeset_strdup(value,
+ gchar *out = conv_codeset_strdup(value,
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (out)
@@ -373,7 +373,7 @@ void addritem_person_set_common_name( ItemPerson *person, const gchar *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,
+ gchar *out = conv_codeset_strdup(value,
conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
if (out)
@@ -1166,7 +1166,3 @@ gchar *addritem_format_email( ItemEMail *email ) {
}
return address;
}
-
-/*
-* End of Source.
-*/
diff --git a/src/addrquery.c b/src/addrquery.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -111,7 +111,7 @@ void qryreq_add_query( QueryRequest *req, AddrQueryObject *aqo ) {
* terminates.
* \param callBackEntry Callback function that will be called after each
* address entry has been read.
- * \return Initialize query request object.
+ * \return Initialize query request object.
*/
QueryRequest *qrymgr_add_request(
const gchar *searchTerm, void *callBackEnd, void *callBackEntry )
@@ -225,9 +225,3 @@ static void qrymgr_free_all_request( void ) {
void qrymgr_teardown( void ) {
qrymgr_free_all_request();
}
-
-/*
-* End of Source.
-*/
-
-
diff --git a/src/addrquery.h b/src/addrquery.h
@@ -100,7 +100,3 @@ QueryRequest *qrymgr_find_request( const gint queryID );
void qrymgr_delete_request ( const gint queryID );
#endif /* __ADDRQUERY_H__ */
-
-/*
-* End of Source.
-*/
diff --git a/src/addrselect.c b/src/addrselect.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -378,9 +378,3 @@ GList *addrselect_build_list( AddrSelectList *asl ) {
}
return list;
}
-
-/*
-* End of Source.
-*/
-
-
diff --git a/src/common/claws.c b/src/common/claws.c
@@ -145,7 +145,7 @@ const gchar *claws_get_startup_dir(void)
guint claws_get_version(void)
{
- return VERSION_NUMERIC;
+ return 1234;
}
void claws_register_idle_function (void (*idle_func)(void))
diff --git a/src/common/mgutils.c b/src/common/mgutils.c
@@ -154,7 +154,7 @@ GList *mgu_parse_string( gchar *line, const gint maxTokens, gint *tokenCnt ) {
/* Skip over leading spaces */
while( *ptr ) {
if( ! isspace( *ptr ) ) break;
- ptr++;
+ ptr++;
}
/* Find terminating space */
@@ -290,8 +290,4 @@ gchar *mgu_slist_longest_entry( GSList *list ) {
node = g_slist_next( node );
}
return name;
-}
-
-/*
-* End of Source.
-*/
+}
diff --git a/src/common/mgutils.h b/src/common/mgutils.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -53,8 +53,3 @@ void mgu_str_ltc2space ( gchar *str, gchar chlead, gchar chtail );
gchar *mgu_slist_longest_entry ( GSList *list );
#endif /* __MGUTILS_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/common/xmlprops.c b/src/common/xmlprops.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -26,7 +26,7 @@
* <property name="first-name" value="Axle" >/
* <property name="last-name" value="Rose" >/
* </property-list>
- *
+ *
* ***********************************************************************
*/
@@ -138,7 +138,7 @@ static int xmlprops_write_elem_s( FILE *fp, gint lvl, gchar *name ) {
return -1;
if(claws_fputs( name, fp ) == EOF)
return -1;
-
+
return 0;
}
@@ -154,7 +154,7 @@ static int xmlprops_write_elem_e( FILE *fp, gint lvl, gchar *name ) {
return -1;
if(claws_fputs( ">\n", fp ) == EOF)
return -1;
-
+
return 0;
}
@@ -169,7 +169,7 @@ static int xmlprops_write_attr( FILE *fp, gchar *name, gchar *value ) {
return -1;
if(claws_fputs( "\"", fp ) == EOF)
return -1;
-
+
return 0;
}
@@ -218,7 +218,7 @@ static gint xmlprops_write_to( XmlProperty *props, const gchar *fileSpec ) {
if(xmlprops_write_elem_e( fp, 0, XMLS_ELTAG_PROP_LIST ) < 0)
goto revert;
-
+
props->retVal = MGU_SUCCESS;
if( prefs_file_close( pfile ) < 0 ) {
props->retVal = MGU_ERROR_WRITE;
@@ -230,7 +230,7 @@ revert:
if( prefs_file_close_revert( pfile ) < 0 ) {
props->retVal = MGU_ERROR_WRITE;
}
-
+
}
out:
return props->retVal;
@@ -446,9 +446,3 @@ gboolean xmlprops_get_property_b( XmlProperty *props, const gchar *name ) {
}
return value;
}
-
-/*
-* End of Source.
-*/
-
-
diff --git a/src/compose.c b/src/compose.c
@@ -12565,8 +12565,3 @@ static void from_name_activate_cb(GtkWidget *widget, gpointer data)
{
gtk_combo_box_popup(GTK_COMBO_BOX(data));
}
-
-
-/*
- * End of Source.
- */
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -1966,8 +1966,3 @@ void addressbook_edit_reload_attr_list( void )
prefs_common.addressbook_custom_attributes);
}
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/editbook.c b/src/editbook.c
@@ -320,7 +320,3 @@ AdapterDSource *addressbook_edit_book( AddressIndex *addrIndex, AdapterDSource *
return ads;
}
-
-/*
-* End of Source.
-*/
diff --git a/src/editgroup.c b/src/editgroup.c
@@ -567,8 +567,3 @@ ItemFolder *addressbook_edit_folder( AddressBookFile *abf, ItemFolder *parent, I
g_free( name );
return folder;
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/editvcard.c b/src/editvcard.c
@@ -291,8 +291,3 @@ AdapterDSource *addressbook_edit_vcard( AddressIndex *addrIndex, AdapterDSource
return ads;
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/exphtmldlg.c b/src/exphtmldlg.c
@@ -322,7 +322,7 @@ static void export_html_browse( GtkWidget *widget, gpointer data ) {
*/
static void exp_html_file_select_create( AddressFileSelection *afs ) {
gchar *file = filesel_select_file_save(_("Select HTML output file"), NULL);
-
+
if (file == NULL)
afs->cancelled = TRUE;
else {
@@ -705,10 +705,3 @@ void addressbook_exp_html( AddressCache *cache ) {
_addressCache_ = NULL;
}
-
-/*
- * ============================================================================
- * End of Source.
- * ============================================================================
- */
-
diff --git a/src/exphtmldlg.h b/src/exphtmldlg.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -28,8 +28,3 @@
void addressbook_exp_html( AddressCache *cache );
#endif /* __EXPORT_HTML_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/exporthtml.c b/src/exporthtml.c
@@ -373,7 +373,7 @@ static void exporthtml_create_css_files( ExportHtmlCtl *ctl ) {
node = g_list_next( node );
if( strlen( entry->fileName ) ) {
fileSpec = g_strconcat(
- ctl->dirOutput, G_DIR_SEPARATOR_S,
+ ctl->dirOutput, G_DIR_SEPARATOR_S,
entry->fileName, NULL );
if( entry->id == EXPORT_HTML_ID_DEFAULT ) {
exporthtml_create_css_dfl( fileSpec );
@@ -1162,11 +1162,3 @@ void exporthtml_save_settings( ExportHtmlCtl *ctl ) {
g_warning("can't save settings");
xmlprops_free( props );
}
-
-/*
- * ============================================================================
- * End of Source.
- * ============================================================================
- */
-
-
diff --git a/src/importmutt.c b/src/importmutt.c
@@ -154,7 +154,7 @@ static void imp_mutt_cancel( GtkWidget *widget, gboolean *cancelled ) {
static void imp_mutt_file_select_create( AddressFileSelection *afs ) {
gchar *file = filesel_select_file_open(_("Select MUTT File"), NULL);
-
+
if (file == NULL)
afs->cancelled = TRUE;
else {
@@ -226,7 +226,7 @@ static void imp_mutt_create( gboolean *cancelled ) {
gtk_grid_attach(GTK_GRID(table), name_entry, 1, 0, 1, 1);
gtk_widget_set_hexpand(name_entry, TRUE);
gtk_widget_set_halign(name_entry, GTK_ALIGN_FILL);
-
+
/* Second row */
label = gtk_label_new(_("File"));
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
@@ -302,8 +302,3 @@ AddressBookFile *addressbook_imp_mutt( AddressIndex *addrIndex ) {
if (cancelled == TRUE) return NULL;
return _importedBook_;
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/importmutt.h b/src/importmutt.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -28,8 +28,3 @@
AddressBookFile *addressbook_imp_mutt( AddressIndex *addrIndex );
#endif /* __IMPORT_MUTT_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/importpine.c b/src/importpine.c
@@ -153,7 +153,7 @@ static void imp_pine_cancel( GtkWidget *widget, gboolean *cancelled ) {
static void imp_pine_file_select_create( AddressFileSelection *afs ) {
gchar *file = filesel_select_file_open(_("Select Pine File"), NULL);
-
+
if (file == NULL)
afs->cancelled = TRUE;
else {
@@ -302,8 +302,3 @@ AddressBookFile *addressbook_imp_pine( AddressIndex *addrIndex ) {
if (cancelled == TRUE) return NULL;
return _importedBook_;
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/importpine.h b/src/importpine.h
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -28,8 +28,3 @@
AddressBookFile *addressbook_imp_pine( AddressIndex *addrIndex );
#endif /* __IMPORT_PINE_H__ */
-
-/*
-* End of Source.
-*/
-
diff --git a/src/mutt.c b/src/mutt.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -141,7 +141,7 @@ static gchar *mutt_get_line( MuttFile *muttFile, gboolean *flagCont ) {
int i = 0, li = 0;
*flagCont = FALSE;
- if( claws_feof( muttFile->file ) )
+ if( claws_feof( muttFile->file ) )
return NULL;
memset(buf, 0, MUTTBUFSIZE);
@@ -150,14 +150,14 @@ static gchar *mutt_get_line( MuttFile *muttFile, gboolean *flagCont ) {
while( i < MUTTBUFSIZE-1 ) {
ch = fgetc( muttFile->file );
if( ch == '\0' || ch == EOF ) {
- if( i == 0 )
+ if( i == 0 )
return NULL;
break;
}
if( ch == '\n' ) {
if( lch == '\\' ) {
/* Replace backslash with NULL */
- if( li != 0 )
+ if( li != 0 )
buf[li] = '\0';
*flagCont = TRUE;
}
@@ -266,7 +266,7 @@ static GSList *mutt_parse_rcplist( gchar *rcpList, gint *addrCount ) {
if( isspace( ch ) ) continue;
}
pStart = ptr;
-
+
/* Extract name (if any) */
if( pName ) {
/* Look for closing parens */
@@ -561,8 +561,3 @@ gchar *mutt_find_file( void ) {
}
return g_strdup( str );
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/pine.c b/src/pine.c
@@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
+ *
*/
/*
@@ -143,19 +143,19 @@ static gchar *pine_read_line( PineFile *pineFile ) {
int c, i = 0;
gchar ch;
- if( claws_feof( pineFile->file ) )
+ if( claws_feof( pineFile->file ) )
return NULL;
while( i < PINEBUFSIZE-1 ) {
c = fgetc( pineFile->file );
if( c == EOF ) {
- if( i == 0 )
+ if( i == 0 )
return NULL;
break;
}
ch = (gchar) c;
if( ch == '\0' ) {
- if( i == 0 )
+ if( i == 0 )
return NULL;
break;
}
@@ -661,8 +661,3 @@ gchar *pine_find_file( void ) {
}
return g_strdup( str );
}
-
-/*
-* End of Source.
-*/
-
diff --git a/src/vcard.c b/src/vcard.c
@@ -240,7 +240,7 @@ static gchar *vcard_get_line( VCardFile *cardFile ) {
g_strstrip(buf);
cardFile->bufptr = end + 1;
- /* Return a copy of buffer */
+ /* Return a copy of buffer */
return g_strdup( buf );
}
@@ -388,7 +388,7 @@ static gchar *vcard_unescape_qp( gchar *value ) {
gint len;
if (value == NULL)
return NULL;
-
+
len = strlen(value);
res = g_malloc(len + 1);
qp_decode_const(res, len, value);
@@ -698,8 +698,3 @@ gint vcard_test_read_file( const gchar *fileSpec ) {
cardFile = NULL;
return retVal;
}
-
-/*
-* End of Source.
-*/
-
