From 08c30c756fe367570c919be8ef7f8f40dac15184 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Thu, 18 Jan 2007 17:38:28 +0000 Subject: [PATCH] 2007-01-18 [wwp] 2.7.1cvs24 * src/editaddress.c complete 2.7.1.cvs23 (file was missing from previous commit). --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/editaddress.c | 5 ++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffdfa1da4..ed9a5cc6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-18 [wwp] 2.7.1cvs24 + + * src/editaddress.c + complete 2.7.1.cvs23 (file was missing from previous + commit). + 2007-01-18 [wwp] 2.7.1cvs23 * src/addressbook.c diff --git a/PATCHSETS b/PATCHSETS index 656839f64..1412ea797 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2281,3 +2281,4 @@ ( cvs diff -u -r 1.17.2.13 -r 1.17.2.14 po/ru.po; ) > 2.7.1cvs21.patchset ( cvs diff -u -r 1.115.2.124 -r 1.115.2.125 src/main.c; ) > 2.7.1cvs22.patchset ( cvs diff -u -r 1.60.2.75 -r 1.60.2.76 src/addressbook.c; ) > 2.7.1cvs23.patchset +( cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/editaddress.c; ) > 2.7.1cvs24.patchset diff --git a/configure.ac b/configure.ac index c827afefb..6c7563b3f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=23 +EXTRA_VERSION=24 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/editaddress.c b/src/editaddress.c index 9a04f8b6a..91aad647e 100644 --- a/src/editaddress.c +++ b/src/editaddress.c @@ -1155,7 +1155,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl ) static void addressbook_edit_person_create( GtkWidget *parent, gboolean *cancelled ) { if (prefs_common.addressbook_use_editaddress_dialog) - addressbook_edit_person_dialog_create( cancelled ); + addressbook_edit_person_dialog_create( cancelled ); else addressbook_edit_person_widgetset_create( parent, cancelled ); addressbook_edit_person_page_basic( PAGE_BASIC, _( "_User Data" ) ); @@ -1357,6 +1357,9 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_fo gtk_widget_show(personeditdlg.container); if (prefs_common.addressbook_use_editaddress_dialog) manage_window_set_transient(GTK_WINDOW(personeditdlg.container)); + else + if (get_focus) + addressbook_address_list_disable_some_actions(); /* Clear all fields */ personeditdlg.rowIndEMail = -1; -- 2.25.1