2005-09-19 Jim Evins <evins@snaught.com>

	* data/glade/property-bar.glade:
		Remove items from font_family_combo.  This prevents the
		double entry after adding text model and list of fonts.
	* src/ui-property-bar.c: (reset_to_default_properties):
		Free font_family_list.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@551 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index b7876691c7d55a73a38482a52a0f1fe457b46088..ace3b3df20d3b8c87c80ce746c207812202ebbe4 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-19  Jim Evins  <evins@snaught.com>
+
+       * data/glade/property-bar.glade:
+               Remove items from font_family_combo.  This prevents the
+               double entry after adding text model and list of fonts.
+       * src/ui-property-bar.c: (reset_to_default_properties):
+               Free font_family_list.
+
 2005-07-01  Jim Evins  <evins@snaught.com>
 
        * po/it.po:

diff --git a/glabels2/data/glade/property-bar.glade b/glabels2/data/glade/property-bar.glade
index 53db5b71a2e996f4647a70b4b02c383b282bdb0c..6ba9b341d29ccb5758908fde295b4928f87bcc1f 100644 (file)
--- a/glabels2/data/glade/property-bar.glade
+++ b/glabels2/data/glade/property-bar.glade
@@ -43,7 +43,6 @@
              <child>
                <widget class="GtkComboBox" id="font_family_combo">
                  <property name="visible">True</property>
-                 <property name="items" translatable="yes">Font family</property>
                  <property name="add_tearoffs">False</property>
                  <property name="focus_on_click">False</property>
                </widget>

diff --git a/glabels2/src/ui-property-bar.c b/glabels2/src/ui-property-bar.c
index 2a5a50b471d54212baae4c3e2f7185ff3f11a5f0..a0205563bc35c856c500401233dea2a119b9778d 100644 (file)
--- a/glabels2/src/ui-property-bar.c
+++ b/glabels2/src/ui-property-bar.c
@@ -420,6 +420,7 @@ reset_to_default_properties (glView *view,
        gl_util_combo_box_set_active_text (GTK_COMBO_BOX (property_bar->priv->font_family_combo),
                                           good_font_family);
        g_free (good_font_family);
+       gnome_font_family_list_free (family_names);
 
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(property_bar->priv->font_size_spin),
                                   view->default_font_size);