2006-06-28 [paul] 2.3.1cvs29

	* src/prefs_ext_prog.c
		fix engrish and add a tooltip for the
		'command for 'Display as text' option

diff --git a/ChangeLog b/ChangeLog
index cd7a26e67f4d7b620bda5f081fb427dd4fddcec7..512ea49ef3b50afd7ed37c1c2858cd267ce22a7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-28 [paul]      2.3.1cvs29
+
+       * src/prefs_ext_prog.c
+               fix engrish and add a tooltip for the
+               'command for 'Display as text' option
+

 2006-06-28 [paul]
 
        2.4.0-rc1 released
 2006-06-28 [paul]
 
        2.4.0-rc1 released

diff --git a/PATCHSETS b/PATCHSETS
index 86c6beb4fc03f0973841a6966dac081ff39d9ac0..13e6fe85c7a2a459b81c9e9db6b6c9325011a603 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1629,3 +1629,4 @@
 ( cvs diff -u -r 1.382.2.287 -r 1.382.2.288 src/compose.c;  diff -u /dev/null tools/textviewer.pl;  ) > 2.3.1cvs26.patchset
 ( cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/prefs_ext_prog.c;  ) > 2.3.1cvs27.patchset
 ( cvs diff -u -r 1.396.2.713 -r 1.396.2.714 ChangeLog;  cvs diff -u -r 1.25.2.9 -r 1.25.2.10 tools/Makefile.am;  ) > 2.3.1cvs28.patchset
 ( cvs diff -u -r 1.382.2.287 -r 1.382.2.288 src/compose.c;  diff -u /dev/null tools/textviewer.pl;  ) > 2.3.1cvs26.patchset
 ( cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/prefs_ext_prog.c;  ) > 2.3.1cvs27.patchset
 ( cvs diff -u -r 1.396.2.713 -r 1.396.2.714 ChangeLog;  cvs diff -u -r 1.25.2.9 -r 1.25.2.10 tools/Makefile.am;  ) > 2.3.1cvs28.patchset

+( cvs diff -u -r 1.3.2.9 -r 1.3.2.10 src/prefs_ext_prog.c;  ) > 2.3.1cvs29.patchset

diff --git a/configure.ac b/configure.ac
index 71658252f518f1f8ddfb85446260de050b97474d..0e0e600004858e20943a1512de94b2434966b388 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=28
+EXTRA_VERSION=29

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c
index db06a46d5964caa03421b6d04fc93009658b5c6a..4ddd994a219888b38bdf28b2e8c69e573c8cedce 100644 (file)
--- a/src/prefs_ext_prog.c
+++ b/src/prefs_ext_prog.c
@@ -90,6 +90,9 @@ void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *audio_player_entry;
        GtkWidget *printcmd_label;
        GtkWidget *printcmd_entry;
        GtkWidget *audio_player_entry;
        GtkWidget *printcmd_label;
        GtkWidget *printcmd_entry;

+       GtkTooltips *tooltip;
+
+       tooltip = gtk_tooltips_new();

 
        table = gtk_table_new(2, 1, FALSE);
        gtk_widget_show(table);
 
        table = gtk_table_new(2, 1, FALSE);
        gtk_widget_show(table);


@@ -195,7 +198,7 @@ void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_entry_set_text(GTK_ENTRY(image_viewer_entry), 
                           prefs_common.mime_image_viewer ? prefs_common.mime_image_viewer : "");
 
        gtk_entry_set_text(GTK_ENTRY(image_viewer_entry), 
                           prefs_common.mime_image_viewer ? prefs_common.mime_image_viewer : "");
 

-       astextviewer_label = gtk_label_new(_("View as text command"));
+       astextviewer_label = gtk_label_new(_("Command for 'Display as text'"));

        gtk_widget_show(astextviewer_label);
 
        gtk_table_attach(GTK_TABLE (table2), astextviewer_label, 0, 1, 3, 4,
        gtk_widget_show(astextviewer_label);
 
        gtk_table_attach(GTK_TABLE (table2), astextviewer_label, 0, 1, 3, 4,


@@ -206,6 +209,11 @@ void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
 
        astextviewer_entry = gtk_entry_new ();
        gtk_widget_show(astextviewer_entry);
 
        astextviewer_entry = gtk_entry_new ();
        gtk_widget_show(astextviewer_entry);

+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltip), astextviewer_entry,
+                            _("This option enables MIME parts to be displayed in the "
+                              "message view via a script when using the 'Display as text' "
+                              "contextual menu item"),
+                            NULL);

        
        gtk_table_attach(GTK_TABLE (table2), astextviewer_entry, 1, 2, 3, 4,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
        
        gtk_table_attach(GTK_TABLE (table2), astextviewer_entry, 1, 2, 3, 4,
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),