GNOME.org
 

[balsa/wip/gtk4: 223/351] server: Rename some functions

commit 2f8ba4d3a7457949df367fa2c33e49133ede73f3
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Mar 15 12:46:55 2018 -0400

    server: Rename some functions
    
    libbalsa_server_get_user → libbalsa_server_get_username
    libbalsa_server_get_passwd → libbalsa_server_get_password
    libbalsa_server_get_password → libbalsa_server_ask_password, and is no
    longer exported

 libbalsa/imap-server.c  |   10 +++++-----
 libbalsa/mailbox_imap.c |   12 ++++++------
 libbalsa/mailbox_pop3.c |    4 ++--
 libbalsa/server.c       |   12 ++++++------
 libbalsa/server.h       |    6 ++----
 libbalsa/smtp-server.c  |    8 ++++----
 src/balsa-app.c         |   18 +++++++++---------
 src/folder-conf.c       |    4 ++--
 src/mailbox-conf.c      |   16 ++++++++--------
 9 files changed, 44 insertions(+), 46 deletions(-)
---
diff --git a/libbalsa/imap-server.c b/libbalsa/imap-server.c
index fa1c3eb..ce83e29 100644
--- a/libbalsa/imap-server.c
+++ b/libbalsa/imap-server.c
@@ -154,13 +154,13 @@ static void
 libbalsa_imap_server_set_host(LibBalsaServer * server,
                               const gchar * host, gboolean use_ssl)
 {
-    if(libbalsa_server_get_user(server) && host) { /* we have been initialized... */
+    if(libbalsa_server_get_username(server) && host) { /* we have been initialized... */
         LibBalsaImapServer *imap_server = LIBBALSA_IMAP_SERVER(server);
         g_mutex_lock(&imap_servers_lock);
         g_hash_table_steal(imap_servers, imap_server->key);
         g_free(imap_server->key);
         imap_server->key =
-            g_strdup_printf("%s@%s", libbalsa_server_get_user(server), host);
+            g_strdup_printf("%s@%s", libbalsa_server_get_username(server), host);
         g_hash_table_insert(imap_servers, imap_server->key, imap_server);
         g_mutex_unlock(&imap_servers_lock);
     }
@@ -490,7 +490,7 @@ libbalsa_imap_server_new_from_config(void)
     imap_server = get_or_create(user, host);
     server = LIBBALSA_SERVER(imap_server);
 
-    if (libbalsa_server_get_user(server) == NULL) {
+    if (libbalsa_server_get_username(server) == NULL) {
         gboolean use_ssl;
 
         libbalsa_server_set_username(server, user);
@@ -518,7 +518,7 @@ libbalsa_imap_server_new_from_config(void)
     d1 = libbalsa_conf_get_bool_with_default("UseIdle", &d);
     if(!d) imap_server->use_idle = !!d1;
 
-    if (libbalsa_server_get_passwd(server) == NULL) {
+    if (libbalsa_server_get_password(server) == NULL) {
         gboolean remember_passwd;
         gchar *passwd = NULL;
 
@@ -531,7 +531,7 @@ libbalsa_imap_server_new_from_config(void)
             GError *err = NULL;
 
             const_host = libbalsa_server_get_host(server);
-            const_user = libbalsa_server_get_user(server);
+            const_user = libbalsa_server_get_username(server);
             passwd = secret_password_lookup_sync(LIBBALSA_SERVER_SECRET_SCHEMA,
                                                  NULL, &err,
                                                  "protocol",
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index 0433502..6a25505 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -470,7 +470,7 @@ get_header_cache_path(LibBalsaMailboxImap *mimap)
     LibBalsaServer *s = LIBBALSA_MAILBOX_REMOTE(mimap)->server;
     gchar *cache_dir = get_cache_dir(TRUE); /* FIXME */
     gchar *header_file = g_strdup_printf("%s@%s-%s-%u-headers2",
-                                        libbalsa_server_get_user(s), libbalsa_server_get_host(s),
+                                        libbalsa_server_get_username(s), libbalsa_server_get_host(s),
                                         (mimap->path ? mimap->path : "INBOX"),
                                         mimap->uid_validity);
     gchar *encoded_path = libbalsa_urlencode(header_file);
@@ -495,7 +495,7 @@ get_cache_name_pair(LibBalsaMailboxImap* mailbox, const gchar *type,
 
     res[0] = get_cache_dir(is_persistent);
     fname = g_strdup_printf("%s@%s-%s-%u-%u-%s",
-                            libbalsa_server_get_user(s), libbalsa_server_get_host(s),
+                            libbalsa_server_get_username(s), libbalsa_server_get_host(s),
                             (mailbox->path ? mailbox->path : "INBOX"),
                             uid_validity, uid, type);
     res[1] = libbalsa_urlencode(fname);
@@ -1895,7 +1895,7 @@ libbalsa_imap_delete_folder(LibBalsaMailboxImap *mailbox, GError **err)
 gchar *
 libbalsa_imap_url(LibBalsaServer * server, const gchar * path)
 {
-    gchar *enc = libbalsa_urlencode(libbalsa_server_get_user(server));
+    gchar *enc = libbalsa_urlencode(libbalsa_server_get_username(server));
     gchar *url = g_strdup_printf("imap%s://%s@%s/%s",
 #ifdef USE_SSL_TO_SET_IMAPS_IN_URL
                                  server->use_ssl ? "s" : "",
@@ -2996,7 +2996,7 @@ libbalsa_mailbox_imap_add_messages(LibBalsaMailbox * mailbox,
        struct append_to_cache_data atcd;
        gchar *cache_dir;
 
-       atcd.user = libbalsa_server_get_user(s);
+       atcd.user = libbalsa_server_get_username(s);
        atcd.host = libbalsa_server_get_host(s);
        atcd.path = mimap->path ? mimap->path : "INBOX";
        atcd.cache_dir = cache_dir = get_cache_dir(is_persistent);
@@ -3349,7 +3349,7 @@ libbalsa_mailbox_imap_messages_copy(LibBalsaMailbox * mailbox,
                libbalsa_imap_server_has_persistent_cache(is);
            gchar *dir_name = get_cache_dir(is_persistent);
            gchar *src_prefix = g_strdup_printf("%s@%s-%s-%u-",
-                                               libbalsa_server_get_user(s), libbalsa_server_get_host(s),
+                                               libbalsa_server_get_username(s), libbalsa_server_get_host(s),
                                                (mimap->path 
                                                 ? mimap->path : "INBOX"),
                                                mimap->uid_validity);
@@ -3375,7 +3375,7 @@ libbalsa_mailbox_imap_messages_copy(LibBalsaMailbox * mailbox,
                                g_build_filename(dir_name, filename, NULL);
                            gchar *dst_prefix =
                                g_strdup_printf("%s@%s-%s-%u-%u%s",
-                                               libbalsa_server_get_user(s),
+                                               libbalsa_server_get_username(s),
                                                 libbalsa_server_get_host(s),
                                                (dst_imap->path
                                                 ? dst_imap->path : "INBOX"),
diff --git a/libbalsa/mailbox_pop3.c b/libbalsa/mailbox_pop3.c
index 2fe870a..a8a7eab 100644
--- a/libbalsa/mailbox_pop3.c
+++ b/libbalsa/mailbox_pop3.c
@@ -542,7 +542,7 @@ update_msg_list(struct fetch_data         *fd,
 
        /* load uid's if messages shall be left on the server */
        if (!mbox->delete_from_server) {
-               uid_prefix = g_strconcat(libbalsa_server_get_user(server), "@", 
libbalsa_server_get_host(server), NULL);
+               uid_prefix = g_strconcat(libbalsa_server_get_username(server), "@", 
libbalsa_server_get_host(server), NULL);
                prefix_len = strlen(uid_prefix);
                uids = mp_load_uids(uid_prefix);
                *current_uids = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
@@ -674,7 +674,7 @@ libbalsa_mailbox_pop3_check(LibBalsaMailbox * mailbox)
 
                /* store uid list */
                if (result && !mbox->delete_from_server) {
-                       gchar *uid_prefix = g_strconcat(libbalsa_server_get_user(server), "@", 
libbalsa_server_get_host(server), NULL);
+                       gchar *uid_prefix = g_strconcat(libbalsa_server_get_username(server), "@", 
libbalsa_server_get_host(server), NULL);
 
                        mp_save_uids(current_uids, uid_prefix, &err);
                        g_free(uid_prefix);
diff --git a/libbalsa/server.c b/libbalsa/server.c
index 36e0685..e9b06a1 100644
--- a/libbalsa/server.c
+++ b/libbalsa/server.c
@@ -220,8 +220,8 @@ libbalsa_server_config_changed(LibBalsaServer * server)
                   0);
 }
 
-gchar *
-libbalsa_server_get_password(LibBalsaServer * server,
+static gchar *
+libbalsa_server_ask_password(LibBalsaServer * server,
                             LibBalsaMailbox * mbox)
 {
     gchar *retval = NULL;
@@ -456,7 +456,7 @@ libbalsa_server_user_cb(ImapUserEventType ue, void *arg, ...)
         gchar **pass = va_arg(alist, gchar**);
         ok = va_arg(alist, int*);
         if(!priv->passwd) {
-            priv->passwd = libbalsa_server_get_password(is, NULL);
+            priv->passwd = libbalsa_server_ask_password(is, NULL);
         }
         *ok = priv->passwd != NULL;
         if(*ok) {
@@ -551,7 +551,7 @@ libbalsa_server_get_auth(NetClient *client,
                if ((priv->passwd != NULL) && (priv->passwd[0] != '\0')) {
                        result[1] = g_strdup(priv->passwd);
                } else {
-                       result[1] = libbalsa_server_get_password(server, NULL);
+                       result[1] = libbalsa_server_ask_password(server, NULL);
                }
         }
     }
@@ -752,7 +752,7 @@ libbalsa_server_get_remember_passwd(LibBalsaServer * server)
 }
 
 const gchar *
-libbalsa_server_get_user(LibBalsaServer * server)
+libbalsa_server_get_username(LibBalsaServer * server)
 {
     LibBalsaServerPrivate *priv = libbalsa_server_get_instance_private(server);
 
@@ -802,7 +802,7 @@ libbalsa_server_get_cert_passphrase(LibBalsaServer * server)
 }
 
 const gchar *
-libbalsa_server_get_passwd(LibBalsaServer * server)
+libbalsa_server_get_password(LibBalsaServer * server)
 {
     LibBalsaServerPrivate *priv = libbalsa_server_get_instance_private(server);
 
diff --git a/libbalsa/server.h b/libbalsa/server.h
index f76892a..3c27d70 100644
--- a/libbalsa/server.h
+++ b/libbalsa/server.h
@@ -69,8 +69,6 @@ void libbalsa_server_set_password(LibBalsaServer * server,
                                  const gchar * passwd);
 void libbalsa_server_set_host(LibBalsaServer * server, const gchar * host,
                               gboolean use_ssl);
-gchar *libbalsa_server_get_password(LibBalsaServer * server,
-                                   LibBalsaMailbox * mbox);
 
 void libbalsa_server_config_changed(LibBalsaServer * server);
 void libbalsa_server_load_config(LibBalsaServer * server);
@@ -116,12 +114,12 @@ gboolean libbalsa_server_get_use_ssl(LibBalsaServer * server);
 gboolean libbalsa_server_get_client_cert(LibBalsaServer * server);
 gboolean libbalsa_server_get_try_anonymous(LibBalsaServer * server);
 gboolean libbalsa_server_get_remember_passwd(LibBalsaServer * server);
-const gchar * libbalsa_server_get_user(LibBalsaServer * server);
+const gchar * libbalsa_server_get_username(LibBalsaServer * server);
 const gchar * libbalsa_server_get_host(LibBalsaServer * server);
 const gchar * libbalsa_server_get_protocol(LibBalsaServer * server);
 const gchar * libbalsa_server_get_cert_file(LibBalsaServer * server);
 const gchar * libbalsa_server_get_cert_passphrase(LibBalsaServer * server);
-const gchar * libbalsa_server_get_passwd(LibBalsaServer * server);
+const gchar * libbalsa_server_get_password(LibBalsaServer * server);
 
 /*
  * Setters
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 02697fb..ce3a6ea 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -522,8 +522,8 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
     /* user name and password */
     sdi->user = gtk_entry_new();
     smtp_server_add_widget(grid, ++row, _("_User Name:"), sdi->user);
-    if (libbalsa_server_get_user(server) != NULL) {
-        gtk_entry_set_text(GTK_ENTRY(sdi->user), libbalsa_server_get_user(server));
+    if (libbalsa_server_get_username(server) != NULL) {
+        gtk_entry_set_text(GTK_ENTRY(sdi->user), libbalsa_server_get_username(server));
     }
     g_signal_connect(sdi->user, "changed", G_CALLBACK(smtp_server_changed), sdi);
 
@@ -531,8 +531,8 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
     smtp_server_add_widget(grid, ++row, _("_Pass Phrase:"), sdi->pass);
     g_object_set(G_OBJECT(sdi->pass), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
     gtk_entry_set_visibility(GTK_ENTRY(sdi->pass), FALSE);
-    if (libbalsa_server_get_passwd(server) != NULL) {
-        gtk_entry_set_text(GTK_ENTRY(sdi->pass), libbalsa_server_get_passwd(server));
+    if (libbalsa_server_get_password(server) != NULL) {
+        gtk_entry_set_text(GTK_ENTRY(sdi->pass), libbalsa_server_get_password(server));
     }
     g_signal_connect(sdi->pass, "changed", G_CALLBACK(smtp_server_changed), sdi);
 
diff --git a/src/balsa-app.c b/src/balsa-app.c
index f5d9505..3fd52b7 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -72,10 +72,10 @@ ask_password_real(LibBalsaServer * server, LibBalsaMailbox * mbox)
        prompt =
            g_strdup_printf(_("Opening remote mailbox %s.\n"
                               "The _password for %s@%s:"),
-                           mbox->name, libbalsa_server_get_user(server), libbalsa_server_get_host(server));
+                           mbox->name, libbalsa_server_get_username(server), 
libbalsa_server_get_host(server));
     else
        prompt =
-           g_strdup_printf(_("_Password for %s@%s (%s):"), libbalsa_server_get_user(server),
+           g_strdup_printf(_("_Password for %s@%s (%s):"), libbalsa_server_get_username(server),
                            libbalsa_server_get_host(server), libbalsa_server_get_protocol(server));
 
     dialog = gtk_dialog_new_with_buttons(_("Password needed"),
@@ -194,19 +194,19 @@ set_passwd_from_matching_server(GtkTreeModel *model,
         g_return_val_if_fail(server != NULL, FALSE);
     }
     g_return_val_if_fail(libbalsa_server_get_host(server) != NULL, FALSE);
-    g_return_val_if_fail(libbalsa_server_get_user(server) != NULL, FALSE);
-    if (libbalsa_server_get_passwd(server) == NULL) return FALSE;
+    g_return_val_if_fail(libbalsa_server_get_username(server) != NULL, FALSE);
+    if (libbalsa_server_get_password(server) == NULL) return FALSE;
 
     master = (LibBalsaServer *)data;
     g_return_val_if_fail(LIBBALSA_IS_SERVER(master), FALSE);
     if (master == server) return FALSE;
 
     g_return_val_if_fail(libbalsa_server_get_host(server) != NULL, FALSE);
-    g_return_val_if_fail(libbalsa_server_get_user(server) != NULL, FALSE);
+    g_return_val_if_fail(libbalsa_server_get_username(server) != NULL, FALSE);
 
     if ((strcmp(libbalsa_server_get_host(server), libbalsa_server_get_host(master)) == 0) &&
-       (strcmp(libbalsa_server_get_user(server), libbalsa_server_get_user(master)) == 0)) {
-       libbalsa_server_set_password(master, libbalsa_server_get_passwd(server));
+       (strcmp(libbalsa_server_get_username(server), libbalsa_server_get_username(master)) == 0)) {
+       libbalsa_server_set_password(master, libbalsa_server_get_password(server));
        return TRUE;
     };
 
@@ -227,8 +227,8 @@ ask_password(LibBalsaServer *server, LibBalsaMailbox *mbox)
                               (GtkTreeModelForeachFunc)
                               set_passwd_from_matching_server, server);
 
-       if (libbalsa_server_get_passwd(server) != NULL) {
-           password = g_strdup(libbalsa_server_get_passwd(server));
+       if (libbalsa_server_get_password(server) != NULL) {
+           password = g_strdup(libbalsa_server_get_password(server));
            libbalsa_server_set_password(server, NULL);
        }
     }
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 69d7274..ff11dd9 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -379,13 +379,13 @@ folder_conf_imap_node(BalsaMailboxNode *mn)
     label= libbalsa_create_grid_label(_("Use_r name:"), grid, r);
     fcw->username =
         libbalsa_create_grid_entry(grid, G_CALLBACK(validate_folder),
-                                   fcw, r++, s ? libbalsa_server_get_user(s) : g_get_user_name(),
+                                   fcw, r++, s ? libbalsa_server_get_username(s) : g_get_user_name(),
                                    label);
 
     label = libbalsa_create_grid_label(_("_Password:"), grid, r);
     fcw->password =
         libbalsa_create_grid_entry(grid, NULL, NULL, r++,
-                                   s ? libbalsa_server_get_passwd(s) : NULL, label);
+                                   s ? libbalsa_server_get_password(s) : NULL, label);
     gtk_entry_set_visibility(GTK_ENTRY(fcw->password), FALSE);
 
     fcw->anonymous =
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 6fd443b..faef9e5 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -689,12 +689,12 @@ mailbox_conf_set_values_pop3(LibBalsaMailbox   *mailbox,
        }
        gtk_combo_box_set_active(GTK_COMBO_BOX(mcw->mb_data.pop3.security), 
libbalsa_server_get_security(server) - 1);
 
-       if (libbalsa_server_get_user(server) != NULL) {
-               gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.username), libbalsa_server_get_user(server));
+       if (libbalsa_server_get_username(server) != NULL) {
+               gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.username), 
libbalsa_server_get_username(server));
        }
 
-       if (libbalsa_server_get_passwd(server) != NULL) {
-               gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.password), libbalsa_server_get_passwd(server));
+       if (libbalsa_server_get_password(server) != NULL) {
+               gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.password), 
libbalsa_server_get_password(server));
        }
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.delete_from_server), 
pop3->delete_from_server);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.check), pop3->check);
@@ -762,18 +762,18 @@ mailbox_conf_set_values(MailboxConfWindow *mcw)
                if (libbalsa_server_get_host(server))
                        gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.bsc.server),
                                libbalsa_server_get_host(server));
-               if (libbalsa_server_get_user(server))
+               if (libbalsa_server_get_username(server))
                        gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.username),
-                               libbalsa_server_get_user(server));
+                               libbalsa_server_get_username(server));
                gtk_toggle_button_set_active
                (GTK_TOGGLE_BUTTON(mcw->mb_data.imap.anonymous),
                        libbalsa_server_get_try_anonymous(server));
                gtk_toggle_button_set_active
                (GTK_TOGGLE_BUTTON(mcw->mb_data.imap.remember),
                        libbalsa_server_get_remember_passwd(server));
-               if (libbalsa_server_get_passwd(server))
+               if (libbalsa_server_get_password(server))
                        gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.password),
-                               libbalsa_server_get_passwd(server));
+                               libbalsa_server_get_password(server));
                path = libbalsa_mailbox_imap_get_path(imap);
                if (path)
                        gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.folderpath),
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]