GNOME.org
 

[balsa/wip/gtk4] mailbox-pop3 and elsewhere: Correct the name

commit 4fa927de076c5dcedb4dc314b89597ced2a752dc
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Tue Jun 26 19:17:09 2018 -0400

    mailbox-pop3 and elsewhere: Correct the name
    
    For backward compatibility with the config file, the type name must be
    LibBalsaMailboxPOP3, not LibBalsaMailboxPop3.

 libbalsa/mailbox_pop3.c             | 52 ++++++++++++++++++-------------------
 libbalsa/mailbox_pop3.h             | 30 ++++++++++-----------
 libinit_balsa/assistant_page_user.c |  2 +-
 src/mailbox-conf.c                  |  4 +--
 src/main-window.c                   |  2 +-
 src/main.c                          |  4 +++
 6 files changed, 49 insertions(+), 45 deletions(-)
---
diff --git a/libbalsa/mailbox_pop3.c b/libbalsa/mailbox_pop3.c
index 28dd11090..159b47d18 100644
--- a/libbalsa/mailbox_pop3.c
+++ b/libbalsa/mailbox_pop3.c
@@ -41,7 +41,7 @@ enum {
     LAST_SIGNAL
 };
 
-struct _LibBalsaMailboxPop3 {
+struct _LibBalsaMailboxPOP3 {
     LibBalsaMailboxRemote mailbox;
 
     gboolean check;
@@ -68,12 +68,12 @@ static void     libbalsa_mailbox_pop3_finalize(GObject *object);
 
 #define MBOX_POP3_ERROR         (g_quark_from_static_string("mailbox-pop3"))
 
-G_DEFINE_TYPE(LibBalsaMailboxPop3,
+G_DEFINE_TYPE(LibBalsaMailboxPOP3,
               libbalsa_mailbox_pop3,
               LIBBALSA_TYPE_MAILBOX_REMOTE)
 
 static void
-libbalsa_mailbox_pop3_class_init(LibBalsaMailboxPop3Class *klass)
+libbalsa_mailbox_pop3_class_init(LibBalsaMailboxPOP3Class *klass)
 {
     GObjectClass *object_class;
     LibBalsaMailboxClass *libbalsa_mailbox_class;
@@ -95,7 +95,7 @@ libbalsa_mailbox_pop3_class_init(LibBalsaMailboxPop3Class *klass)
 
 
 static void
-libbalsa_mailbox_pop3_init(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_init(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     LibBalsaMailboxRemote *remote;
     mailbox_pop3->check              = FALSE;
@@ -113,7 +113,7 @@ libbalsa_mailbox_pop3_init(LibBalsaMailboxPop3 *mailbox_pop3)
 static void
 libbalsa_mailbox_pop3_finalize(GObject *object)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3 = (LibBalsaMailboxPop3 *) object;
+    LibBalsaMailboxPOP3 *mailbox_pop3 = (LibBalsaMailboxPOP3 *) object;
 
     g_free(mailbox_pop3->filter_cmd);
 
@@ -121,10 +121,10 @@ libbalsa_mailbox_pop3_finalize(GObject *object)
 }
 
 
-LibBalsaMailboxPop3 *
+LibBalsaMailboxPOP3 *
 libbalsa_mailbox_pop3_new(void)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3;
+    LibBalsaMailboxPOP3 *mailbox_pop3;
 
     mailbox_pop3 = g_object_new(LIBBALSA_TYPE_MAILBOX_POP3, NULL);
 
@@ -484,7 +484,7 @@ message_cb(const gchar                   *buffer,
 
 static NetClientPop *
 libbalsa_mailbox_pop3_startup(LibBalsaServer      *server,
-                              LibBalsaMailboxPop3 *mailbox_pop3,
+                              LibBalsaMailboxPOP3 *mailbox_pop3,
                               const gchar         *name,
                               GList              **msg_list)
 {
@@ -583,7 +583,7 @@ libbalsa_mailbox_pop3_startup(LibBalsaServer      *server,
 
 static GList *
 update_msg_list(struct fetch_data         *fd,
-                const LibBalsaMailboxPop3 *mailbox_pop3,
+                const LibBalsaMailboxPOP3 *mailbox_pop3,
                 GHashTable               **current_uids,
                 LibBalsaServer            *server,
                 GList                     *msg_list)
@@ -671,7 +671,7 @@ update_msg_list(struct fetch_data         *fd,
 static void
 libbalsa_mailbox_pop3_check(LibBalsaMailbox *mailbox)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3 = LIBBALSA_MAILBOX_POP3(mailbox);
+    LibBalsaMailboxPOP3 *mailbox_pop3 = LIBBALSA_MAILBOX_POP3(mailbox);
     LibBalsaServer *server;
     NetClientPop *pop;
     GList *msg_list;
@@ -774,7 +774,7 @@ static void
 libbalsa_mailbox_pop3_save_config(LibBalsaMailbox *mailbox,
                                   const gchar     *prefix)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3;
+    LibBalsaMailboxPOP3 *mailbox_pop3;
 
     g_return_if_fail(LIBBALSA_IS_MAILBOX_POP3(mailbox));
 
@@ -803,7 +803,7 @@ static void
 libbalsa_mailbox_pop3_load_config(LibBalsaMailbox *mailbox,
                                   const gchar     *prefix)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3;
+    LibBalsaMailboxPOP3 *mailbox_pop3;
 
     g_return_if_fail(LIBBALSA_IS_MAILBOX_POP3(mailbox));
 
@@ -834,7 +834,7 @@ void
 libbalsa_mailbox_pop3_set_inbox(LibBalsaMailbox *mailbox,
                                 LibBalsaMailbox *inbox)
 {
-    LibBalsaMailboxPop3 *mailbox_pop3;
+    LibBalsaMailboxPOP3 *mailbox_pop3;
 
     g_return_if_fail(LIBBALSA_IS_MAILBOX_POP3(mailbox));
 
@@ -849,42 +849,42 @@ libbalsa_mailbox_pop3_set_inbox(LibBalsaMailbox *mailbox,
  */
 
 gboolean
-libbalsa_mailbox_pop3_get_delete_from_server(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_delete_from_server(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->delete_from_server;
 }
 
 
 gboolean
-libbalsa_mailbox_pop3_get_check(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_check(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->check;
 }
 
 
 gboolean
-libbalsa_mailbox_pop3_get_filter(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_filter(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->filter;
 }
 
 
 const gchar *
-libbalsa_mailbox_pop3_get_filter_cmd(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_filter_cmd(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->filter_cmd;
 }
 
 
 gboolean
-libbalsa_mailbox_pop3_get_disable_apop(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_disable_apop(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->disable_apop;
 }
 
 
 gboolean
-libbalsa_mailbox_pop3_get_enable_pipe(LibBalsaMailboxPop3 *mailbox_pop3)
+libbalsa_mailbox_pop3_get_enable_pipe(LibBalsaMailboxPOP3 *mailbox_pop3)
 {
     return mailbox_pop3->enable_pipe;
 }
@@ -895,7 +895,7 @@ libbalsa_mailbox_pop3_get_enable_pipe(LibBalsaMailboxPop3 *mailbox_pop3)
  */
 
 void
-libbalsa_mailbox_pop3_set_msg_size_limit(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_msg_size_limit(LibBalsaMailboxPOP3 *mailbox_pop3,
                                          gint                 sz_limit)
 {
     mailbox_pop3->msg_size_limit = sz_limit;
@@ -903,7 +903,7 @@ libbalsa_mailbox_pop3_set_msg_size_limit(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_check(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_check(LibBalsaMailboxPOP3 *mailbox_pop3,
                                 gboolean             check)
 {
     mailbox_pop3->check = check;
@@ -911,7 +911,7 @@ libbalsa_mailbox_pop3_set_check(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_disable_apop(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_disable_apop(LibBalsaMailboxPOP3 *mailbox_pop3,
                                        gboolean             disable_apop)
 {
     mailbox_pop3->disable_apop = disable_apop;
@@ -919,7 +919,7 @@ libbalsa_mailbox_pop3_set_disable_apop(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_delete_from_server(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_delete_from_server(LibBalsaMailboxPOP3 *mailbox_pop3,
                                              gboolean             delete_from_server)
 {
     mailbox_pop3->delete_from_server = delete_from_server;
@@ -927,7 +927,7 @@ libbalsa_mailbox_pop3_set_delete_from_server(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_filter(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_filter(LibBalsaMailboxPOP3 *mailbox_pop3,
                                  gboolean             filter)
 {
     mailbox_pop3->filter = filter;
@@ -935,7 +935,7 @@ libbalsa_mailbox_pop3_set_filter(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_filter_cmd(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_filter_cmd(LibBalsaMailboxPOP3 *mailbox_pop3,
                                      const gchar         *filter_cmd)
 {
     g_free(mailbox_pop3->filter_cmd);
@@ -944,7 +944,7 @@ libbalsa_mailbox_pop3_set_filter_cmd(LibBalsaMailboxPop3 *mailbox_pop3,
 
 
 void
-libbalsa_mailbox_pop3_set_enable_pipe(LibBalsaMailboxPop3 *mailbox_pop3,
+libbalsa_mailbox_pop3_set_enable_pipe(LibBalsaMailboxPOP3 *mailbox_pop3,
                                       gboolean             enable_pipe)
 {
     mailbox_pop3->enable_pipe = enable_pipe;
diff --git a/libbalsa/mailbox_pop3.h b/libbalsa/mailbox_pop3.h
index 32d08230e..2b3cef83d 100644
--- a/libbalsa/mailbox_pop3.h
+++ b/libbalsa/mailbox_pop3.h
@@ -23,42 +23,42 @@
 
 #define LIBBALSA_TYPE_MAILBOX_POP3 libbalsa_mailbox_pop3_get_type()
 
-G_DECLARE_FINAL_TYPE(LibBalsaMailboxPop3,
+G_DECLARE_FINAL_TYPE(LibBalsaMailboxPOP3,
                      libbalsa_mailbox_pop3,
                      LIBBALSA,
                      MAILBOX_POP3,
                      LibBalsaMailboxRemote);
 
-LibBalsaMailboxPop3 *libbalsa_mailbox_pop3_new(void);
+LibBalsaMailboxPOP3 *libbalsa_mailbox_pop3_new(void);
 void                 libbalsa_mailbox_pop3_set_inbox(LibBalsaMailbox *mailbox,
                                                      LibBalsaMailbox *inbox);
 
 /*
  * Getters
  */
-gboolean     libbalsa_mailbox_pop3_get_delete_from_server(LibBalsaMailboxPop3 *mailbox_pop3);
-gboolean     libbalsa_mailbox_pop3_get_check(LibBalsaMailboxPop3 *mailbox_pop3);
-gboolean     libbalsa_mailbox_pop3_get_filter(LibBalsaMailboxPop3 *mailbox_pop3);
-const gchar *libbalsa_mailbox_pop3_get_filter_cmd(LibBalsaMailboxPop3 *mailbox_pop3);
-gboolean     libbalsa_mailbox_pop3_get_disable_apop(LibBalsaMailboxPop3 *mailbox_pop3);
-gboolean     libbalsa_mailbox_pop3_get_enable_pipe(LibBalsaMailboxPop3 *mailbox_pop3);
+gboolean     libbalsa_mailbox_pop3_get_delete_from_server(LibBalsaMailboxPOP3 *mailbox_pop3);
+gboolean     libbalsa_mailbox_pop3_get_check(LibBalsaMailboxPOP3 *mailbox_pop3);
+gboolean     libbalsa_mailbox_pop3_get_filter(LibBalsaMailboxPOP3 *mailbox_pop3);
+const gchar *libbalsa_mailbox_pop3_get_filter_cmd(LibBalsaMailboxPOP3 *mailbox_pop3);
+gboolean     libbalsa_mailbox_pop3_get_disable_apop(LibBalsaMailboxPOP3 *mailbox_pop3);
+gboolean     libbalsa_mailbox_pop3_get_enable_pipe(LibBalsaMailboxPOP3 *mailbox_pop3);
 
 /*
  * Setters
  */
-void libbalsa_mailbox_pop3_set_msg_size_limit(LibBalsaMailboxPop3 *mailbox,
+void libbalsa_mailbox_pop3_set_msg_size_limit(LibBalsaMailboxPOP3 *mailbox,
                                               gint                 sz_limit);
-void libbalsa_mailbox_pop3_set_check(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_check(LibBalsaMailboxPOP3 *mailbox_pop3,
                                      gboolean             check);
-void libbalsa_mailbox_pop3_set_disable_apop(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_disable_apop(LibBalsaMailboxPOP3 *mailbox_pop3,
                                             gboolean             disable_apop);
-void libbalsa_mailbox_pop3_set_delete_from_server(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_delete_from_server(LibBalsaMailboxPOP3 *mailbox_pop3,
                                                   gboolean             delete_from_server);
-void libbalsa_mailbox_pop3_set_filter(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_filter(LibBalsaMailboxPOP3 *mailbox_pop3,
                                       gboolean             filter);
-void libbalsa_mailbox_pop3_set_filter_cmd(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_filter_cmd(LibBalsaMailboxPOP3 *mailbox_pop3,
                                           const gchar         *filter_cmd);
-void libbalsa_mailbox_pop3_set_enable_pipe(LibBalsaMailboxPop3 *mailbox_pop3,
+void libbalsa_mailbox_pop3_set_enable_pipe(LibBalsaMailboxPOP3 *mailbox_pop3,
                                            gboolean             enable_pipe);
 
 #endif                          /* __LIBBALSA_MAILBOX_POP3_H__ */
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 3ccb6e54d..954724338 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -198,7 +198,7 @@ create_pop3_mbx(const gchar *name, const gchar* host, gint security,
                 const gchar *login, const gchar *passwd,
                 gboolean remember)
 {
-    LibBalsaMailboxPop3 *pop = libbalsa_mailbox_pop3_new();
+    LibBalsaMailboxPOP3 *pop = libbalsa_mailbox_pop3_new();
     LibBalsaMailbox *mbx   = LIBBALSA_MAILBOX(pop);
     LibBalsaServer *server = LIBBALSA_MAILBOX_REMOTE_GET_SERVER(pop);
 
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index a37d33d74..60f5c21f0 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -599,7 +599,7 @@ static void
 mailbox_conf_set_values_pop3(LibBalsaMailbox * mailbox,
                              MailboxConfWindow * mcw)
 {
-    LibBalsaMailboxPop3 *pop3;
+    LibBalsaMailboxPOP3 *pop3;
     LibBalsaServer *server;
     const gchar *filter_cmd;
     gboolean sensitive;
@@ -846,7 +846,7 @@ fill_in_imap_data(MailboxConfWindow *mcw, gchar ** name, gchar ** path)
 static void
 update_pop_mailbox(MailboxConfWindow * mcw)
 {
-    LibBalsaMailboxPop3 *mailbox;
+    LibBalsaMailboxPOP3 *mailbox;
     LibBalsaServer *server;
     BalsaServerConf *bsc;
     gchar *filename;
diff --git a/src/main-window.c b/src/main-window.c
index 830396585..d152b8aa8 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3330,7 +3330,7 @@ bw_check_mailbox_list(struct check_messages_thread_info *info, GList *mailbox_li
     for ( ; mailbox_list; mailbox_list = mailbox_list->next) {
         BalsaMailboxNode *mbnode;
         LibBalsaMailbox *mailbox;
-        LibBalsaMailboxPop3 *pop3;
+        LibBalsaMailboxPOP3 *pop3;
         bw_pop_mbox_t *bw_pop_mbox;
 
         mbnode = BALSA_MAILBOX_NODE(mailbox_list->data);
diff --git a/src/main.c b/src/main.c
index 0ec803253..c16c1a158 100644
--- a/src/main.c
+++ b/src/main.c
@@ -536,7 +536,9 @@ balsa_startup_cb(GApplication *application,
 
     /* Initialize libbalsa */
     balsa_setup_libbalsa_notification(application);
+g_print("%s libbalsa_init()\n", G_STRFUNC);
     libbalsa_init();
+g_print("%s libbalsa_init()\n", G_STRFUNC);
     libbalsa_filters_set_url_mapper(balsa_find_mailbox_by_url);
     libbalsa_filters_set_filter_list(&balsa_app.filters);
 
@@ -621,7 +623,9 @@ balsa_activate_cb(GApplication *application,
                    balsa_app.main_window);
 
     /* load mailboxes */
+g_print("%s config_load_sections()\n", G_STRFUNC);
     config_load_sections();
+g_print("%s config_load_sections()\n", G_STRFUNC);
     mailboxes_init(cmd_get_stats);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]