[balsa/wip/gtk4: 71/351] Do not use g_list_next or g_list_first

[Peter Bloomfield <peterb src gnome org>]

commit 8be951f7e3d816deaf81a87bdf21ec345e626525
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sun Nov 19 18:47:29 2017 -0500

    Do not use g_list_next or g_list_first

 libbalsa/address-book-extern.c    |    2 +-
 libbalsa/address-book-rubrica.c   |    2 +-
 libbalsa/filter-file.c            |   14 +++++++-------
 libbalsa/filter.c                 |    4 ++--
 libbalsa/identity.c               |    4 ++--
 libbalsa/imap-server.c            |    4 ++--
 libbalsa/libbalsa-gpgme-cb.c      |    2 +-
 libbalsa/libbalsa-vfs.c           |    2 +-
 libbalsa/mailbox-filter.c         |    2 +-
 libbalsa/mailbox_imap.c           |    4 ++--
 libbalsa/mime.c                   |    4 ++--
 libbalsa/rfc3156.c                |    4 ++--
 src/ab-main.c                     |    4 ++--
 src/ab-window.c                   |    2 +-
 src/balsa-mblist.c                |    4 ++--
 src/balsa-message.c               |    4 ++--
 src/balsa-mime-widget-message.c   |    2 +-
 src/balsa-mime-widget-text.c      |    6 +++---
 src/balsa-mime-widget-vcalendar.c |    2 +-
 src/balsa-print-object-header.c   |    8 ++++----
 src/balsa-print-object-text.c     |   18 +++++++++---------
 src/filter-edit-callbacks.c       |   18 +++++++++---------
 src/filter-edit-dialog.c          |    4 ++--
 src/filter-export-dialog.c        |    4 ++--
 src/filter-run-dialog.c           |    2 +-
 src/mailbox-node.c                |    8 ++++----
 src/pref-manager.c                |    2 +-
 src/print-gtk.c                   |    2 +-
 src/sendmsg-window.c              |   12 ++++++------
 29 files changed, 75 insertions(+), 75 deletions(-)
---
diff --git a/libbalsa/address-book-extern.c b/libbalsa/address-book-extern.c
index 22e786c..51ffa8e 100644
--- a/libbalsa/address-book-extern.c
+++ b/libbalsa/address-book-extern.c
@@ -300,7 +300,7 @@ libbalsa_address_book_externq_add_address(LibBalsaAddressBook * ab,
     if(ex->save) {
         g_snprintf(command, sizeof(command), "%s \"%s\" \"%s\" \"%s\"", 
                    ex->save, 
-                   (gchar *)g_list_first(new_address->address_list)->data, 
+                   (gchar *) new_address->address_list->data, 
                    new_address->full_name, "TODO");
         
         if( (gc = popen(command, "r")) == NULL)
diff --git a/libbalsa/address-book-rubrica.c b/libbalsa/address-book-rubrica.c
index 56bea7b..dded807 100644
--- a/libbalsa/address-book-rubrica.c
+++ b/libbalsa/address-book-rubrica.c
@@ -531,7 +531,7 @@ lbab_insert_address_node(const LibBalsaAddress * address,
 
     /* create the Net section of the card */
     new_data = xmlNewChild(new_addr, NULL, CXMLCHARP("Net"), NULL);
-    for (l = address->address_list; l; l = g_list_next(l)) {
+    for (l = address->address_list; l != NULL; l = l->next) {
        xmlNodePtr new_mail =
            xmlNewChild(new_data, NULL, CXMLCHARP("Uri"),
                        CXMLCHARP(l->data));
diff --git a/libbalsa/filter-file.c b/libbalsa/filter-file.c
index 07951c3..d783301 100644
--- a/libbalsa/filter-file.c
+++ b/libbalsa/filter-file.c
@@ -140,15 +140,15 @@ libbalsa_mailbox_filters_load_config(LibBalsaMailbox* mbox)
        libbalsa_conf_get_vector_with_default(MAILBOX_FILTERS_WHEN_KEY,
                                              &nb_filters,&filters_names,&def);
        if (def)
-           for(lst=mbox->filters;lst;lst=g_slist_next(lst))
+           for(lst = mbox->filters; lst != NULL; lst = lst->next)
                FILTER_WHEN_SETFLAG((LibBalsaMailboxFilter*)lst->data,
                                    FILTER_WHEN_NEVER);
        else {
            lst=mbox->filters;
-           for (i=0;i<nb_filters && lst;i++) {
-               ((LibBalsaMailboxFilter*)lst->data)->when = 
+           for (i=0;i<nb_filters && lst != NULL;i++) {
+               ((LibBalsaMailboxFilter*)lst->data)->when =
                     atoi(filters_names[i]);
-               lst=g_slist_next(lst);
+               lst = lst->next;
            }
        }
        g_strfreev(filters_names);
@@ -170,7 +170,7 @@ libbalsa_mailbox_filters_save_config(LibBalsaMailbox * mbox)
      * Note : in all the following we never copy the filters name, so we don't have to (and me must not!) 
free any gchar *
      * That's why we only free g_slist and gchar **
      */
-    for(fil=mbox->filters;fil;fil=g_slist_next(fil)) {
+    for (fil = mbox->filters; fil != NULL; fil = fil->next) {
        names=g_slist_prepend(names,
                               ((LibBalsaMailboxFilter*)fil->data)->actual_filter->name);
        nb_filters++;
@@ -181,7 +181,7 @@ libbalsa_mailbox_filters_save_config(LibBalsaMailbox * mbox)
     lst=names;
     for(i=0; i<nb_filters; i++) {
        filters_names[i]=(gchar*)lst->data;
-       lst=g_slist_next(lst);
+       lst = lst->next;
     }
     g_slist_free(names);
     libbalsa_conf_set_vector(MAILBOX_FILTERS_KEY,nb_filters,
@@ -192,7 +192,7 @@ libbalsa_mailbox_filters_save_config(LibBalsaMailbox * mbox)
        filters_names[i]=
             g_strdup_printf("%d",
                             ((LibBalsaMailboxFilter*)fil->data)->when);
-       fil=g_slist_next(fil);
+       fil = fil->next;
     }
     libbalsa_conf_set_vector(MAILBOX_FILTERS_WHEN_KEY,nb_filters,
                             (const gchar**)filters_names);
diff --git a/libbalsa/filter.c b/libbalsa/filter.c
index 4d9e0b1..bf78ad9 100644
--- a/libbalsa/filter.c
+++ b/libbalsa/filter.c
@@ -225,7 +225,7 @@ filters_prepare_to_run(GSList * filters)
     LibBalsaFilter* fil;
     gboolean ok=TRUE;
 
-    for(;filters;filters=g_slist_next(filters)) {
+    for(; filters != NULL; filters = filters->next) {
        fil=(LibBalsaFilter*) filters->data;
        if (!FILTER_CHKFLAG(fil,FILTER_VALID)) {
                libbalsa_information(LIBBALSA_INFORMATION_ERROR,
@@ -348,7 +348,7 @@ libbalsa_filter_get_by_name(const gchar * fname)
     if (!fname || fname[0]=='\0') return NULL;
 
     fnamelen = strlen(fname);
-    for (list = *filter_list;list;list = g_slist_next(list)) {
+    for (list = *filter_list; list != NULL; list = list->next) {
        gint len = strlen(((LibBalsaFilter*)list->data)->name);
 
        if (strncmp(fname,((LibBalsaFilter*)list->data)->name,
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index 919d4fb..3d8d2ab 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -788,7 +788,7 @@ identity_list_update_real(GtkTreeView * tree,
 
     sorted = g_list_sort(g_list_copy(identities),
                          (GCompareFunc) compare_identities);
-    for (list = sorted; list; list = g_list_next(list)) {
+    for (list = sorted; list != NULL; list = list->next) {
         LibBalsaIdentity* ident = LIBBALSA_IDENTITY(list->data);
         gtk_list_store_append(store, &iter);
         gtk_list_store_set(store, &iter,
@@ -1479,7 +1479,7 @@ ident_dialog_update(GObject * dlg)
         return FALSE;
     }
 
-    for (list = *identities; list; list = g_list_next(list)) {
+    for (list = *identities; list != NULL; list = list->next) {
         exist_ident = list->data;
 
         if (g_ascii_strcasecmp(exist_ident->identity_name, text) == 0
diff --git a/libbalsa/imap-server.c b/libbalsa/imap-server.c
index 6a8ad02..a4a3063 100644
--- a/libbalsa/imap-server.c
+++ b/libbalsa/imap-server.c
@@ -637,7 +637,7 @@ libbalsa_imap_server_get_handle(LibBalsaImapServer *imap_server, GError **err)
         conn = g_list_find_custom(imap_server->free_handles, NULL,
                                   by_last_user);
         if (!conn)
-            conn = g_list_first(imap_server->free_handles);
+            conn = imap_server->free_handles;
         info = (struct handle_info*)conn->data;
         imap_server->free_handles =
             g_list_delete_link(imap_server->free_handles, conn);
@@ -743,7 +743,7 @@ libbalsa_imap_server_get_handle_with_user(LibBalsaImapServer *imap_server,
     /* reuse a free connection */
     if (!info && imap_server->free_handles) {
         GList *conn;
-        conn = g_list_first(imap_server->free_handles);
+        conn = imap_server->free_handles;
         info = (struct handle_info*)conn->data;
         imap_server->free_handles =
             g_list_delete_link(imap_server->free_handles, conn);
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index 5632203..9e1a3c0 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -272,7 +272,7 @@ lb_gpgme_select_key(const gchar * user_name, lb_key_sel_md_t mode, GList * keys,
                                GPG_KEY_PTR_COLUMN, key, -1);
                g_free(uid_info);
        }
-       keys = g_list_next(keys);
+       keys = keys->next;
     }
 
     g_object_unref(G_OBJECT(model));
diff --git a/libbalsa/libbalsa-vfs.c b/libbalsa/libbalsa-vfs.c
index 1c3a7a4..66adb0c 100644
--- a/libbalsa/libbalsa-vfs.c
+++ b/libbalsa/libbalsa-vfs.c
@@ -700,7 +700,7 @@ libbalsa_vfs_fill_menu_by_content_type(GtkMenu * menu,
         gio_add_vfs_menu_item(menu, def_app, callback, data);
 
     app_list = g_app_info_get_all_for_type(content_type);
-    for (list = app_list; list; list = g_list_next(list)) {
+    for (list = app_list; list != NULL; list = list->next) {
         GAppInfo *app = G_APP_INFO(list->data);
 
         if (app && g_app_info_should_show(app) &&
diff --git a/libbalsa/mailbox-filter.c b/libbalsa/mailbox-filter.c
index 6d3551e..6647021 100644
--- a/libbalsa/mailbox-filter.c
+++ b/libbalsa/mailbox-filter.c
@@ -45,7 +45,7 @@ GSList*
 libbalsa_mailbox_filters_when(GSList * filters, gint when)
 {
     GSList * lst = NULL;
-    for (; filters; filters = g_slist_next(filters))
+    for (; filters != NULL; filters = filters->next)
        if (FILTER_WHEN_CHKFLAG((LibBalsaMailboxFilter*)filters->data,when))
            lst = g_slist_prepend(lst,((LibBalsaMailboxFilter*)filters->data)->actual_filter);
     lst = g_slist_reverse(lst);
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index aab9c43..f2b2736 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -424,7 +424,7 @@ libbalsa_imap_get_acls(LibBalsaMailboxImap * mailbox)
         return NULL;
     acls = g_new0(char *, 2 * g_list_length(mailbox->acls) + 1);
     n = 0;
-    for (p = g_list_first(mailbox->acls); p; p = g_list_next(p), n += 2) {
+    for (p = mailbox->acls; p != NULL; p = p->next, n += 2) {
         acls[n] = g_strdup(((ImapUserAclType *)p->data)->uid);
         acls[n + 1] = imap_acl_to_str(((ImapUserAclType *)p->data)->acl);
     }
@@ -2945,7 +2945,7 @@ append_to_cache(unsigned uid, void *arg)
                                  uid, "body");
     gchar *msg = atcd->curr_name->data;
 
-    atcd->curr_name = g_list_next(atcd->curr_name);
+    atcd->curr_name = atcd->curr_name->next;
 
     g_return_if_fail(msg);
 
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index 3704939..b090933 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -415,8 +415,8 @@ dowrap_rfc2646(GList * list, gint width, gboolean to_screen,
 
         g_free(text->str);
         g_free(text);
-        list = g_list_next(list);
-        if (list)               /* paragraph separator */
+        list = list->next;
+        if (list != NULL)       /* paragraph separator */
             g_string_append_c(result, '\n');
     }                           /* end of paragraph */
 }
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index f3b5fe8..8f901b3 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -246,7 +246,7 @@ libbalsa_encrypt_mime_object(GMimeObject ** content, GList * rfc822_for,
     recipients = g_ptr_array_new();
     while (rfc822_for) {
        g_ptr_array_add(recipients, rfc822_for->data);
-       rfc822_for = g_list_next(rfc822_for);
+       rfc822_for = rfc822_for->next;
     }
 
     /* encrypt: multipart/encrypted for RFC 3156, application/pkcs7-mime for
@@ -487,7 +487,7 @@ libbalsa_rfc2440_sign_encrypt(GMimePart *part, const gchar *sign_for,
        recipients = g_ptr_array_new();
        while (encrypt_for) {
            g_ptr_array_add(recipients, encrypt_for->data);
-           encrypt_for = g_list_next(encrypt_for);
+           encrypt_for = encrypt_for->next;
        }
     } else
        recipients = NULL;
diff --git a/src/ab-main.c b/src/ab-main.c
index b1a2163..688c7bd 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -444,8 +444,8 @@ file_delete_activated(GSimpleAction * action,
     LibBalsaAddressBook *address_book;
     GList *list;
 
-    if (!(address_book = contacts_app.address_book)
-        || !g_list_next(contacts_app.address_book_list))
+    if ((address_book = contacts_app.address_book) == NULL
+        || contacts_app.address_book_list->next == NULL)
         return;
 
     if (address_book->config_prefix) {
diff --git a/src/ab-window.c b/src/ab-window.c
index 9ae4cbd..5a7afaa 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -789,7 +789,7 @@ balsa_ab_window_load_cb(LibBalsaAddressBook *libbalsa_ab,
                                LIST_COLUMN_WHICH, count,
                                -1);
 
-           address_list = g_list_next(address_list);
+           address_list = address_list->next;
            count++;
        }
     }
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index ba9ce07..7219d99 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -1653,7 +1653,7 @@ bmbl_mru_menu(GtkWindow * window, GList ** url_list,
     GList *list;
     BalsaMBListMRUEntry *mru;
 
-    for (list = *url_list; list; list = g_list_next(list)) {
+    for (list = *url_list; list != NULL; list = list->next) {
         gchar *url = list->data;
         LibBalsaMailbox *mailbox = balsa_find_mailbox_by_url(url);
 
@@ -1933,7 +1933,7 @@ balsa_mblist_mru_drop(GList ** list, const gchar * url)
 {
     GList *tmp;
 
-    for (tmp = *list; tmp; tmp = g_list_next(tmp)) {
+    for (tmp = *list; tmp != NULL; tmp = tmp->next) {
         if (!strcmp((char *) tmp->data, url)) {
             g_free(tmp->data);
             *list = g_list_delete_link(*list, tmp);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 8ecbc73..31ec347 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1687,7 +1687,7 @@ part_context_save_all_cb(GtkWidget * menu_item, GList * info_list)
     while (info_list) {
        balsa_mime_widget_ctx_menu_save(menu_item,
                                         BALSA_PART_INFO(info_list->data)->body);
-        info_list = g_list_next(info_list);
+        info_list = info_list->next;
     }
 }
 
@@ -1795,7 +1795,7 @@ part_context_dump_all_cb(GtkWidget * menu_item, GList * info_list)
                                   err->message : "Unknown error");
             g_clear_error(&err);
            g_object_unref(save_uri);
-           info_list = g_list_next(info_list);
+           info_list = info_list->next;
        }
        g_object_unref(dir_uri);
     }
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 5e85f9d..dcc50c9 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -757,7 +757,7 @@ bmw_message_set_headers_d(BalsaMessage           * bm,
     }
 
     /* remaining headers */
-    for (p = g_list_first(headers->user_hdrs); p; p = g_list_next(p)) {
+    for (p = headers->user_hdrs; p != NULL; p = p->next) {
        gchar **pair = p->data;
        gchar *hdr;
 
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 6816e35..cc03390 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -661,7 +661,7 @@ prepare_url_offsets(GtkTextBuffer * buffer, GList * url_list)
     GtkTextTagTable *table = gtk_text_buffer_get_tag_table(buffer);
     GtkTextTag *url_tag = gtk_text_tag_table_lookup(table, "url");
 
-    for (; url_list; url_list = g_list_next(url_list)) {
+    for (; url_list != NULL; url_list = url_list->next) {
         message_url_t *url = url_list->data;
         GtkTextIter iter;
 
@@ -739,7 +739,7 @@ find_url(GtkWidget * widget, gint x, gint y, GList * url_list)
     gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(widget), &iter, x, y);
     offset = gtk_text_iter_get_offset(&iter);
 
-    for (; url_list; url_list = g_list_next(url_list)) {
+    for (; url_list != NULL; url_list = url_list->next) {
         url = (message_url_t *) url_list->data;
         if (url->start <= offset && offset < url->end)
             return url;
@@ -803,7 +803,7 @@ free_url_list(GList * url_list)
 {
     GList *list;
 
-    for (list = url_list; list; list = g_list_next(list)) {
+    for (list = url_list; list != NULL; list = list->next) {
         message_url_t *url_data = (message_url_t *) list->data;
 
         g_free(url_data->url);
diff --git a/src/balsa-mime-widget-vcalendar.c b/src/balsa-mime-widget-vcalendar.c
index 4438fe0..c38ed54 100644
--- a/src/balsa-mime-widget-vcalendar.c
+++ b/src/balsa-mime-widget-vcalendar.c
@@ -88,7 +88,7 @@ balsa_mime_widget_new_vcalendar(BalsaMessage * bm,
     }
 
     /* add events */
-    for (l = vcal_obj->vevent; l; l = g_list_next(l)) {
+    for (l = vcal_obj->vevent; l != NULL; l = l->next) {
        GtkWidget *event =
            balsa_vevent_widget((LibBalsaVEvent *) l->data, may_reply,
                                sender);
diff --git a/src/balsa-print-object-header.c b/src/balsa-print-object-header.c
index 871fc61..8003e9e 100644
--- a/src/balsa-print-object-header.c
+++ b/src/balsa-print-object-header.c
@@ -182,7 +182,7 @@ balsa_print_object_header_new_real(GList * list,
                    headers->dispnotify_to, &p_label_width, print_all_headers);
 
     /* user headers */
-    p = g_list_first(headers->user_hdrs);
+    p = headers->user_hdrs;
     face = NULL;
     while (p) {
        gchar **pair, *curr_hdr;
@@ -215,7 +215,7 @@ balsa_print_object_header_new_real(GList * list,
        }
 
        /* next */
-       p = g_list_next(p);
+       p = p->next;
     }
 
     /* add a small space between label and value */
@@ -314,7 +314,7 @@ balsa_print_object_header_new_real(GList * list,
        }
        list = g_list_append(list, po);
 
-       this_chunk = g_list_next(this_chunk);
+       this_chunk = this_chunk->next;
     }
     g_list_free(chunks);
     g_object_unref(G_OBJECT(test_layout));
@@ -429,7 +429,7 @@ balsa_print_object_header_crypto(GList *list, GtkPrintContext * context,
        po->p_layout_width = C_TO_P(c_use_width);
        list = g_list_append(list, po);
 
-       this_chunk = g_list_next(this_chunk);
+       this_chunk = this_chunk->next;
     }
     g_list_free(chunks);
 
diff --git a/src/balsa-print-object-text.c b/src/balsa-print-object-text.c
index 40f0501..6d310c1 100644
--- a/src/balsa-print-object-text.c
+++ b/src/balsa-print-object-text.c
@@ -306,7 +306,7 @@ balsa_print_object_text_plain(GList *list, GtkPrintContext * context,
 
            list = g_list_append(list, pot);
            g_array_remove_index(attr_offs, 0);
-           this_par_part = g_list_next(this_par_part);
+           this_par_part = this_par_part->next;
        }
        if (attr_list) {
            g_list_foreach(attr_list, (GFunc) g_free, NULL);
@@ -400,7 +400,7 @@ balsa_print_object_text(GList *list, GtkPrintContext * context,
        pot->attributes = NULL;
 
        list = g_list_append(list, pot);
-       this_par_part = g_list_next(this_par_part);
+       this_par_part = this_par_part->next;
     }
     g_list_free(par_parts);
 
@@ -638,7 +638,7 @@ balsa_print_object_text_calendar(GList * list,
     /* add fields from the events*/
     desc_buf = g_string_new("");
     pod->p_label_width = 0;
-    for (this_ev = vcal_obj->vevent; this_ev; this_ev = g_list_next(this_ev)) {
+    for (this_ev = vcal_obj->vevent; this_ev != NULL; this_ev = this_ev->next) {
         LibBalsaVEvent * event = (LibBalsaVEvent *) this_ev->data;
 
         if (desc_buf->len > 0)
@@ -659,11 +659,11 @@ balsa_print_object_text_calendar(GList * list,
 
             this_att =
                 libbalsa_vcal_attendee_to_str(LIBBALSA_ADDRESS(att->data));
-            att = g_list_next(att);
+            att = att->next;
             ADD_VCAL_FIELD(desc_buf, pod->p_label_width, test_layout,
                            this_att, att ? _("Attendees") : _("Attendee"));
             g_free(this_att);
-            for (; att; att = g_list_next(att)) {
+            for (; att != NULL; att = att->next) {
                 this_att =
                     libbalsa_vcal_attendee_to_str(LIBBALSA_ADDRESS(att->data));
                 g_string_append_printf(desc_buf, "\n\t%s", this_att);
@@ -716,8 +716,8 @@ balsa_print_object_text_calendar(GList * list,
     list = g_list_append(list, pod);
 
     /* add more parts */
-    for (this_par_part = g_list_next(par_parts); this_par_part;
-         this_par_part = g_list_next(this_par_part)) {
+    for (this_par_part = par_parts->next; this_par_part != NULL;
+         this_par_part = this_par_part->next) {
         BalsaPrintObjectDefault * new_pod;
         BalsaPrintObject *new_po;
         
@@ -899,7 +899,7 @@ phrase_list_to_pango(GList * phrase_list)
        new_attr->end_index = region->end_index;
        pango_attr_list_insert(attr_list, new_attr);
 
-       phrase_list = g_list_next(phrase_list);
+       phrase_list = phrase_list->next;
     }
 
     for (n = 0; n < PHRASE_TYPE_COUNT; n++)
@@ -934,7 +934,7 @@ collect_attrs(GList * all_attr, guint offset, guint len)
                this_reg->end_index -= offset;
            attr = g_list_prepend(attr, this_reg);
        }
-       all_attr = g_list_next(all_attr);
+       all_attr = all_attr->next;
     }
 
     return attr;
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index ef1fd26..8ce273c 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -441,7 +441,7 @@ fe_add_new_user_header(const gchar * str)
 {
     GList *lst;
 
-    for (lst = fe_user_headers_list; lst; lst = g_list_next(lst))
+    for (lst = fe_user_headers_list; lst != NULL; lst = lst->next)
         if (g_ascii_strcasecmp(str, (gchar *) lst->data) == 0)
             return;
 
@@ -1363,7 +1363,7 @@ update_filters_mailbox(GtkTreeModel * model, GtkTreePath * path,
                     lst &&
                     strcmp(((filters_names_rec *) lst->data)->old_name,
                            filters_names[i]) != 0;
-                    lst = g_list_next(lst));
+                    lst = lst->next);
 
                if (lst) {
                    g_free(filters_names[i]);
@@ -1422,7 +1422,7 @@ void fe_destroy_window_cb(GtkWidget * widget,gpointer throwaway)
     else
         fe_free_associated_filters();
 
-    for (lst=filters_names_changes;lst;lst=g_list_next(lst)) {
+    for (lst = filters_names_changes; lst != NULL; lst = lst->next) {
         g_free(((filters_names_rec *)lst->data)->old_name);
         g_free(((filters_names_rec *)lst->data)->new_name);
         g_free((filters_names_rec *)lst->data);
@@ -1431,7 +1431,7 @@ void fe_destroy_window_cb(GtkWidget * widget,gpointer throwaway)
     g_list_free(filters_names_changes);
     filters_names_changes=NULL;
 
-    for (lst=new_filters_names;lst;lst=g_list_next(lst)) {
+    for (lst = new_filters_names; lst != NULL; lst = lst->next) {
         g_free((gchar *)lst->data);
     }
 
@@ -1552,7 +1552,7 @@ fe_button_toggled(GtkWidget * widget, gpointer data)
     if (GTK_IS_CONTAINER(data)) {
         GList *list;
         for (list = gtk_container_get_children(GTK_CONTAINER(data));
-             list; list = g_list_next(list)) 
+             list != NULL; list = list->next)
             gtk_widget_set_sensitive(GTK_WIDGET(list->data), active);
     } else
         gtk_widget_set_sensitive(GTK_WIDGET(data), active);
@@ -1647,9 +1647,9 @@ change_filter_name(gchar * old_name,gchar * new_name)
          * reference to it in any mailbox, because it's new
          */
 
-        for (lst=new_filters_names;
-             lst && strcmp(old_name,(gchar*)lst->data)!=0;
-             lst=g_list_next(lst));
+        for (lst = new_filters_names;
+             lst != NULL && strcmp(old_name,(gchar*)lst->data) != 0;
+             lst = lst->next);
         if (lst) {          
             /* Found it ! Update new_filters_names */
             g_free(lst->data);
@@ -1664,7 +1664,7 @@ change_filter_name(gchar * old_name,gchar * new_name)
           if yes we must change it to : any name -> new_name
           else we create a new record
        */
-       for (lst=filters_names_changes;lst;lst=g_list_next(lst))
+       for (lst = filters_names_changes; lst != NULL; lst = lst->next)
             if (((filters_names_rec *)lst->data)->new_name && 
                 strcmp(((filters_names_rec *)lst->data)->new_name,old_name)==0) {
                 p=(filters_names_rec *)lst->data;
diff --git a/src/filter-edit-dialog.c b/src/filter-edit-dialog.c
index f8540f1..68a4045 100644
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@ -606,8 +606,8 @@ filters_edit_dialog(GtkWindow * parent)
 
     /* Populate the list of filters */
     model = gtk_tree_view_get_model(fe_filters_list);
-    for(filter_list=balsa_app.filters;
-        filter_list; filter_list=g_slist_next(filter_list)) {
+    for(filter_list = balsa_app.filters;
+        filter_list != NULL; filter_list = filter_list->next) {
 
        fil=(LibBalsaFilter*)filter_list->data;
        /* Make a copy of the current filter */
diff --git a/src/filter-export-dialog.c b/src/filter-export-dialog.c
index 68191bd..d8eb270 100644
--- a/src/filter-export-dialog.c
+++ b/src/filter-export-dialog.c
@@ -98,8 +98,8 @@ filters_export_dialog(GtkWindow * parent)
     /* Populate the list of filters */
 
     model = gtk_tree_view_get_model(list);
-    for (filter_list = balsa_app.filters; filter_list;
-         filter_list = g_slist_next(filter_list)) {
+    for (filter_list = balsa_app.filters; filter_list != NULL;
+         filter_list = filter_list->next) {
         fil = (LibBalsaFilter *) filter_list->data;
         gtk_list_store_prepend(GTK_LIST_STORE(model), &iter);
         gtk_list_store_set(GTK_LIST_STORE(model), &iter, 0, fil->name, 1,
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index ba99dd4..47013b5 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -491,7 +491,7 @@ filters_run_dialog(LibBalsaMailbox * mbox,
        return;
     }
     /* We look for an existing dialog box for this mailbox */
-    for (lst = fr_dialogs_opened; lst; lst = g_list_next(lst)) {
+    for (lst = fr_dialogs_opened; lst != NULL; lst = lst->next) {
         BalsaFilterRunDialog *dialog = lst->data;
         if (strcmp(dialog->mbox->url, mbox->url) == 0)
             break;
diff --git a/src/mailbox-node.c b/src/mailbox-node.c
index 5a04d8f..e5af7b4 100644
--- a/src/mailbox-node.c
+++ b/src/mailbox-node.c
@@ -530,7 +530,7 @@ imap_dir_cb(BalsaMailboxNode* mb)
     /* phase b. */
 
     imap_tree.list = g_slist_reverse(imap_tree.list);
-    for (list = imap_tree.list; list; list = g_slist_next(list)) {
+    for (list = imap_tree.list; list != NULL; list = list->next) {
         imap_scan_item *item = list->data;
        
        n = imap_scan_create_mbnode(mb, item, imap_tree.delim);
@@ -872,9 +872,9 @@ bmbn_scan_children_idle(BalsaMailboxNode ** mbnode)
     }
 
     list = g_object_get_data(G_OBJECT(*mbnode), BALSA_MAILBOX_NODE_LIST_KEY);
-    for (l = list; l; l = g_slist_next(l)) {
+    for (l = list; l != NULL; l = l->next) {
         BalsaMailboxNode *mn;
-        
+
         if (!l->data)
             continue;
         mn = l->data;
@@ -1381,7 +1381,7 @@ imap_scan_destroy_tree(imap_scan_tree * tree)
 {
     GSList *list;
 
-    for (list = tree->list; list; list = g_slist_next(list)) {
+    for (list = tree->list; list != NULL; list = list->next) {
         imap_scan_item *item = list->data;
 
         g_free(item->fn);
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 81d9287..dcf48d6 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -947,7 +947,7 @@ update_address_books(void)
                            AB_DATA_COLUMN, address_book, -1);
 
         g_free(name);
-        list = g_list_next(list);
+        list = list->next;
     }
 
     if (gtk_tree_model_get_iter_first(model, &iter))
diff --git a/src/print-gtk.c b/src/print-gtk.c
index 317be86..a5f4df9 100644
--- a/src/print-gtk.c
+++ b/src/print-gtk.c
@@ -372,7 +372,7 @@ draw_page(GtkPrintOperation * operation, GtkPrintContext * context,
        if (po->on_page == page_nr)
            balsa_print_object_draw(po, context, cairo_ctx);
 
-       p = g_list_next(p);
+       p = p->next;
     }
 }
 
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index b37093f..5c457e8 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -2068,7 +2068,7 @@ insert_selected_messages(BalsaSendmsg *bsmsg, QuoteType type)
     if (index && (l = balsa_index_selected_list(BALSA_INDEX(index)))) {
        GList *node;
 
-       for (node = l; node; node = g_list_next(node)) {
+       for (node = l; node != NULL; node = node->next) {
            LibBalsaMessage *message = node->data;
             GString *body = quote_message_body(bsmsg, message, type);
             gtk_text_buffer_insert_at_cursor(buffer, body->str, body->len);
@@ -2102,7 +2102,7 @@ sw_attach_messages_activated(GSimpleAction * action,
     if (index) {
        GList *node, *l = balsa_index_selected_list(BALSA_INDEX(index));
 
-       for (node = l; node; node = g_list_next(node)) {
+       for (node = l; node != NULL; node = node->next) {
            LibBalsaMessage *message = node->data;
 
            if(!attach_message(bsmsg, message)) {
@@ -2803,7 +2803,7 @@ drag_data_quote(GtkWidget        * widget,
         GSList *uri_list =
             uri2gslist((gchar *)
                        gtk_selection_data_get_data(selection_data));
-        for (; uri_list; uri_list = g_slist_next(uri_list)) {
+        for (; uri_list != NULL; uri_list = uri_list->next) {
             /* Since current GtkTextView gets this signal twice for
              * every action (#150141) we need to check for duplicates,
              * which is a good idea anyway. */
@@ -3547,8 +3547,8 @@ quote_body(BalsaSendmsg * bsmsg, LibBalsaMessageHeaders *headers,
 
            g_string_append(body, _("References:"));
 
-           for (ref_list = references; ref_list;
-                 ref_list = g_list_next(ref_list))
+           for (ref_list = references; ref_list != NULL;
+                 ref_list = ref_list->next)
                g_string_append_printf(body, " <%s>",
                                       (gchar *) ref_list->data);
 
@@ -3902,7 +3902,7 @@ set_identity_from_mailbox(BalsaSendmsg* bsmsg, LibBalsaMessage * message)
         if(!identity) return FALSE;
         for (ilist = balsa_app.identities;
              ilist != NULL;
-             ilist = g_list_next(ilist)) {
+             ilist = ilist->next) {
             ident = LIBBALSA_IDENTITY(ilist->data);
             if (!g_ascii_strcasecmp(identity, ident->identity_name)) {
                 bsmsg->ident = ident;