( cvs diff -u -r 1.654.2.945 -r 1.654.2.946 configure.ac; cvs diff -u -r 1.12.2.5 -r 1.12.2.6 po/en_GB.po; cvs diff -u -r 1.23.2.14 -r 1.23.2.15 src/crash.c; cvs diff -u -r 1.11.2.1 -r 1.11.2.2 src/manual.c; cvs diff -u -r 1.3.2.30 -r 1.3.2.31 src/prefs_themes.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/wizard.c; cvs diff -u -r 1.9.2.17 -r 1.9.2.18 src/common/defs.h; cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/gtk/menu.c; ) > 1.9.15cvs66.patchset
( cvs diff -u -r 1.61.2.38 -r 1.61.2.39 src/account.c; cvs diff -u -r 1.105.2.39 -r 1.105.2.40 src/prefs_account.c; cvs diff -u -r 1.204.2.65 -r 1.204.2.66 src/prefs_common.c; cvs diff -u -r 1.103.2.33 -r 1.103.2.34 src/prefs_common.h; cvs diff -u -r 1.52.2.14 -r 1.52.2.15 src/prefs_folder_item.c; cvs diff -u -r 1.10.2.14 -r 1.10.2.15 src/prefs_gtk.c; cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.22 -r 1.12.2.23 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.4 -r 1.7.2.5 src/gtk/prefswindow.h; ) > 1.9.15cvs67.patchset
( cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/ssl_manager.c; ) > 1.9.15cvs68.patchset
+( cvs diff -u -r 1.27.2.14 -r 1.27.2.15 src/addr_compl.c; cvs diff -u -r 1.179.2.79 -r 1.179.2.80 src/imap.c; ) > 1.9.15cvs69.patchset
{
completion_entry *ce1;
ce1 = g_new0(completion_entry, 1),
- ce1->string = g_utf8_strdown(str, -1);
/* GCompletion list is case sensitive */
- g_strdown(ce1->string);
+ ce1->string = g_utf8_strdown(str, -1);
ce1->ref = ae;
g_completion_list = g_list_prepend(g_completion_list, ce1);
}
}
-#if 0
-/* completion_window_accept_selection() - accepts the current selection in the
- * clist, and destroys the window */
-static void completion_window_accept_selection(GtkWidget **window,
- GtkCList *clist,
- GtkEntry *entry)
-{
- gchar *address = NULL, *text = NULL;
- gint cursor_pos, row;
-
- g_return_if_fail(window != NULL);
- g_return_if_fail(*window != NULL);
- g_return_if_fail(clist != NULL);
- g_return_if_fail(entry != NULL);
- g_return_if_fail(clist->selection != NULL);
-
- /* FIXME: I believe it's acceptable to access the selection member directly */
- row = GPOINTER_TO_INT(clist->selection->data);
-
- /* we just need the cursor position */
- address = get_address_from_edit(entry, &cursor_pos);
- g_free(address);
- gtk_clist_get_text(clist, row, 0, &text);
- replace_address_in_edit(entry, text, cursor_pos);
-
- clear_completion_cache();
- gtk_widget_destroy(*window);
- *window = NULL;
-}
-#endif
-
/**
* Resize window to accommodate maximum number of address entries.
* \param cw Completion window.
g_free( new );
}
+#ifndef USE_LDAP
/* Select the address if there is only one match */
if (ncount == 2) {
/* Display selected address in entry field */
clear_completion_cache();
}
/* Make sure that drop-down appears uniform! */
- else if( ncount == 0 ) {
+ else
+#endif
+ if( ncount == 0 ) {
addrcompl_add_queue( g_strdup( searchTerm ) );
}
g_free( searchTerm );