[glabels/vala] Fixed several assertions and removed old diagnostic prints.

[Jim Evins <jimevins src gnome org>]

commit 86844744b458db4d9a5506539fe2f0327d16b70e
Author: Jim Evins <evins snaught com>
Date:   Sun Jul 29 21:58:11 2012 -0400

    Fixed several assertions and removed old diagnostic prints.

 data/ui/object_editor.ui   |    6 +++---
 glabels/field_button.vala  |    2 ++
 glabels/font_families.vala |    4 +---
 glabels/text_lines.vala    |    2 --
 glabels/xml_label.vala     |    4 ----
 5 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/data/ui/object_editor.ui b/data/ui/object_editor.ui
index 508d504..7b26603 100644
--- a/data/ui/object_editor.ui
+++ b/data/ui/object_editor.ui
@@ -521,7 +521,7 @@
                                     <property name="can_focus">False</property>
                                     <property name="spacing">3</property>
                                     <child>
-                                      <object class="GtkToggleButton" id="text_valign_top_toggle1">
+                                      <object class="GtkToggleButton" id="text_valign_top_toggle">
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -542,7 +542,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToggleButton" id="text_valign_middle_toggle1">
+                                      <object class="GtkToggleButton" id="text_valign_middle_toggle">
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
@@ -563,7 +563,7 @@
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkToggleButton" id="text_valign_bottom_toggle1">
+                                      <object class="GtkToggleButton" id="text_valign_bottom_toggle">
                                         <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
diff --git a/glabels/field_button.vala b/glabels/field_button.vala
index 552cf56..f3c7e35 100644
--- a/glabels/field_button.vala
+++ b/glabels/field_button.vala
@@ -60,6 +60,8 @@ namespace glabels
 
 			set_sensitive( false );
 
+			menu = new FieldMenu();
+
 			button_press_event.connect( on_button_press_event );
 			menu.key_selected.connect( on_menu_key_selected );
 			menu.selection_done.connect( on_menu_selection_done );
diff --git a/glabels/font_families.vala b/glabels/font_families.vala
index b4830f7..167bd95 100644
--- a/glabels/font_families.vala
+++ b/glabels/font_families.vala
@@ -34,14 +34,12 @@ namespace glabels
 
 		static construct
 		{
-			Pango.FontMap       fontmap;
 			Pango.Context       context;
 			Pango.FontFamily[]  families;
 			int                 i;
 			string              name;
 
-			fontmap = Pango.CairoFontMap.new();
-			context = fontmap.create_context();
+			context = Gdk.pango_context_get();
 
 			context.list_families( out families );
 
diff --git a/glabels/text_lines.vala b/glabels/text_lines.vala
index 98eaada..c7e8bac 100644
--- a/glabels/text_lines.vala
+++ b/glabels/text_lines.vala
@@ -42,9 +42,7 @@ namespace glabels
 
 			for ( int i = 0; text[i] != 0; i = i_next )
 			{
-				stderr.printf( "Text[%d] = %c, ", i, text[i] ); 
 				lines.append( new TextLine.parse( text, i, out i_next ) );
-				stderr.printf( "i_next =%d\n", i_next ); 
 			}
 		}
 
diff --git a/glabels/xml_label.vala b/glabels/xml_label.vala
index 37bc8bf..a0104f1 100644
--- a/glabels/xml_label.vala
+++ b/glabels/xml_label.vala
@@ -316,7 +316,6 @@ namespace glabels
 		private void parse_toplevel_span_node( Xml.Node        node,
 		                                       LabelObjectText object )
 		{
-			stdout.printf( "Span\n" );
 			/* font_family attr */
 			object.font_family = XmlUtil.get_prop_string( node, "font_family", "Sans" );
 
@@ -356,12 +355,10 @@ namespace glabels
 					break;
 
 				case "Field":
-					stdout.printf( "Field\n" );
 					line.append( new TextNode( true, XmlUtil.get_prop_string( child, "name", null ) ) );
 					break;
 
 				case "NL":
-					stdout.printf( "NL\n" );
 					lines.append( line );
 					line = new TextLine();
 					break;
@@ -372,7 +369,6 @@ namespace glabels
 						/* Literal text. */
 						string raw_data = child->get_content();
 						string data = strip_regex.replace( raw_data, -1, 0, "" );
-						stdout.printf( "Literal = \"%s\"\n", data );
 						line.append( new TextNode( false, data ) );
 					}
 					else