? INSTALL
? depcomp
? install-sh
? intltool-modules
? missing
? help/uk/Makefile
? help/uk/Makefile.in
? help/uk/gnome-terminal-uk.omf.out
? help/uk/omf_timestamp
? src/eel/Makefile
? src/eel/Makefile.in
Index: src/gnome-terminal.glade2
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/gnome-terminal.glade2,v
retrieving revision 1.50
diff -u -p -r1.50 gnome-terminal.glade2
--- src/gnome-terminal.glade2	31 Oct 2004 22:03:53 -0000	1.50
+++ src/gnome-terminal.glade2	16 Mar 2005 20:54:58 -0000
@@ -2079,7 +2079,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkLabel" id="background-image-entry-label">
+			    <widget class="GtkLabel" id="background-image-fileentry-label">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">Image _file:</property>
 			      <property name="use_underline">True</property>
@@ -2091,7 +2091,7 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">background-image-entry</property>
+			      <property name="mnemonic_widget">background-image-fileentry</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2132,6 +2132,9 @@
 			      <property name="modal">False</property>
 			      <property name="use_filechooser">False</property>
 			      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+			      <accessibility>
+			        <atkrelation target="background-image-fileentry-label" type="labelled-by"/>
+			      </accessibility>
 
 			      <child internal-child="entry">
 				<widget class="GtkEntry" id="background-image-entry">
@@ -2144,9 +2147,6 @@
 				  <property name="has_frame">True</property>
 				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
-				  <accessibility>
-				    <atkrelation target="background-image-entry-label" type="labelled-by"/>
-				  </accessibility>
 				</widget>
 			      </child>
 			    </widget>
Index: src/profile-editor.c
===================================================================
RCS file: /cvs/gnome/gnome-terminal/src/profile-editor.c,v
retrieving revision 1.49
diff -u -p -r1.49 profile-editor.c
--- src/profile-editor.c	31 Oct 2004 07:40:20 -0000	1.49
+++ src/profile-editor.c	16 Mar 2005 20:54:59 -0000
@@ -1257,6 +1257,21 @@ terminal_profile_edit (TerminalProfile *
 }
 
 static void
+widget_and_labels_set_sensitive (GtkWidget *widget, gboolean sensitive)
+{
+  GList *labels, *i;
+
+  labels = gtk_widget_list_mnemonic_labels (widget);
+  for (i = labels; i; i = i->next)
+  {
+    gtk_widget_set_sensitive (GTK_WIDGET (i->data), sensitive);
+  }
+  g_list_free (labels);
+
+  gtk_widget_set_sensitive (widget, sensitive);
+}
+
+static void
 set_insensitive (GtkWidget  *editor,
                  const char *widget_name,
                  gboolean    setting)
@@ -1265,7 +1280,7 @@ set_insensitive (GtkWidget  *editor,
 
   w = profile_editor_get_widget (editor, widget_name);
 
-  gtk_widget_set_sensitive (w, !setting);
+  widget_and_labels_set_sensitive (w, !setting);
 }
 
 static void
@@ -1291,37 +1306,27 @@ profile_editor_update_sensitivity (GtkWi
   /* This one can't be short-circuited by the cache, since
    * it depends on settings
    */
-  w = profile_editor_get_widget (editor, "custom-command-entry");
-  gtk_widget_set_sensitive (w,
-                            !((mask->custom_command) ||
-                              !terminal_profile_get_use_custom_command (profile))); 
+  set_insensitive (editor,
+                   "custom-command-entry",
+                   mask->custom_command ||
+                     !terminal_profile_get_use_custom_command (profile));
   if (terminal_profile_get_background_type (profile) == TERMINAL_BACKGROUND_IMAGE)
     {
-      w = profile_editor_get_widget (editor, "background-image-fileentry");
-      gtk_widget_set_sensitive (w, !(mask->background_image_file));
-      w = profile_editor_get_widget (editor, "scroll-background-checkbutton");
-      gtk_widget_set_sensitive (w, !(mask->scroll_background));
-      w = profile_editor_get_widget (editor, "darken-background-vbox");
-      gtk_widget_set_sensitive (w, !(mask->background_darkness));
+      set_insensitive (editor, "background-image-fileentry", mask->background_image_file);
+      set_insensitive (editor, "scroll-background-checkbutton", mask->scroll_background);
+      set_insensitive (editor, "darken-background-vbox", mask->background_darkness);
     }
   else if (terminal_profile_get_background_type (profile) == TERMINAL_BACKGROUND_TRANSPARENT) 
   {
-      w = profile_editor_get_widget (editor, "darken-background-vbox");
-      gtk_widget_set_sensitive (w, !(mask->background_darkness));
-      w = profile_editor_get_widget (editor, "background-image-fileentry");
-      gtk_widget_set_sensitive (w, FALSE);
-      w = profile_editor_get_widget (editor, "scroll-background-checkbutton");
-      gtk_widget_set_sensitive (w, FALSE);
-      
+      set_insensitive (editor, "darken-background-vbox", mask->background_darkness);
+      set_insensitive (editor, "background-image-fileentry", TRUE);
+      set_insensitive (editor, "scroll-background-checkbutton", TRUE);
     }
   else
     {
-      w = profile_editor_get_widget (editor, "background-image-fileentry");
-      gtk_widget_set_sensitive (w, FALSE);
-      w = profile_editor_get_widget (editor, "scroll-background-checkbutton");
-      gtk_widget_set_sensitive (w, FALSE);
-      w = profile_editor_get_widget (editor, "darken-background-vbox");
-      gtk_widget_set_sensitive (w, FALSE);
+      set_insensitive (editor, "background-image-fileentry", TRUE);
+      set_insensitive (editor, "scroll-background-checkbutton", TRUE);
+      set_insensitive (editor, "darken-background-vbox", TRUE);
     }
 
   if (!terminal_profile_get_use_system_font (profile))
@@ -1333,8 +1338,7 @@ profile_editor_update_sensitivity (GtkWi
     }
   else
     {
-      w = profile_editor_get_widget (editor, "font-hbox");
-      gtk_widget_set_sensitive (w, FALSE);
+      set_insensitive (editor, "font-hbox", TRUE);
     }
 
 
