Display account name in statusbar when retrieving from POP account. Display account...

diff --git a/AUTHORS b/AUTHORS
index fdd712ba03b20d60969488e7a6b16f46fa14c66d..2893b1e99be8dc2687de6292b4f05eb74e6ea24c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -202,3 +202,4 @@ contributors (beside the above; based on Changelog)
        David Chalmers
        Chad Robinson
        Edgar Toernig
+       Fabien Vantard

diff --git a/ChangeLog.claws b/ChangeLog.claws
index aa8e0b69cb650d482639e89a2923a79cbede9aea..8edd20617c7865d60427b1a99cdd80957e14a7fb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,19 @@
+2004-05-04 [paul]      0.9.10claws54
+
+       * src/inc.c
+               Display account_name in statusbar when retrieving
+               messages from a pop account
+       * src/prefs_account.c
+               display account name in title of prefs_account
+               window
+       * src/prefs_folder_item.c
+               display folder name in title of prefs_folder window
+
+       all 3 patches submitted by Fabien Vantard
+
+       * AUTHORS
+               add Fabien Vantard
+
 2004-05-04 [paul]      0.9.10claws53
 
        * src/prefs_actions.c

diff --git a/configure.ac b/configure.ac
index f8f1dd3a038fb58dea517ebc99dbd64357100081..0ead2e8fa0df2925198fc1c1865a3a1cce42645b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws

diff --git a/src/inc.c b/src/inc.c
index 7b9e33d4325487d26dcf92fb47d50944b958855b..719a3c75b2e5a3f034b2e896116e7b4feead12be 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -859,8 +859,9 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
        case POP3_GETAUTH_PASS:
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));
-               statusbar_print_all(_("Retrieving messages from %s..."),
-                                   SESSION(session)->server);
+               statusbar_print_all(_("Retrieving messages from %s (%s) ..."),
+                                   SESSION(session)->server,
+                                   session->ac_prefs->account_name);
                break;
        case POP3_GETRANGE_STAT:
                progress_dialog_set_label

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 7eb44a4334d0846b9a48742c638ee8e25b9dd6fc..ed64e58d3319dd7ac0efc6c0f621dc81c70edb17 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -711,9 +711,12 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                                     _("Preferences for new account"));
                gtk_widget_hide(dialog.apply_btn);
        } else {
+               gchar *title;
                prefs_set_dialog(param);
-               gtk_window_set_title(GTK_WINDOW(dialog.window),
-                                    _("Account preferences"));
+               title = g_strdup_printf (_("%s - Account preferences"),
+                               ac_prefs->account_name);
+               gtk_window_set_title(GTK_WINDOW(dialog.window), title);
+               g_free (title);
                gtk_widget_show(dialog.apply_btn);
        }
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 4e34f2c6dc1db9f1cfd95ec30dae9f3e4409068d..498818a25c31a5c8e6db5958e87f45e7bfb27db5 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -787,12 +787,18 @@ static GSList *prefs_pages = NULL;
 
 void prefs_folder_item_open(FolderItem *item)
 {
+       gchar *id, *title;
+
        if (prefs_pages == NULL) {
                register_general_page();
                register_compose_page();
        }
 
-       prefswindow_open(_("Settings for folder"), prefs_pages, item);
+       id = folder_item_get_identifier (item);
+       title = g_strdup_printf (_("%s - Settings for folder"), id);
+       g_free (id);
+       prefswindow_open(title, prefs_pages, item);
+       g_free (title);
 }
 
 void prefs_folder_item_register_page(PrefsPage *page)