*** straw-0.24/glade/straw.glade	2004-07-07 05:08:49.000000000 -0400
--- mystraw/glade/straw.glade	2004-07-07 10:30:12.244490550 -0400
***************
*** 735,755 ****
  	  <property name="spacing">0</property>
  
  	  <child>
! 	    <widget class="GtkHPaned" id="main_main_pane">
  	      <property name="visible">True</property>
! 	      <property name="can_focus">True</property>
! 	      <property name="position">200</property>
! 	      <signal name="size_allocate" handler="on_main_main_pane_size_allocate" last_modification_time="Sat, 19 Jul 2003 21:33:14 GMT"/>
  
  	      <child>
! 		<widget class="GtkVBox" id="feed_selection_vbox">
  		  <property name="visible">True</property>
  		  <property name="homogeneous">False</property>
! 		  <property name="spacing">0</property>
  
  		  <child>
! 		    <widget class="GtkHBox" id="hbox76">
  		      <property name="visible">True</property>
  		      <property name="homogeneous">False</property>
  		      <property name="spacing">0</property>
  
--- 735,756 ----
  	  <property name="spacing">0</property>
  
  	  <child>
! 	    <widget class="GtkHBox" id="hbox79">
  	      <property name="visible">True</property>
! 	      <property name="homogeneous">False</property>
! 	      <property name="spacing">0</property>
  
  	      <child>
! 		<widget class="GtkVBox" id="vbox11">
  		  <property name="visible">True</property>
  		  <property name="homogeneous">False</property>
! 		  <property name="spacing">1</property>
  
  		  <child>
! 		    <widget class="GtkVBox" id="vbox58">
! 		      <property name="height_request">128</property>
  		      <property name="visible">True</property>
+ 		      <property name="can_focus">True</property>
  		      <property name="homogeneous">False</property>
  		      <property name="spacing">0</property>
  
***************
*** 758,830 ****
  			  <property name="visible">True</property>
  			  <property name="label" translatable="yes">_Subscriptions:</property>
  			  <property name="use_underline">True</property>
! 			  <property name="use_markup">True</property>
  			  <property name="justify">GTK_JUSTIFY_LEFT</property>
  			  <property name="wrap">False</property>
  			  <property name="selectable">False</property>
  			  <property name="xalign">0</property>
  			  <property name="yalign">0</property>
! 			  <property name="xpad">2</property>
  			  <property name="ypad">0</property>
  			  <property name="mnemonic_widget">feed_selection_treeview</property>
  			  <accelerator key="S" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
  			</widget>
  			<packing>
! 			  <property name="padding">2</property>
  			  <property name="expand">False</property>
  			  <property name="fill">False</property>
  			</packing>
  		      </child>
- 		    </widget>
- 		    <packing>
- 		      <property name="padding">6</property>
- 		      <property name="expand">False</property>
- 		      <property name="fill">True</property>
- 		    </packing>
- 		  </child>
- 
- 		  <child>
- 		    <widget class="GtkScrolledWindow" id="scrolledwindow2">
- 		      <property name="visible">True</property>
- 		      <property name="can_focus">True</property>
- 		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- 		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- 		      <property name="shadow_type">GTK_SHADOW_IN</property>
- 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
  
  		      <child>
! 			<widget class="GtkTreeView" id="feed_selection_treeview">
  			  <property name="visible">True</property>
  			  <property name="can_focus">True</property>
! 			  <property name="headers_visible">False</property>
! 			  <property name="rules_hint">False</property>
! 			  <property name="reorderable">True</property>
! 			  <property name="enable_search">True</property>
! 			  <signal name="row_expanded" handler="on_feed_selection_treeview_row_expanded" last_modification_time="Sat, 29 Nov 2003 17:46:41 GMT"/>
! 			  <signal name="row_collapsed" handler="on_feed_selection_treeview_row_collapsed" last_modification_time="Sat, 29 Nov 2003 17:46:54 GMT"/>
! 			</widget>
! 		      </child>
! 		    </widget>
! 		    <packing>
! 		      <property name="padding">0</property>
! 		      <property name="expand">True</property>
! 		      <property name="fill">True</property>
! 		    </packing>
! 		  </child>
! 
! 		  <child>
! 		    <widget class="GtkVBox" id="feed_info_container">
! 		      <property name="homogeneous">False</property>
! 		      <property name="spacing">6</property>
! 
! 		      <child>
! 			<widget class="GtkHBox" id="feed_info_title_hbox">
! 			  <property name="visible">True</property>
! 			  <property name="homogeneous">False</property>
! 			  <property name="spacing">0</property>
  
  			  <child>
! 			    <placeholder/>
  			  </child>
  			</widget>
  			<packing>
--- 759,803 ----
  			  <property name="visible">True</property>
  			  <property name="label" translatable="yes">_Subscriptions:</property>
  			  <property name="use_underline">True</property>
! 			  <property name="use_markup">False</property>
  			  <property name="justify">GTK_JUSTIFY_LEFT</property>
  			  <property name="wrap">False</property>
  			  <property name="selectable">False</property>
  			  <property name="xalign">0</property>
  			  <property name="yalign">0</property>
! 			  <property name="xpad">0</property>
  			  <property name="ypad">0</property>
  			  <property name="mnemonic_widget">feed_selection_treeview</property>
  			  <accelerator key="S" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
  			</widget>
  			<packing>
! 			  <property name="padding">0</property>
  			  <property name="expand">False</property>
  			  <property name="fill">False</property>
  			</packing>
  		      </child>
  
  		      <child>
! 			<widget class="GtkScrolledWindow" id="scrolledwindow2">
  			  <property name="visible">True</property>
  			  <property name="can_focus">True</property>
! 			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 			  <property name="shadow_type">GTK_SHADOW_IN</property>
! 			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
  
  			  <child>
! 			    <widget class="GtkTreeView" id="feed_selection_treeview">
! 			      <property name="height_request">128</property>
! 			      <property name="visible">True</property>
! 			      <property name="can_focus">True</property>
! 			      <property name="headers_visible">False</property>
! 			      <property name="rules_hint">False</property>
! 			      <property name="reorderable">True</property>
! 			      <property name="enable_search">True</property>
! 			      <signal name="row_expanded" handler="on_feed_selection_treeview_row_expanded" last_modification_time="Sat, 29 Nov 2003 17:46:41 GMT"/>
! 			      <signal name="row_collapsed" handler="on_feed_selection_treeview_row_collapsed" last_modification_time="Sat, 29 Nov 2003 17:46:54 GMT"/>
! 			    </widget>
  			  </child>
  			</widget>
  			<packing>
***************
*** 833,1282 ****
  			  <property name="fill">True</property>
  			</packing>
  		      </child>
  
  		      <child>
! 			<widget class="GtkHBox" id="hbox82">
  			  <property name="visible">True</property>
! 			  <property name="homogeneous">False</property>
! 			  <property name="spacing">0</property>
! 
! 			  <child>
! 			    <placeholder/>
! 			  </child>
  			</widget>
  			<packing>
! 			  <property name="padding">0</property>
  			  <property name="expand">True</property>
  			  <property name="fill">True</property>
  			</packing>
  		      </child>
  
  		      <child>
! 			<widget class="GtkHBox" id="hbox81">
! 			  <property name="visible">True</property>
! 			  <property name="homogeneous">False</property>
! 			  <property name="spacing">0</property>
! 
! 			  <child>
! 			    <placeholder/>
! 			  </child>
  			</widget>
  			<packing>
! 			  <property name="padding">0</property>
! 			  <property name="expand">True</property>
! 			  <property name="fill">True</property>
  			</packing>
  		      </child>
  		    </widget>
  		    <packing>
! 		      <property name="padding">6</property>
  		      <property name="expand">False</property>
! 		      <property name="fill">True</property>
  		    </packing>
  		  </child>
- 		</widget>
- 		<packing>
- 		  <property name="shrink">True</property>
- 		  <property name="resize">False</property>
- 		</packing>
- 	      </child>
- 
- 	      <child>
- 		<widget class="GtkHBox" id="hbox79">
- 		  <property name="visible">True</property>
- 		  <property name="homogeneous">False</property>
- 		  <property name="spacing">0</property>
  
  		  <child>
! 		    <widget class="GtkVBox" id="vbox11">
  		      <property name="visible">True</property>
! 		      <property name="homogeneous">False</property>
! 		      <property name="spacing">1</property>
  
  		      <child>
! 			<widget class="GtkHBox" id="hbox104">
! 			  <property name="border_width">5</property>
  			  <property name="visible">True</property>
! 			  <property name="homogeneous">False</property>
! 			  <property name="spacing">8</property>
  
  			  <child>
! 			    <widget class="GtkLabel" id="feed_item_label">
  			      <property name="visible">True</property>
! 			      <property name="label" translatable="yes">_Articles:</property>
! 			      <property name="use_underline">True</property>
! 			      <property name="use_markup">True</property>
! 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
! 			      <property name="wrap">True</property>
! 			      <property name="selectable">False</property>
! 			      <property name="xalign">0</property>
! 			      <property name="yalign">0</property>
! 			      <property name="xpad">2</property>
! 			      <property name="ypad">0</property>
! 			      <property name="mnemonic_widget">item_selection_treeview</property>
  			    </widget>
  			    <packing>
! 			      <property name="padding">1</property>
! 			      <property name="expand">True</property>
! 			      <property name="fill">True</property>
  			    </packing>
  			  </child>
  
  			  <child>
! 			    <widget class="GtkLabel" id="feed_refresh_label">
! 			      <property name="label" translatable="yes">_Next Refresh:</property>
! 			      <property name="use_underline">True</property>
! 			      <property name="use_markup">True</property>
! 			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
  			      <property name="wrap">False</property>
  			      <property name="selectable">False</property>
! 			      <property name="xalign">0</property>
! 			      <property name="yalign">0</property>
! 			      <property name="xpad">2</property>
  			      <property name="ypad">0</property>
- 			      <property name="mnemonic_widget">item_selection_treeview</property>
  			    </widget>
  			    <packing>
! 			      <property name="padding">1</property>
! 			      <property name="expand">False</property>
! 			      <property name="fill">False</property>
  			    </packing>
  			  </child>
- 			</widget>
- 			<packing>
- 			  <property name="padding">0</property>
- 			  <property name="expand">False</property>
- 			  <property name="fill">False</property>
- 			</packing>
- 		      </child>
- 
- 		      <child>
- 			<widget class="GtkVPaned" id="main_sub_pane">
- 			  <property name="visible">True</property>
- 			  <property name="can_focus">True</property>
- 			  <property name="position">1</property>
- 			  <signal name="size_allocate" handler="on_main_sub_pane_size_allocate" last_modification_time="Sat, 19 Jul 2003 21:53:54 GMT"/>
  
  			  <child>
! 			    <widget class="GtkNotebook" id="mode_view_notebook">
  			      <property name="visible">True</property>
! 			      <property name="show_tabs">False</property>
! 			      <property name="show_border">False</property>
! 			      <property name="tab_pos">GTK_POS_TOP</property>
! 			      <property name="scrollable">False</property>
! 			      <property name="enable_popup">False</property>
  
  			      <child>
! 				<widget class="GtkVBox" id="vbox33">
  				  <property name="visible">True</property>
  				  <property name="homogeneous">False</property>
  				  <property name="spacing">0</property>
- 				  <accelerator key="A" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
  
  				  <child>
! 				    <widget class="GtkScrolledWindow" id="scrolledwindow3">
  				      <property name="visible">True</property>
! 				      <property name="can_focus">True</property>
! 				      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="shadow_type">GTK_SHADOW_IN</property>
! 				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
! 
! 				      <child>
! 					<widget class="GtkTreeView" id="item_selection_treeview">
! 					  <property name="height_request">150</property>
! 					  <property name="visible">True</property>
! 					  <property name="can_focus">True</property>
! 					  <property name="headers_visible">True</property>
! 					  <property name="rules_hint">False</property>
! 					  <property name="reorderable">False</property>
! 					  <property name="enable_search">True</property>
! 					</widget>
! 				      </child>
  				    </widget>
  				    <packing>
! 				      <property name="padding">0</property>
! 				      <property name="expand">True</property>
! 				      <property name="fill">True</property>
  				    </packing>
  				  </child>
  				</widget>
  				<packing>
! 				  <property name="tab_expand">True</property>
! 				  <property name="tab_fill">True</property>
! 				</packing>
! 			      </child>
! 
! 			      <child>
! 				<widget class="GtkLabel" id="label60">
! 				  <property name="visible">True</property>
! 				  <property name="label" translatable="yes"></property>
! 				  <property name="use_underline">False</property>
! 				  <property name="use_markup">False</property>
! 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 				  <property name="wrap">False</property>
! 				  <property name="selectable">False</property>
! 				  <property name="xalign">0.5</property>
! 				  <property name="yalign">0.5</property>
! 				  <property name="xpad">0</property>
! 				  <property name="ypad">0</property>
! 				</widget>
! 				<packing>
! 				  <property name="type">tab</property>
  				</packing>
  			      </child>
  
  			      <child>
! 				<widget class="GtkVBox" id="find_results_container">
  				  <property name="visible">True</property>
! 				  <property name="homogeneous">False</property>
! 				  <property name="spacing">4</property>
! 
! 				  <child>
! 				    <widget class="GtkHBox" id="hbox46">
! 				      <property name="visible">True</property>
! 				      <property name="homogeneous">False</property>
! 				      <property name="spacing">0</property>
! 
! 				      <child>
! 					<widget class="GtkLabel" id="find_results_count_display">
! 					  <property name="visible">True</property>
! 					  <property name="label" translatable="yes"></property>
! 					  <property name="use_underline">False</property>
! 					  <property name="use_markup">False</property>
! 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 					  <property name="wrap">False</property>
! 					  <property name="selectable">False</property>
! 					  <property name="xalign">0.5</property>
! 					  <property name="yalign">0.5</property>
! 					  <property name="xpad">0</property>
! 					  <property name="ypad">0</property>
! 					</widget>
! 					<packing>
! 					  <property name="padding">4</property>
! 					  <property name="expand">False</property>
! 					  <property name="fill">False</property>
! 					</packing>
! 				      </child>
! 				    </widget>
! 				    <packing>
! 				      <property name="padding">0</property>
! 				      <property name="expand">False</property>
! 				      <property name="fill">False</property>
! 				    </packing>
! 				  </child>
  
  				  <child>
! 				    <widget class="GtkScrolledWindow" id="scrolledwindow5">
  				      <property name="visible">True</property>
  				      <property name="can_focus">True</property>
! 				      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="shadow_type">GTK_SHADOW_IN</property>
! 				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
! 
! 				      <child>
! 					<widget class="GtkTreeView" id="find_results_treeview">
! 					  <property name="visible">True</property>
! 					  <property name="can_focus">True</property>
! 					  <property name="headers_visible">False</property>
! 					  <property name="rules_hint">False</property>
! 					  <property name="reorderable">False</property>
! 					  <property name="enable_search">True</property>
! 					</widget>
! 				      </child>
  				    </widget>
- 				    <packing>
- 				      <property name="padding">0</property>
- 				      <property name="expand">True</property>
- 				      <property name="fill">True</property>
- 				    </packing>
  				  </child>
  				</widget>
  				<packing>
! 				  <property name="tab_expand">False</property>
! 				  <property name="tab_fill">True</property>
  				</packing>
  			      </child>
  
! 			      <child>
! 				<widget class="GtkLabel" id="label61">
! 				  <property name="visible">True</property>
! 				  <property name="label" translatable="yes"></property>
! 				  <property name="use_underline">False</property>
! 				  <property name="use_markup">False</property>
! 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 				  <property name="wrap">False</property>
! 				  <property name="selectable">False</property>
! 				  <property name="xalign">0.5</property>
! 				  <property name="yalign">0.5</property>
! 				  <property name="xpad">0</property>
! 				  <property name="ypad">0</property>
! 				</widget>
! 				<packing>
! 				  <property name="type">tab</property>
! 				</packing>
! 			      </child>
  			    </widget>
  			    <packing>
! 			      <property name="shrink">True</property>
! 			      <property name="resize">False</property>
  			    </packing>
  			  </child>
  
  			  <child>
! 			    <widget class="GtkVBox" id="item_view_container">
  			      <property name="visible">True</property>
  			      <property name="homogeneous">False</property>
  			      <property name="spacing">6</property>
  
  			      <child>
! 				<widget class="GtkVBox" id="vbox2">
  				  <property name="visible">True</property>
! 				  <property name="homogeneous">False</property>
! 				  <property name="spacing">6</property>
  
  				  <child>
! 				    <widget class="GtkScrolledWindow" id="html_scrolled_window">
! 				      <property name="visible">True</property>
! 				      <property name="can_focus">True</property>
! 				      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				      <property name="shadow_type">GTK_SHADOW_IN</property>
! 				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
! 
! 				      <child>
! 					<placeholder/>
! 				      </child>
! 				    </widget>
! 				    <packing>
! 				      <property name="padding">0</property>
! 				      <property name="expand">True</property>
! 				      <property name="fill">True</property>
! 				    </packing>
  				  </child>
  
  				  <child>
! 				    <widget class="GtkVBox" id="item_source_vbox">
  				      <property name="homogeneous">False</property>
! 				      <property name="spacing">6</property>
  
  				      <child>
! 					<widget class="GtkHBox" id="item_subscribe_hbox">
  					  <property name="visible">True</property>
! 					  <property name="homogeneous">False</property>
! 					  <property name="spacing">7</property>
  
  					  <child>
! 					    <widget class="GtkButton" id="source_subscribe_button">
  					      <property name="visible">True</property>
! 					      <property name="can_focus">True</property>
! 					      <property name="relief">GTK_RELIEF_NORMAL</property>
! 					      <property name="focus_on_click">True</property>
! 					      <signal name="clicked" handler="on_source_subscribe_button_clicked" last_modification_time="Thu, 30 Oct 2003 06:36:53 GMT"/>
  
  					      <child>
! 						<widget class="GtkAlignment" id="alignment15">
  						  <property name="visible">True</property>
! 						  <property name="xalign">0.5</property>
! 						  <property name="yalign">0.5</property>
! 						  <property name="xscale">0</property>
! 						  <property name="yscale">0</property>
! 						  <property name="top_padding">0</property>
! 						  <property name="bottom_padding">0</property>
! 						  <property name="left_padding">0</property>
! 						  <property name="right_padding">0</property>
  
  						  <child>
! 						    <widget class="GtkHBox" id="hbox81">
  						      <property name="visible">True</property>
! 						      <property name="homogeneous">False</property>
! 						      <property name="spacing">2</property>
! 
! 						      <child>
! 							<widget class="GtkImage" id="image462">
! 							  <property name="visible">True</property>
! 							  <property name="stock">gtk-add</property>
! 							  <property name="icon_size">4</property>
! 							  <property name="xalign">0.5</property>
! 							  <property name="yalign">0.5</property>
! 							  <property name="xpad">0</property>
! 							  <property name="ypad">0</property>
! 							</widget>
! 							<packing>
! 							  <property name="padding">0</property>
! 							  <property name="expand">False</property>
! 							  <property name="fill">False</property>
! 							</packing>
! 						      </child>
  
! 						      <child>
! 							<widget class="GtkLabel" id="label111">
! 							  <property name="visible">True</property>
! 							  <property name="label" translatable="yes">Subscribe</property>
! 							  <property name="use_underline">True</property>
! 							  <property name="use_markup">False</property>
! 							  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 							  <property name="wrap">False</property>
! 							  <property name="selectable">False</property>
! 							  <property name="xalign">0.5</property>
! 							  <property name="yalign">0.5</property>
! 							  <property name="xpad">0</property>
! 							  <property name="ypad">0</property>
! 							</widget>
! 							<packing>
! 							  <property name="padding">0</property>
! 							  <property name="expand">False</property>
! 							  <property name="fill">False</property>
! 							</packing>
! 						      </child>
  						    </widget>
  						  </child>
  						</widget>
  					      </child>
  					    </widget>
- 					    <packing>
- 					      <property name="padding">0</property>
- 					      <property name="expand">False</property>
- 					      <property name="fill">True</property>
- 					    </packing>
- 					  </child>
- 
- 					  <child>
- 					    <placeholder/>
  					  </child>
  					</widget>
  					<packing>
! 					  <property name="padding">6</property>
  					  <property name="expand">False</property>
! 					  <property name="fill">False</property>
  					</packing>
  				      </child>
  				    </widget>
  				    <packing>
! 				      <property name="padding">0</property>
  				      <property name="expand">False</property>
! 				      <property name="fill">True</property>
  				    </packing>
  				  </child>
  				</widget>
  				<packing>
  				  <property name="padding">0</property>
! 				  <property name="expand">True</property>
  				  <property name="fill">True</property>
  				</packing>
  			      </child>
  			    </widget>
  			    <packing>
! 			      <property name="shrink">True</property>
! 			      <property name="resize">True</property>
  			    </packing>
  			  </child>
  			</widget>
  			<packing>
! 			  <property name="padding">0</property>
! 			  <property name="expand">True</property>
! 			  <property name="fill">True</property>
  			</packing>
  		      </child>
  		    </widget>
--- 806,1196 ----
  			  <property name="fill">True</property>
  			</packing>
  		      </child>
+ 		    </widget>
+ 		    <packing>
+ 		      <property name="padding">0</property>
+ 		      <property name="expand">False</property>
+ 		      <property name="fill">False</property>
+ 		    </packing>
+ 		  </child>
+ 
+ 		  <child>
+ 		    <widget class="GtkHBox" id="hbox104">
+ 		      <property name="border_width">5</property>
+ 		      <property name="visible">True</property>
+ 		      <property name="homogeneous">False</property>
+ 		      <property name="spacing">8</property>
  
  		      <child>
! 			<widget class="GtkLabel" id="feed_item_label">
  			  <property name="visible">True</property>
! 			  <property name="label" translatable="yes">_Articles:</property>
! 			  <property name="use_underline">True</property>
! 			  <property name="use_markup">True</property>
! 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 			  <property name="wrap">True</property>
! 			  <property name="selectable">False</property>
! 			  <property name="xalign">0</property>
! 			  <property name="yalign">0</property>
! 			  <property name="xpad">2</property>
! 			  <property name="ypad">0</property>
! 			  <property name="mnemonic_widget">item_selection_treeview</property>
  			</widget>
  			<packing>
! 			  <property name="padding">1</property>
  			  <property name="expand">True</property>
  			  <property name="fill">True</property>
  			</packing>
  		      </child>
  
  		      <child>
! 			<widget class="GtkLabel" id="feed_refresh_label">
! 			  <property name="label" translatable="yes">_Next Refresh:</property>
! 			  <property name="use_underline">True</property>
! 			  <property name="use_markup">True</property>
! 			  <property name="justify">GTK_JUSTIFY_RIGHT</property>
! 			  <property name="wrap">False</property>
! 			  <property name="selectable">False</property>
! 			  <property name="xalign">0</property>
! 			  <property name="yalign">0</property>
! 			  <property name="xpad">2</property>
! 			  <property name="ypad">0</property>
! 			  <property name="mnemonic_widget">item_selection_treeview</property>
  			</widget>
  			<packing>
! 			  <property name="padding">1</property>
! 			  <property name="expand">False</property>
! 			  <property name="fill">False</property>
  			</packing>
  		      </child>
  		    </widget>
  		    <packing>
! 		      <property name="padding">0</property>
  		      <property name="expand">False</property>
! 		      <property name="fill">False</property>
  		    </packing>
  		  </child>
  
  		  <child>
! 		    <widget class="GtkVPaned" id="main_sub_pane">
  		      <property name="visible">True</property>
! 		      <property name="can_focus">True</property>
! 		      <property name="position">1</property>
! 		      <signal name="size_allocate" handler="on_main_sub_pane_size_allocate" last_modification_time="Sat, 19 Jul 2003 21:53:54 GMT"/>
  
  		      <child>
! 			<widget class="GtkNotebook" id="mode_view_notebook">
  			  <property name="visible">True</property>
! 			  <property name="show_tabs">False</property>
! 			  <property name="show_border">False</property>
! 			  <property name="tab_pos">GTK_POS_TOP</property>
! 			  <property name="scrollable">False</property>
! 			  <property name="enable_popup">False</property>
  
  			  <child>
! 			    <widget class="GtkVBox" id="vbox33">
  			      <property name="visible">True</property>
! 			      <property name="homogeneous">False</property>
! 			      <property name="spacing">0</property>
! 			      <accelerator key="A" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
! 
! 			      <child>
! 				<widget class="GtkScrolledWindow" id="scrolledwindow3">
! 				  <property name="visible">True</property>
! 				  <property name="can_focus">True</property>
! 				  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="shadow_type">GTK_SHADOW_IN</property>
! 				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
! 
! 				  <child>
! 				    <widget class="GtkTreeView" id="item_selection_treeview">
! 				      <property name="height_request">150</property>
! 				      <property name="visible">True</property>
! 				      <property name="can_focus">True</property>
! 				      <property name="headers_visible">True</property>
! 				      <property name="rules_hint">False</property>
! 				      <property name="reorderable">False</property>
! 				      <property name="enable_search">True</property>
! 				    </widget>
! 				  </child>
! 				</widget>
! 				<packing>
! 				  <property name="padding">0</property>
! 				  <property name="expand">True</property>
! 				  <property name="fill">True</property>
! 				</packing>
! 			      </child>
  			    </widget>
  			    <packing>
! 			      <property name="tab_expand">True</property>
! 			      <property name="tab_fill">True</property>
  			    </packing>
  			  </child>
  
  			  <child>
! 			    <widget class="GtkLabel" id="label60">
! 			      <property name="visible">True</property>
! 			      <property name="label" translatable="yes"></property>
! 			      <property name="use_underline">False</property>
! 			      <property name="use_markup">False</property>
! 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
  			      <property name="wrap">False</property>
  			      <property name="selectable">False</property>
! 			      <property name="xalign">0.5</property>
! 			      <property name="yalign">0.5</property>
! 			      <property name="xpad">0</property>
  			      <property name="ypad">0</property>
  			    </widget>
  			    <packing>
! 			      <property name="type">tab</property>
  			    </packing>
  			  </child>
  
  			  <child>
! 			    <widget class="GtkVBox" id="find_results_container">
  			      <property name="visible">True</property>
! 			      <property name="homogeneous">False</property>
! 			      <property name="spacing">4</property>
  
  			      <child>
! 				<widget class="GtkHBox" id="hbox46">
  				  <property name="visible">True</property>
  				  <property name="homogeneous">False</property>
  				  <property name="spacing">0</property>
  
  				  <child>
! 				    <widget class="GtkLabel" id="find_results_count_display">
  				      <property name="visible">True</property>
! 				      <property name="label" translatable="yes"></property>
! 				      <property name="use_underline">False</property>
! 				      <property name="use_markup">False</property>
! 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
! 				      <property name="wrap">False</property>
! 				      <property name="selectable">False</property>
! 				      <property name="xalign">0.5</property>
! 				      <property name="yalign">0.5</property>
! 				      <property name="xpad">0</property>
! 				      <property name="ypad">0</property>
  				    </widget>
  				    <packing>
! 				      <property name="padding">4</property>
! 				      <property name="expand">False</property>
! 				      <property name="fill">False</property>
  				    </packing>
  				  </child>
  				</widget>
  				<packing>
! 				  <property name="padding">0</property>
! 				  <property name="expand">False</property>
! 				  <property name="fill">False</property>
  				</packing>
  			      </child>
  
  			      <child>
! 				<widget class="GtkScrolledWindow" id="scrolledwindow5">
  				  <property name="visible">True</property>
! 				  <property name="can_focus">True</property>
! 				  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="shadow_type">GTK_SHADOW_IN</property>
! 				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
  
  				  <child>
! 				    <widget class="GtkTreeView" id="find_results_treeview">
  				      <property name="visible">True</property>
  				      <property name="can_focus">True</property>
! 				      <property name="headers_visible">False</property>
! 				      <property name="rules_hint">False</property>
! 				      <property name="reorderable">False</property>
! 				      <property name="enable_search">True</property>
  				    </widget>
  				  </child>
  				</widget>
  				<packing>
! 				  <property name="padding">0</property>
! 				  <property name="expand">True</property>
! 				  <property name="fill">True</property>
  				</packing>
  			      </child>
+ 			    </widget>
+ 			    <packing>
+ 			      <property name="tab_expand">False</property>
+ 			      <property name="tab_fill">True</property>
+ 			    </packing>
+ 			  </child>
  
! 			  <child>
! 			    <widget class="GtkLabel" id="label61">
! 			      <property name="visible">True</property>
! 			      <property name="label" translatable="yes"></property>
! 			      <property name="use_underline">False</property>
! 			      <property name="use_markup">False</property>
! 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
! 			      <property name="wrap">False</property>
! 			      <property name="selectable">False</property>
! 			      <property name="xalign">0.5</property>
! 			      <property name="yalign">0.5</property>
! 			      <property name="xpad">0</property>
! 			      <property name="ypad">0</property>
  			    </widget>
  			    <packing>
! 			      <property name="type">tab</property>
  			    </packing>
  			  </child>
+ 			</widget>
+ 			<packing>
+ 			  <property name="shrink">True</property>
+ 			  <property name="resize">False</property>
+ 			</packing>
+ 		      </child>
+ 
+ 		      <child>
+ 			<widget class="GtkVBox" id="item_view_container">
+ 			  <property name="visible">True</property>
+ 			  <property name="homogeneous">False</property>
+ 			  <property name="spacing">6</property>
  
  			  <child>
! 			    <widget class="GtkVBox" id="vbox2">
  			      <property name="visible">True</property>
  			      <property name="homogeneous">False</property>
  			      <property name="spacing">6</property>
  
  			      <child>
! 				<widget class="GtkScrolledWindow" id="html_scrolled_window">
  				  <property name="visible">True</property>
! 				  <property name="can_focus">True</property>
! 				  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
! 				  <property name="shadow_type">GTK_SHADOW_IN</property>
! 				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
  
  				  <child>
! 				    <placeholder/>
  				  </child>
+ 				</widget>
+ 				<packing>
+ 				  <property name="padding">0</property>
+ 				  <property name="expand">True</property>
+ 				  <property name="fill">True</property>
+ 				</packing>
+ 			      </child>
+ 
+ 			      <child>
+ 				<widget class="GtkVBox" id="item_source_vbox">
+ 				  <property name="homogeneous">False</property>
+ 				  <property name="spacing">6</property>
  
  				  <child>
! 				    <widget class="GtkHBox" id="item_subscribe_hbox">
! 				      <property name="visible">True</property>
  				      <property name="homogeneous">False</property>
! 				      <property name="spacing">7</property>
  
  				      <child>
! 					<widget class="GtkButton" id="source_subscribe_button">
  					  <property name="visible">True</property>
! 					  <property name="can_focus">True</property>
! 					  <property name="relief">GTK_RELIEF_NORMAL</property>
! 					  <property name="focus_on_click">True</property>
! 					  <signal name="clicked" handler="on_source_subscribe_button_clicked" last_modification_time="Thu, 30 Oct 2003 06:36:53 GMT"/>
  
  					  <child>
! 					    <widget class="GtkAlignment" id="alignment15">
  					      <property name="visible">True</property>
! 					      <property name="xalign">0.5</property>
! 					      <property name="yalign">0.5</property>
! 					      <property name="xscale">0</property>
! 					      <property name="yscale">0</property>
! 					      <property name="top_padding">0</property>
! 					      <property name="bottom_padding">0</property>
! 					      <property name="left_padding">0</property>
! 					      <property name="right_padding">0</property>
  
  					      <child>
! 						<widget class="GtkHBox" id="hbox81">
  						  <property name="visible">True</property>
! 						  <property name="homogeneous">False</property>
! 						  <property name="spacing">2</property>
  
  						  <child>
! 						    <widget class="GtkImage" id="image462">
  						      <property name="visible">True</property>
! 						      <property name="stock">gtk-add</property>
! 						      <property name="icon_size">4</property>
! 						      <property name="xalign">0.5</property>
! 						      <property name="yalign">0.5</property>
! 						      <property name="xpad">0</property>
! 						      <property name="ypad">0</property>
! 						    </widget>
! 						    <packing>
! 						      <property name="padding">0</property>
! 						      <property name="expand">False</property>
! 						      <property name="fill">False</property>
! 						    </packing>
! 						  </child>
  
! 						  <child>
! 						    <widget class="GtkLabel" id="label111">
! 						      <property name="visible">True</property>
! 						      <property name="label" translatable="yes">Subscribe</property>
! 						      <property name="use_underline">True</property>
! 						      <property name="use_markup">False</property>
! 						      <property name="justify">GTK_JUSTIFY_LEFT</property>
! 						      <property name="wrap">False</property>
! 						      <property name="selectable">False</property>
! 						      <property name="xalign">0.5</property>
! 						      <property name="yalign">0.5</property>
! 						      <property name="xpad">0</property>
! 						      <property name="ypad">0</property>
  						    </widget>
+ 						    <packing>
+ 						      <property name="padding">0</property>
+ 						      <property name="expand">False</property>
+ 						      <property name="fill">False</property>
+ 						    </packing>
  						  </child>
  						</widget>
  					      </child>
  					    </widget>
  					  </child>
  					</widget>
  					<packing>
! 					  <property name="padding">0</property>
  					  <property name="expand">False</property>
! 					  <property name="fill">True</property>
  					</packing>
  				      </child>
+ 
+ 				      <child>
+ 					<placeholder/>
+ 				      </child>
  				    </widget>
  				    <packing>
! 				      <property name="padding">6</property>
  				      <property name="expand">False</property>
! 				      <property name="fill">False</property>
  				    </packing>
  				  </child>
  				</widget>
  				<packing>
  				  <property name="padding">0</property>
! 				  <property name="expand">False</property>
  				  <property name="fill">True</property>
  				</packing>
  			      </child>
  			    </widget>
  			    <packing>
! 			      <property name="padding">0</property>
! 			      <property name="expand">True</property>
! 			      <property name="fill">True</property>
  			    </packing>
  			  </child>
  			</widget>
  			<packing>
! 			  <property name="shrink">True</property>
! 			  <property name="resize">True</property>
  			</packing>
  		      </child>
  		    </widget>
***************
*** 1286,1316 ****
  		      <property name="fill">True</property>
  		    </packing>
  		  </child>
  
! 		  <child>
! 		    <widget class="GtkLabel" id="label110">
! 		      <property name="visible">True</property>
! 		      <property name="label" translatable="yes"></property>
! 		      <property name="use_underline">False</property>
! 		      <property name="use_markup">False</property>
! 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
! 		      <property name="wrap">False</property>
! 		      <property name="selectable">False</property>
! 		      <property name="xalign">0</property>
! 		      <property name="yalign">0.5</property>
! 		      <property name="xpad">0</property>
! 		      <property name="ypad">0</property>
! 		    </widget>
! 		    <packing>
! 		      <property name="padding">0</property>
! 		      <property name="expand">False</property>
! 		      <property name="fill">False</property>
! 		    </packing>
! 		  </child>
  		</widget>
  		<packing>
! 		  <property name="shrink">True</property>
! 		  <property name="resize">True</property>
  		</packing>
  	      </child>
  	    </widget>
--- 1200,1231 ----
  		      <property name="fill">True</property>
  		    </packing>
  		  </child>
+ 		</widget>
+ 		<packing>
+ 		  <property name="padding">0</property>
+ 		  <property name="expand">True</property>
+ 		  <property name="fill">True</property>
+ 		</packing>
+ 	      </child>
  
! 	      <child>
! 		<widget class="GtkLabel" id="label110">
! 		  <property name="visible">True</property>
! 		  <property name="label" translatable="yes"></property>
! 		  <property name="use_underline">False</property>
! 		  <property name="use_markup">False</property>
! 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
! 		  <property name="wrap">False</property>
! 		  <property name="selectable">False</property>
! 		  <property name="xalign">0</property>
! 		  <property name="yalign">0.5</property>
! 		  <property name="xpad">0</property>
! 		  <property name="ypad">0</property>
  		</widget>
  		<packing>
! 		  <property name="padding">0</property>
! 		  <property name="expand">False</property>
! 		  <property name="fill">False</property>
  		</packing>
  	      </child>
  	    </widget>
