From b637ff2133330f31d7373f656ebbd76bac2569ed Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 16 Oct 2005 15:53:54 +0000 Subject: [PATCH] 2005-10-16 [colin] 1.9.15cvs61 * src/editldap.c * src/exporthtml.c * src/main.c * src/mainwindow.c * src/prefs_themes.c * src/prefs_toolbar.c * src/plugins/demo/demo.c * src/plugins/trayicon/trayicon.c s/Sylpheed/Sylpheed-Claws/ --- ChangeLog-gtk2.claws | 12 ++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/editldap.c | 2 +- src/exporthtml.c | 2 +- src/main.c | 5 +++++ src/mainwindow.c | 6 +++--- src/plugins/demo/demo.c | 2 +- src/plugins/trayicon/trayicon.c | 2 +- src/prefs_themes.c | 2 +- src/prefs_toolbar.c | 2 +- 11 files changed, 28 insertions(+), 10 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 961c670b9..e6da8fd2a 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,15 @@ +2005-10-16 [colin] 1.9.15cvs61 + + * src/editldap.c + * src/exporthtml.c + * src/main.c + * src/mainwindow.c + * src/prefs_themes.c + * src/prefs_toolbar.c + * src/plugins/demo/demo.c + * src/plugins/trayicon/trayicon.c + s/Sylpheed/Sylpheed-Claws/ + 2005-10-16 [colin] 1.9.15cvs60 * src/wizard.c diff --git a/PATCHSETS b/PATCHSETS index 6fe4b4760..2963af29b 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -897,3 +897,4 @@ ( cvs diff -u -r 1.43.2.29 -r 1.43.2.30 src/toolbar.c; cvs diff -u -r 1.204.2.63 -r 1.204.2.64 src/prefs_common.c; ) > 1.9.15cvs58.patchset ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/wizard.c; ) > 1.9.15cvs59.patchset ( cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/wizard.c; cvs diff -u -r 1.204.2.64 -r 1.204.2.65 src/prefs_common.c; ) > 1.9.15cvs60.patchset +( cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/editldap.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/exporthtml.c; cvs diff -u -r 1.115.2.58 -r 1.115.2.59 src/main.c; cvs diff -u -r 1.274.2.75 -r 1.274.2.76 src/mainwindow.c; cvs diff -u -r 1.3.2.29 -r 1.3.2.30 src/prefs_themes.c; cvs diff -u -r 1.30.2.18 -r 1.30.2.19 src/prefs_toolbar.c; cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/plugins/demo/demo.c; cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/plugins/trayicon/trayicon.c; ) > 1.9.15cvs61.patchset diff --git a/configure.ac b/configure.ac index 2e27960cf..e04b6bf6d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=15 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=60 +EXTRA_VERSION=61 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/editldap.c b/src/editldap.c index 256de79f8..a7dac2dcc 100644 --- a/src/editldap.c +++ b/src/editldap.c @@ -424,7 +424,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) { "\"ldap.mydomain.com\" may be appropriate for the " \ "\"mydomain.com\" organization. An IP address may also be " \ "used. You may specify \"localhost\" if running an LDAP " \ - "server on the same computer as Sylpheed." ), + "server on the same computer as Sylpheed-Claws." ), NULL ); /* Next row */ diff --git a/src/exporthtml.c b/src/exporthtml.c index d0d3c8585..0e2df451e 100644 --- a/src/exporthtml.c +++ b/src/exporthtml.c @@ -998,7 +998,7 @@ void exporthtml_process( return; } - title = _( "Sylpheed Address Book" ); + title = _( "Sylpheed-Claws Address Book" ); rootFolder = cache->rootFolder; dsName = cache->name; diff --git a/src/main.c b/src/main.c index e54d2ed37..d5f2b9e97 100644 --- a/src/main.c +++ b/src/main.c @@ -443,8 +443,13 @@ int main(int argc, char *argv[]) /* if Sylpheed crashed, rebuild caches */ if (!cmd.crash && crash_file_present) { debug_print("Sylpheed crashed, checking for new messages in local folders\n"); + folder_item_update_thaw(); + gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree)); folderview_check_new(NULL); folder_clean_cache_memory_force(); + folder_item_update_freeze(); + gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree)); + } /* make the crash-indicator file */ str_write_to_file("foo", get_crashfile_name()); diff --git a/src/mainwindow.c b/src/mainwindow.c index 50cef5ce3..0c1443169 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2048,7 +2048,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) folderwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(folderwin), - _("Sylpheed - Folder View")); + _("Sylpheed-Claws - Folder View")); gtk_window_move(GTK_WINDOW(folderwin), prefs_common.folderwin_x, @@ -2084,7 +2084,7 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type) messagewin = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(messagewin), - _("Sylpheed - Message View")); + _("Sylpheed-Claws - Message View")); gtk_window_move(GTK_WINDOW(messagewin), prefs_common.main_msgwin_x, @@ -2475,7 +2475,7 @@ static void print_cb(MainWindow *mainwin, guint action, GtkWidget *widget) static void app_exit_cb(MainWindow *mainwin, guint action, GtkWidget *widget) { if (prefs_common.confirm_on_exit) { - if (alertpanel(_("Exit"), _("Exit this program?"), + if (alertpanel(_("Exit"), _("Exit Sylpheed-Claws?"), GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL) != G_ALERTDEFAULT) return; diff --git a/src/plugins/demo/demo.c b/src/plugins/demo/demo.c index d0529f979..24b933867 100644 --- a/src/plugins/demo/demo.c +++ b/src/plugins/demo/demo.c @@ -76,7 +76,7 @@ const gchar *plugin_name(void) const gchar *plugin_desc(void) { - return _("This Plugin is only a demo of how to write plugins for Sylpheed. " + return _("This Plugin is only a demo of how to write plugins for Sylpheed-Claws. " "It installs a hook for new log output and writes it to stdout." "\n\n" "It is not really useful"); diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c index 74627c071..e44593ef7 100644 --- a/src/plugins/trayicon/trayicon.c +++ b/src/plugins/trayicon/trayicon.c @@ -99,7 +99,7 @@ static GtkItemFactoryEntry trayicon_popup_menu_entries[] = {N_("/---"), NULL, NULL, 0, ""}, {N_("/_Work Offline"), NULL, trayicon_toggle_offline_cb, 0, ""}, {N_("/---"), NULL, NULL, 0, ""}, - {N_("/E_xit Sylpheed"), NULL, trayicon_exit_cb, 0, NULL} + {N_("/E_xit Sylpheed-Claws"), NULL, trayicon_exit_cb, 0, NULL} }; static void set_trayicon_pixmap(TrayIconType icontype) diff --git a/src/prefs_themes.c b/src/prefs_themes.c index 947612f6c..c5d38a3e8 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.c @@ -685,7 +685,7 @@ static void prefs_themes_get_theme_info(ThemesData *tdata) if (IS_INTERNAL_THEME(path)) { info->name = g_strdup(_("Default internal theme")); - info->author = g_strdup(_("The Sylpheed Claws Team")); + info->author = g_strdup(_("The Sylpheed-Claws Team")); info->url = g_strdup(HOMEPAGE_URI); info->status = g_strdup_printf(_("Internal theme has %d icons"), N_STOCK_PIXMAPS); } diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index e37a2778e..07a681d6f 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -638,7 +638,7 @@ static void prefs_toolbar_selection_changed(GtkList *list, if (g_utf8_collate(cur_entry, actions_entry) == 0) { gtk_widget_hide(prefs_toolbar->entry_icon_text); gtk_widget_show(prefs_toolbar->combo_syl_action); - gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Sylpheed Action")); + gtk_label_set_text(GTK_LABEL(prefs_toolbar->label_icon_text), _("Sylpheed-Claws Action")); if (prefs_common.actions_list == NULL) { gtk_widget_set_sensitive(prefs_toolbar->combo_syl_action, FALSE); -- 2.25.1