2007-03-29 [colin] 2.8.1cvs67

	* src/prefs_ext_prog.c
		The browser pref is irrelevant on Maemo

diff --git a/ChangeLog b/ChangeLog
index e479e08fc08c96ffc721449588202a18db8901dd..b06db89db3ffa1281836b551afb377f95c7e3ba9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-29 [colin]     2.8.1cvs67
+
+       * src/prefs_ext_prog.c
+               The browser pref is irrelevant on Maemo
+

 2007-03-29 [colin]     2.8.1cvs66
 
        * src/compose.c
 2007-03-29 [colin]     2.8.1cvs66
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 0f43ce5be6816594a0139c55d68b2a1fbf959360..75b31947869629ca5e3e0ff4da06ce48c000706b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2483,3 +2483,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_logging.c;  ) > 2.8.1cvs64.patchset
 ( cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/common/socket.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/socket.h;  ) > 2.8.1cvs65.patchset
 ( cvs diff -u -r 1.382.2.367 -r 1.382.2.368 src/compose.c;  cvs diff -u -r 1.50.2.33 -r 1.50.2.34 src/compose.h;  cvs diff -u -r 1.204.2.126 -r 1.204.2.127 src/prefs_common.c;  cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/common/socket.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/common/socket.h;  ) > 2.8.1cvs66.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/prefs_logging.c;  ) > 2.8.1cvs64.patchset
 ( cvs diff -u -r 1.13.2.28 -r 1.13.2.29 src/common/socket.c;  cvs diff -u -r 1.13.2.12 -r 1.13.2.13 src/common/socket.h;  ) > 2.8.1cvs65.patchset
 ( cvs diff -u -r 1.382.2.367 -r 1.382.2.368 src/compose.c;  cvs diff -u -r 1.50.2.33 -r 1.50.2.34 src/compose.h;  cvs diff -u -r 1.204.2.126 -r 1.204.2.127 src/prefs_common.c;  cvs diff -u -r 1.13.2.29 -r 1.13.2.30 src/common/socket.c;  cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/common/socket.h;  ) > 2.8.1cvs66.patchset

+( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/prefs_ext_prog.c;  ) > 2.8.1cvs67.patchset

diff --git a/configure.ac b/configure.ac
index 6b4a1c8a21138f811a7ee80aebc5e86ec8572cdd..e3210329bf7d3ff33cfb6e338baa3e8be89d670f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=66
+EXTRA_VERSION=67

 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 0586c8c69bfdb10d3a5be71a7b860ba5c2db519a..8696797389b6310d021d38b35c3bcf5b730eb4a2 100644 (file)
--- a/src/prefs_ext_prog.c
+++ b/src/prefs_ext_prog.c
@@ -116,7 +116,9 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
                         
        uri_label = gtk_label_new (_("Web browser"));
        gtk_widget_show(uri_label);
                         
        uri_label = gtk_label_new (_("Web browser"));
        gtk_widget_show(uri_label);

-
+#ifdef MAEMO
+       gtk_widget_set_sensitive(uri_label, FALSE);
+#endif

        gtk_table_attach(GTK_TABLE (table2), uri_label, 0, 1, 0, 1,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 2);
        gtk_table_attach(GTK_TABLE (table2), uri_label, 0, 1, 0, 1,
                         (GtkAttachOptions) (GTK_FILL),
                         (GtkAttachOptions) (0), 0, 2);


@@ -125,6 +127,9 @@ static void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window,
 
        uri_combo = gtk_combo_new ();
        gtk_widget_show (uri_combo);
 
        uri_combo = gtk_combo_new ();
        gtk_widget_show (uri_combo);

+#ifdef MAEMO
+       gtk_widget_set_sensitive(uri_combo, FALSE);
+#endif

        gtk_table_attach (GTK_TABLE (table2), uri_combo, 1, 2, 0, 1,
                          GTK_EXPAND | GTK_FILL, 0, 0, 0);
        gtkut_combo_set_items (GTK_COMBO (uri_combo),
        gtk_table_attach (GTK_TABLE (table2), uri_combo, 1, 2, 0, 1,
                          GTK_EXPAND | GTK_FILL, 0, 0, 0);
        gtkut_combo_set_items (GTK_COMBO (uri_combo),