2010-01-23 [pawel] 3.7.4cvs10
authorPaweł Pękala <c0rn@gazeta.pl>
Sat, 23 Jan 2010 14:44:06 +0000 (14:44 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Sat, 23 Jan 2010 14:44:06 +0000 (14:44 +0000)
* src/addressbook.c
Fix button sensitivity in compose mode

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c

index cc2137f..781998a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-23 [pawel]     3.7.4cvs10
+
+       * src/addressbook.c
+               Fix button sensitivity in compose mode
+
 2010-01-23 [pawel]     3.7.4cvs9
 
        * commitHelper
index f7ec6b2..678f95f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.4.2.9 -r 1.4.2.10 autogen.sh;  cvs diff -u -r 1.654.2.4008 -r 1.654.2.4009 configure.ac;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/wizard.c;  ) > 3.7.4cvs7.patchset
 ( cvs diff -u -r 1.105.2.156 -r 1.105.2.157 src/prefs_account.c;  cvs diff -u -r 1.59.2.80 -r 1.59.2.81 src/prefs_filtering.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_send.c;  cvs diff -u -r 1.2.2.27 -r 1.2.2.28 src/gtk/colorlabel.c;  ) > 3.7.4cvs8.patchset
 ( cvs diff -u -r 1.1.2.38 -r 1.1.2.39 commitHelper;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/install.sh;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 tools/make.themes.project;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/nautilus2claws-mail.sh;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/popfile-link.sh;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 tools/textviewer.sh;  ) > 3.7.4cvs9.patchset
+( cvs diff -u -r 1.60.2.135 -r 1.60.2.136 src/addressbook.c;  ) > 3.7.4cvs10.patchset
index d19c518..6441b85 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 94405df..f9161ec 100644 (file)
@@ -665,7 +665,6 @@ void addressbook_destroy( void ) {
 void addressbook_set_target_compose(Compose *target)
 {
        addrbook.target_compose = target;
-       addressbook_button_set_sensitive();
 }
 
 Compose *addressbook_get_target_compose(void)
@@ -1409,25 +1408,6 @@ static void addressbook_ds_show_message( AddressDataSource *ds ) {
        addressbook_status_show( addressbook_msgbuf );
 }
 
-static void addressbook_button_set_sensitive(void)
-{
-       gboolean to_sens  = FALSE;
-       gboolean cc_sens  = FALSE;
-       gboolean bcc_sens = FALSE;
-
-       if (!addrbook.window) return;
-
-       if (addrbook.target_compose) {
-               to_sens = TRUE;
-               cc_sens = TRUE;
-               bcc_sens = TRUE;
-       }
-
-       gtk_widget_set_sensitive(addrbook.to_btn, to_sens);
-       gtk_widget_set_sensitive(addrbook.cc_btn, cc_sens);
-       gtk_widget_set_sensitive(addrbook.bcc_btn, bcc_sens);
-}
-
 static void addressbook_edit_clicked(GtkButton *button, gpointer data)
 {
        addressbook_edit_address_cb(NULL, NULL);
@@ -2134,6 +2114,11 @@ static void addressbook_list_menu_setup( void ) {
        gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
        gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
 
+       if (addrbook.target_compose) {
+               gtk_widget_set_sensitive(addrbook.to_btn, obj ? TRUE : FALSE);  
+               gtk_widget_set_sensitive(addrbook.cc_btn, obj ? TRUE : FALSE);
+               gtk_widget_set_sensitive(addrbook.bcc_btn, obj ? TRUE : FALSE);
+       }
 #ifdef USE_LDAP
        cm_menu_set_sensitive_full( addrbook.ui_manager, "Popups/ABListPopup/BrowseEntry",    canBrowse );
 #endif