2007-07-23 [colin] 2.10.0cvs55

	* src/addr_compl.c
		Fix auto-completion on Maemo

diff --git a/ChangeLog b/ChangeLog
index 9568f35b522e647435a04118e422d853e2937457..9cad4cb3fea7475c7d0313146a7eebf706a712bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-23 [colin]     2.10.0cvs55
+
+       * src/addr_compl.c
+               Fix auto-completion on Maemo
+
 2007-07-23 [colin]     2.10.0cvs54
 
        * src/statusbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 71fa318ccbda3acc3432970f2d958f61efb5c8d5..248bdb7978f0fe33d62f8f0963081c1b3c9a7c83 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2708,3 +2708,4 @@
 ( cvs diff -u -r 1.2.2.24 -r 1.2.2.25 src/news_gtk.c;  ) > 2.10.0cvs52.patchset
 ( cvs diff -u -r 1.115.2.160 -r 1.115.2.161 src/main.c;  ) > 2.10.0cvs53.patchset
 ( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/statusbar.c;  ) > 2.10.0cvs54.patchset
+( cvs diff -u -r 1.27.2.37 -r 1.27.2.38 src/addr_compl.c;  ) > 2.10.0cvs55.patchset

diff --git a/configure.ac b/configure.ac
index c330c0efb218f96979790d6f89cf0b1cc1073308..9126688ed00c2249d50bdf5ae7c8b3f030594d80 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addr_compl.c b/src/addr_compl.c
index f0c12f52cde75a13cc00ae2d7263535a9e63b900..4365606ae287f052d9240080aff10d5886507007 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -929,11 +929,13 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
                /* Select first row for now */
                gtk_tree_selection_select_iter(selection, &iter);
        }
+#ifndef MAEMO
        else if( cw->listCount == 2 ) {
                gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
                /* Move off first row */
                gtk_tree_selection_select_iter(selection, &iter);
        }
+#endif
 }
 
 /**
@@ -1288,7 +1290,7 @@ static gboolean address_completion_complete_address_in_entry(GtkEntry *entry,
                new = get_next_complete_address();
                g_free( new );
        }
-#ifndef USE_LDAP
+#if (!defined(USE_LDAP) && !defined(MAEMO))
        /* Select the address if there is only one match */
        if (ncount == 2) {
                /* Display selected address in entry field */