From 2602dbc02e6bbd4c8284660f8989972deb992339 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Tue, 22 Aug 2006 05:25:35 +0000 Subject: [PATCH] 2006-08-22 [paul] 2.4.0cvs70 * manual/Makefile.am build manuals in alphabetical order * src/addressbook.c * src/prefs_themes.c replace/remove deprecated symbols * src/gtk/gtkutils.c fix a warning * src/gtk/pluginwindow.c replace deprecated symbol replace label text and move it * src/plugins/pgpcore/prefs_gpg.c move the 'Generate...' button out of the Sign Key frame, replace the English used * src/plugins/pgpcore/sgpgme.c fixes to the English --- ChangeLog | 18 ++++++++++++++++++ PATCHSETS | 1 + configure.ac | 2 +- manual/Makefile.am | 2 +- src/addressbook.c | 2 +- src/gtk/gtkutils.c | 2 +- src/gtk/pluginwindow.c | 24 ++++++++++++------------ src/plugins/pgpcore/prefs_gpg.c | 20 +++++++++----------- src/plugins/pgpcore/sgpgme.c | 21 +++++++++++---------- src/prefs_themes.c | 3 +-- 10 files changed, 56 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index 256a3d9bc..b080e980a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2006-08-22 [paul] 2.4.0cvs70 + + * manual/Makefile.am + build manuals in alphabetical order + * src/addressbook.c + * src/prefs_themes.c + replace/remove deprecated symbols + * src/gtk/gtkutils.c + fix a warning + * src/gtk/pluginwindow.c + replace deprecated symbol + replace label text and move it + * src/plugins/pgpcore/prefs_gpg.c + move the 'Generate...' button out of the + Sign Key frame, replace the English used + * src/plugins/pgpcore/sgpgme.c + fixes to the English + 2006-08-21 [colin] 2.4.0cvs69 * src/plugins/trayicon/trayicon.c diff --git a/PATCHSETS b/PATCHSETS index 5e963bd34..13c75b5c0 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1761,3 +1761,4 @@ ( cvs diff -u -r 1.17.2.24 -r 1.17.2.25 src/alertpanel.c; cvs diff -u -r 1.274.2.138 -r 1.274.2.139 src/mainwindow.c; cvs diff -u -r 1.83.2.80 -r 1.83.2.81 src/mimeview.c; cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpcore/passphrase.c; ) > 2.4.0cvs67.patchset ( cvs diff -u -r 1.382.2.303 -r 1.382.2.304 src/compose.c; cvs diff -u -r 1.75.2.29 -r 1.75.2.30 src/matcher.c; cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/msgcache.c; ) > 2.4.0cvs68.patchset ( cvs diff -u -r 1.14.2.35 -r 1.14.2.36 src/plugins/trayicon/trayicon.c; ) > 2.4.0cvs69.patchset +( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/Makefile.am; cvs diff -u -r 1.60.2.61 -r 1.60.2.62 src/addressbook.c; cvs diff -u -r 1.3.2.42 -r 1.3.2.43 src/prefs_themes.c; cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/gtkutils.c; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpcore/sgpgme.c; ) > 2.4.0cvs70.patchset diff --git a/configure.ac b/configure.ac index 6ed9de545..34a299af3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=4 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=69 +EXTRA_VERSION=70 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/manual/Makefile.am b/manual/Makefile.am index 5794f9fa9..0db4ab2ca 100644 --- a/manual/Makefile.am +++ b/manual/Makefile.am @@ -1,5 +1,5 @@ if BUILD_MANUAL -SUBDIRS=dtd dist fr pl es +SUBDIRS=dtd dist es fr pl endif EXTRA_DIST = \ diff --git a/src/addressbook.c b/src/addressbook.c index d0ddb3b7d..57e9d1ce6 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -998,7 +998,7 @@ static void addressbook_create(void) /* Button panel */ hbbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2); + gtk_box_set_spacing(GTK_BOX(hbbox), 2); gtk_container_set_border_width(GTK_CONTAINER(hbbox), 4); gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0); diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c index 3ccef3b54..a3df65462 100644 --- a/src/gtk/gtkutils.c +++ b/src/gtk/gtkutils.c @@ -832,7 +832,7 @@ GtkWidget *label_window_create(const gchar *str) label = gtk_label_new(str); gtk_container_add(GTK_CONTAINER(window), label); - gtk_label_set_line_wrap(label, TRUE); + gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_widget_show(label); gtk_widget_show_now(window); diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c index 9fd54e230..5b5986ed6 100644 --- a/src/gtk/pluginwindow.c +++ b/src/gtk/pluginwindow.c @@ -255,7 +255,6 @@ static void pluginwindow_size_allocate_cb(GtkWidget *widget, void pluginwindow_create() { PluginWindow *pluginwindow; - /* ---------------------- code made by glade ---------------------- */ GtkWidget *window; GtkWidget *vbox1; GtkWidget *hbox2; @@ -290,16 +289,6 @@ void pluginwindow_create() gtk_box_set_homogeneous(GTK_BOX(vbox1), FALSE); gtk_widget_realize(window); - desc_lbl = gtk_label_new(_("Plugins are a way to greatly extend Sylpheed-Claws' capabilities.")); - gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5); - gtk_widget_show(desc_lbl); - gtk_box_pack_start(GTK_BOX(vbox1), desc_lbl, FALSE, FALSE, 0); - - get_more_btn = gtkut_get_link_btn(window, PLUGINS_URI, _("Get more...")); - gtk_misc_set_alignment(GTK_MISC(GTK_BIN(get_more_btn)->child), 0, 0.5); - gtk_widget_show(get_more_btn); - gtk_box_pack_start(GTK_BOX(vbox1), get_more_btn, FALSE, FALSE, 0); - hbox2 = gtk_hbox_new(FALSE, 8); gtk_widget_show(hbox2); gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, TRUE, 0); @@ -341,6 +330,17 @@ void pluginwindow_create() gtk_widget_show(plugin_desc); gtk_container_add(GTK_CONTAINER(scrolledwindow3), plugin_desc); + desc_lbl = gtk_label_new(_("More plugins are available from the " + "Sylpheed-Claws website.")); + gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5); + gtk_widget_show(desc_lbl); + gtk_box_pack_start(GTK_BOX(vbox1), desc_lbl, FALSE, FALSE, 0); + + get_more_btn = gtkut_get_link_btn(window, PLUGINS_URI, _("Get more...")); + gtk_misc_set_alignment(GTK_MISC(GTK_BIN(get_more_btn)->child), 0, 0.5); + gtk_widget_show(get_more_btn); + gtk_box_pack_start(GTK_BOX(vbox1), get_more_btn, FALSE, FALSE, 0); + hbox3 = gtk_hbox_new(FALSE, 0); gtk_widget_show(hbox3); hbuttonbox1 = gtk_hbutton_box_new(); @@ -353,7 +353,7 @@ void pluginwindow_create() &load_btn, _("Load Plugin..."), &unload_btn, _("Unload Plugin"), &close_btn, GTK_STOCK_CLOSE); - gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 6); + gtk_box_set_spacing(GTK_BOX(hbuttonbox1), 6); gtk_widget_show(hbuttonbox1); gtk_box_pack_end (GTK_BOX (hbox3), hbuttonbox1, FALSE, FALSE, 0); diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c index 29a7d247b..1bdb6185e 100644 --- a/src/plugins/pgpcore/prefs_gpg.c +++ b/src/plugins/pgpcore/prefs_gpg.c @@ -343,8 +343,14 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, break; } + hbox = gtk_hbox_new (FALSE, 5); + gtk_widget_show (hbox); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + new_key_box = gtk_hbox_new(FALSE, 6); - + gtk_widget_show(new_key_box); + gtk_box_pack_start(GTK_BOX(hbox), new_key_box, FALSE, FALSE, 0); + image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR); @@ -353,17 +359,9 @@ static void prefs_gpg_account_create_widget_func(PrefsPage *_page, _("No secret key found.")); gtk_box_pack_start(GTK_BOX(new_key_box), new_key_label, FALSE, FALSE, 0); - new_key_btn = gtk_button_new_with_label(_("Generate new secret key")); - - gtk_box_pack_start(GTK_BOX(vbox2), new_key_box, FALSE, FALSE, 0); - - hbox = gtk_hbox_new (FALSE, 5); - gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0); - gtk_box_pack_start(GTK_BOX(hbox), new_key_btn, FALSE, FALSE, 0); - - gtk_widget_show_all(new_key_box); + new_key_btn = gtk_button_new_with_label(_("Generate a new key pair")); gtk_widget_show(new_key_btn); + gtk_box_pack_start(GTK_BOX(hbox), new_key_btn, FALSE, FALSE, 0); if (config->sign_key_id != NULL) gtk_entry_set_text(GTK_ENTRY(keyid), config->sign_key_id); diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index aa87085c9..b167a562c 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -479,15 +479,15 @@ gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account) err = gpgme_op_keylist_next(ctx, &key); if (err) { g_warning("setup_signers start: %s", gpgme_strerror(err)); - privacy_set_error(_("Private key not found (%s)"), gpgme_strerror(err)); + privacy_set_error(_("Secret key not found (%s)"), gpgme_strerror(err)); goto bail; } err = gpgme_op_keylist_next(ctx, &key2); if (!err) { - g_warning("ambiguous specification of private key '%s'\n", + g_warning("ambiguous specification of secret key '%s'\n", keyid); - privacy_set_error(_("Private key specification is ambiguous")); + privacy_set_error(_("Secret key specification is ambiguous")); goto bail; } @@ -497,7 +497,7 @@ gboolean sgpgme_setup_signers(gpgme_ctx_t ctx, PrefsAccount *account) if (err) { g_warning("error adding secret key: %s\n", gpgme_strerror(err)); - privacy_set_error(_("Error setting private key: %s"), gpgme_strerror(err)); + privacy_set_error(_("Error setting secret key: %s"), gpgme_strerror(err)); goto bail; } } @@ -601,7 +601,7 @@ void sgpgme_create_secret_key(PrefsAccount *account, gboolean ask_create) _("Sylpheed-Claws did not find a secret PGP key, " "which means that you won't be able to sign " "emails or receive encrypted emails.\n" - "Do you want to create a secret key now?"), + "Do you want to create a new key pair now?"), GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL); if (val == G_ALERTDEFAULT) { prefs_gpg_get_config()->gpg_ask_create_key = FALSE; @@ -668,13 +668,14 @@ again: err = gpgme_new (&ctx); if (err) { - alertpanel_error(_("Couldn't generate new key: %s"), gpgme_strerror(err)); + alertpanel_error(_("Couldn't generate a new key pair: %s"), + gpgme_strerror(err)); g_free(key_parms); return; } - window = label_window_create(_("Generating your new key... Please move the mouse " + window = label_window_create(_("Generating your new key pair... Please move the mouse " "around to help generate entropy...")); err = gpgme_op_genkey(ctx, key_parms, NULL, NULL); @@ -683,17 +684,17 @@ again: gtk_widget_destroy(window); if (err) { - alertpanel_error(_("Couldn't generate new key: %s"), gpgme_strerror(err)); + alertpanel_error(_("Couldn't generate a new key pair: %s"), gpgme_strerror(err)); gpgme_release(ctx); return; } key = gpgme_op_genkey_result(ctx); if (key == NULL) { - alertpanel_error(_("Couldn't generate new key: unknown error")); + alertpanel_error(_("Couldn't generate a new key pair: unknown error")); gpgme_release(ctx); return; } else { - alertpanel_notice(_("Your secret key has been generated. " + alertpanel_notice(_("Your new key pair has been generated. " "Its fingerprint is:\n%s"), key->fpr ? key->fpr:"null"); } diff --git a/src/prefs_themes.c b/src/prefs_themes.c index d65db8915..bd8905ede 100644 --- a/src/prefs_themes.c +++ b/src/prefs_themes.c @@ -986,8 +986,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin gtk_container_add (GTK_CONTAINER (frame_buttons), hbuttonbox1); gtk_container_set_border_width (GTK_CONTAINER (hbuttonbox1), 5); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_START); - gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 5); - gtk_button_box_set_child_ipadding (GTK_BUTTON_BOX (hbuttonbox1), 5, 0); + gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 5); btn_use = gtk_button_new_with_label (_("Use this")); gtk_widget_show (btn_use); -- 2.25.1