balsa r7842 - in trunk: . libbalsa src

[PeterB svn gnome org]

Author: PeterB
Date: Fri Feb  8 16:06:42 2008
New Revision: 7842
URL: http://svn.gnome.org/viewvc/balsa?rev=7842&view=rev

Log:
work around warnings from Gtk

Modified:
   trunk/ChangeLog
   trunk/libbalsa/libbalsa.c
   trunk/src/balsa-message.c

Modified: trunk/libbalsa/libbalsa.c
==============================================================================
--- trunk/libbalsa/libbalsa.c	(original)
+++ trunk/libbalsa/libbalsa.c	Fri Feb  8 16:06:42 2008
@@ -750,9 +750,7 @@
     self = pthread_self();
 
     if (libbalsa_threads_lock == 0 || self != libbalsa_threads_id) {
-#if WARN_ABOUT_THREADS_ERRORS
         g_warning("%s: Not holding gdk lock!!!", __func__);
-#endif                          /* WARN_ABOUT_THREADS_ERRORS */
 	return;
     }
 

Modified: trunk/src/balsa-message.c
==============================================================================
--- trunk/src/balsa-message.c	(original)
+++ trunk/src/balsa-message.c	Fri Feb  8 16:06:42 2008
@@ -431,7 +431,9 @@
     }
 
     if (found) {
+#if CAN_HIDE_SEPARATOR_WITHOUT_TRIGGERING_CRITICAL_WARNINGS
         gtk_widget_hide(bm->find_sep);
+#endif
         gtk_widget_hide(bm->find_label);
         gtk_widget_set_sensitive(bm->find_prev, TRUE);
         gtk_widget_set_sensitive(bm->find_next, TRUE);
@@ -469,7 +471,9 @@
     }
 
     if (found) {
+#if CAN_HIDE_SEPARATOR_WITHOUT_TRIGGERING_CRITICAL_WARNINGS
         gtk_widget_hide(bm->find_sep);
+#endif
         gtk_widget_hide(bm->find_label);
     } else {
         if (find_forward) {
@@ -571,7 +575,7 @@
         return res;
     case GDK_g:
         if ((event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) ==
-            GDK_CONTROL_MASK) {
+            GDK_CONTROL_MASK && GTK_WIDGET_SENSITIVE(bm->find_next)) {
             bm_find_again(bm, bm->find_forward);
             return res;
         }
@@ -3126,7 +3130,9 @@
                                  "key-press-event",
                                  G_CALLBACK(bm_pass_to_find_entry), bm);
 
+#if CAN_HIDE_SEPARATOR_WITHOUT_TRIGGERING_CRITICAL_WARNINGS
         gtk_widget_hide(bm->find_sep);
+#endif
         gtk_widget_hide(bm->find_label);
 
         gtk_widget_set_sensitive(bm->find_prev, FALSE);