[glabels/vala] Don't access static members of FontFamilies with instance reference



commit 4dec27db6e59a53bff4107864c3c169ee047b1a0
Author: Jim Evins <evins snaught com>
Date:   Thu May 22 23:36:48 2014 -0400

    Don't access static members of FontFamilies with instance reference

 glabels/font_menu.vala |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/glabels/font_menu.vala b/glabels/font_menu.vala
index a68438f..c089b83 100644
--- a/glabels/font_menu.vala
+++ b/glabels/font_menu.vala
@@ -34,7 +34,6 @@ namespace glabels
                private const string[] standard_families = { "Sans", "Serif", "Monospace" };
 
                private FontHistory    font_history;
-               private FontFamilies   font_families;
 
                public FontMenu()
                {
@@ -45,9 +44,6 @@ namespace glabels
                        List<string> list;
 
 
-                       font_families = new FontFamilies();
-
-
                        for ( i = 0; i < standard_families.length; i++ )
                        {
                                font_menu_item = new FontMenuItem( standard_families[i] );
@@ -72,20 +68,20 @@ namespace glabels
 
                        menu_item = new Gtk.MenuItem.with_label( "Proportional fonts" );
                        this.append( menu_item );
-                       menu_item.set_submenu( create_font_sub_menu( font_families.proportional ) );
-                       menu_item.set_sensitive( font_families.proportional != null );
+                       menu_item.set_submenu( create_font_sub_menu( FontFamilies.proportional ) );
+                       menu_item.set_sensitive( FontFamilies.proportional != null );
 
 
                        menu_item = new Gtk.MenuItem.with_label( "Fixed-width fonts" );
                        this.append( menu_item );
-                       menu_item.set_submenu( create_font_sub_menu( font_families.fixed_width ) );
-                       menu_item.set_sensitive( font_families.fixed_width != null );
+                       menu_item.set_submenu( create_font_sub_menu( FontFamilies.fixed_width ) );
+                       menu_item.set_sensitive( FontFamilies.fixed_width != null );
 
 
                        menu_item = new Gtk.MenuItem.with_label( "All fonts" );
                        this.append( menu_item );
-                       menu_item.set_submenu( create_font_sub_menu( font_families.all ) );
-                       menu_item.set_sensitive( font_families.all != null );
+                       menu_item.set_submenu( create_font_sub_menu( FontFamilies.all ) );
+                       menu_item.set_sensitive( FontFamilies.all != null );
 
 
                        this.show_all();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]