* hildon-widgets/hildon-font-selection-dialog.c: (is_internal_font): new function...

diff --git a/ChangeLog b/ChangeLog
index 4915f14..51ffc9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-03  Luc Pionchon  <luc.pionchon@nokia.com>
+
+       * hildon-widgets/hildon-font-selection-dialog.c:
+       (is_internal_font): new function. Tells if a font family is internal.
+       (filter_out_internal_fonts): new function. Filters out inernal fonts.
+       (hildon_font_selection_dialog_show_available_fonts): call filter_out_internal_fonts
+       Fixes N#21854
+
+
 2006-05-01  Luc Pionchon  <luc.pionchon@nokia.com>
 
        * hildon-libs/hildon-widgets/hildon-time-editor.c

diff --git a/hildon-widgets/hildon-font-selection-dialog.c b/hildon-widgets/hildon-font-selection-dialog.c
index da9cf92..26908cb 100644 (file)
--- a/hildon-widgets/hildon-font-selection-dialog.c
+++ b/hildon-widgets/hildon-font-selection-dialog.c
@@ -290,7 +290,7 @@ hildon_font_selection_dialog_get_property (GObject      *object,
        g_value_set_string(value, 
                           pango_font_family_get_name(priv->families[i]));
       else
-       g_value_set_string(value, "Nokia Sans");
+       g_value_set_string(value, "Sans");
       break;
       
     case PROP_FAMILY_SET:
@@ -587,7 +587,7 @@ hildon_font_selection_dialog_class_init(HildonFontSelectionDialogClass *
   g_object_class_install_property(gobject_class, PROP_FAMILY,
                                  g_param_spec_string("family",
                                  "Font family", "String defines"
-                                 " the font family", "Nokia Sans",
+                                 " the font family", "Sans",
                                  G_PARAM_READWRITE));
   
   g_object_class_install_property(gobject_class, PROP_FAMILY_SET,
@@ -1135,6 +1135,37 @@ hildon_font_selection_dialog_show_preview(HildonFontSelectionDialog *
   gtk_widget_destroy(preview_dialog);
 }
 
+
+static gboolean is_internal_font(const gchar * name){
+  return strcmp(name, "DeviceSymbols") == 0
+      || strcmp(name, "Nokia Smiley" ) == 0
+      || strcmp(name, "Nokia Sans"   ) == 0
+      || strcmp(name, "Nokia Sans Cn") == 0;
+}
+
+static void filter_out_internal_fonts(PangoFontFamily **families, int *n_families){
+  int i;
+  int n; /* counts valid fonts */
+  const gchar * name = NULL;
+
+  for(i = 0, n = 0; i < *n_families; i++){
+
+    name = pango_font_family_get_name(families[i]);
+        
+    if(!is_internal_font(name)){
+
+      if(i!=n){ /* there are filtered out families */
+       families[n] = families[i]; /* shift the current family */
+      }
+
+      n++; /* count one more valid */
+    }
+  }/* foreach font family */
+
+  *n_families = n;  
+}
+
+
 static void
 hildon_font_selection_dialog_show_available_fonts(HildonFontSelectionDialog 
                                                  *fontsel)
@@ -1149,6 +1180,8 @@ hildon_font_selection_dialog_show_available_fonts(HildonFontSelectionDialog
                              (GTK_WIDGET(fontsel)), &priv->families,
                              &priv->n_families);
 
+  filter_out_internal_fonts(priv->families, &priv->n_families);
+
   qsort(priv->families, priv->n_families, sizeof(PangoFontFamily *),
        cmp_families);