Use fix bug #3787 for specifying format as well

diff --git a/src/plugins/archive/archiver_gtk.c b/src/plugins/archive/archiver_gtk.c
index e3123fa23a26e3d110c150670467e7b852d1cba3..19a842d12a890efc7121de187a1e29191a393fd4 100644 (file)
--- a/src/plugins/archive/archiver_gtk.c
+++ b/src/plugins/archive/archiver_gtk.c
@@ -1235,29 +1235,25 @@ void archiver_gtk_show() {
        tar_radio_btn = gtk_radio_button_new_with_mnemonic(NULL, "_TAR");
        gtk_widget_set_name(tar_radio_btn, "TAR");
        gtk_box_pack_start(GTK_BOX(hbox1), tar_radio_btn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(tar_radio_btn,
-                       _("Choose this option to use TAR as format for the archive"));
+       archiver_set_tooltip(tar_radio_btn, g_strdup_printf(_("Choose this to use %s as format for the archive"), "TAR"));
 
        shar_radio_btn = gtk_radio_button_new_with_mnemonic_from_widget(
                                        GTK_RADIO_BUTTON(tar_radio_btn), "S_HAR");
        gtk_widget_set_name(shar_radio_btn, "SHAR");
        gtk_box_pack_start(GTK_BOX(hbox1), shar_radio_btn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(shar_radio_btn,
-                       _("Choose this to use SHAR as format for the archive"));
+       archiver_set_tooltip(shar_radio_btn, g_strdup_printf(_("Choose this to use %s as format for the archive"), "SHAR"));
 
        cpio_radio_btn = gtk_radio_button_new_with_mnemonic_from_widget(
                                        GTK_RADIO_BUTTON(tar_radio_btn), "CP_IO");
        gtk_widget_set_name(cpio_radio_btn, "CPIO");
        gtk_box_pack_start(GTK_BOX(hbox1), cpio_radio_btn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(cpio_radio_btn,
-               _("Choose this option to use CPIO as format for the archive"));
+       archiver_set_tooltip(cpio_radio_btn, g_strdup_printf(_("Choose this to use %s as format for the archive"), "CPIO"));
 
        pax_radio_btn = gtk_radio_button_new_with_mnemonic_from_widget(
                                        GTK_RADIO_BUTTON(tar_radio_btn), "PA_X");
        gtk_widget_set_name(pax_radio_btn, "PAX");
        gtk_box_pack_start(GTK_BOX(hbox1), pax_radio_btn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(pax_radio_btn,
-               _("Choose this option to use PAX as format for the archive"));
+       archiver_set_tooltip(pax_radio_btn, g_strdup_printf(_("Choose this to use %s as format for the archive"), "PAX"));
 
        page->archive_formats = 
                        gtk_radio_button_get_group(GTK_RADIO_BUTTON(tar_radio_btn));

diff --git a/src/plugins/archive/archiver_prefs.c b/src/plugins/archive/archiver_prefs.c
index 8d8340ccf90e6976057b5db5468e6c4e2578b2de..fdda401066629a6a9e31027faf183ccd5e545502 100644 (file)
--- a/src/plugins/archive/archiver_prefs.c
+++ b/src/plugins/archive/archiver_prefs.c
@@ -371,29 +371,25 @@ static void create_archiver_prefs_page(PrefsPage * _page,
        format_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(tar_radiobtn));
        gtk_widget_show(tar_radiobtn);
        gtk_box_pack_start(GTK_BOX (hbox1), tar_radiobtn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(tar_radiobtn,
-                       _("Choose this option to use the TAR format by default"));
+       archiver_set_tooltip(tar_radiobtn, g_strdup_printf(_("Choose this option to use the %s as format by default"), "TAR"));
 
        shar_radiobtn = gtk_radio_button_new_with_label(format_group, "SHAR");
        format_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(shar_radiobtn));
        gtk_widget_show(shar_radiobtn);
        gtk_box_pack_start(GTK_BOX (hbox1), shar_radiobtn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(shar_radiobtn,
-                       _("Choose this option to use the SHAR format by default"));
+       archiver_set_tooltip(shar_radiobtn, g_strdup_printf(_("Choose this option to use the %s as format by default"), "SHAR"));
 
        cpio_radiobtn = gtk_radio_button_new_with_label(format_group, "CPIO");
        format_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(cpio_radiobtn));
        gtk_widget_show(cpio_radiobtn);
        gtk_box_pack_start(GTK_BOX (hbox1), cpio_radiobtn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(cpio_radiobtn,
-                       _("Choose this option to use the CPIO format by default"));
+       archiver_set_tooltip(cpio_radiobtn, g_strdup_printf(_("Choose this option to use the %s as format by default"), "CPIO"));
 
        pax_radiobtn = gtk_radio_button_new_with_label(format_group, "PAX");
        format_group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(pax_radiobtn));
        gtk_widget_show(pax_radiobtn);
        gtk_box_pack_start(GTK_BOX (hbox1), pax_radiobtn, FALSE, FALSE, 0);
-       CLAWS_SET_TIP(pax_radiobtn,
-                       _("Choose this option to use the PAX format by default"));
+       archiver_set_tooltip(pax_radiobtn, g_strdup_printf(_("Choose this option to use the %s as format by default"), "PAX"));
 
        switch (archiver_prefs.format) {
        case FORMAT_TAR: