Mercurial Mercurial > sustaining > oi_151a > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gtk+-07-fontbutton.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8345 7f02db371345
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8345
7f02db371345 2006-10-17 Erwann Chenede - <[email protected]>
erwannc
parents: 5518
diff changeset 
     1
 
diff -Nrup gtk+-2.10.6/gtk/gtkfontbutton.c ../SUNWgnome-base-libs-2.16.1/gtk+-2.10.6/gtk/gtkfontbutton.c
7f02db371345 2006-10-17 Erwann Chenede - <[email protected]>
erwannc
parents: 5518
diff changeset 
     2
 
--- gtk+-2.10.6/gtk/gtkfontbutton.c	2006-10-17 08:50:27.825136000 +0200
7f02db371345 2006-10-17 Erwann Chenede - <[email protected]>
erwannc
parents: 5518
diff changeset 
     3
 
+++ ../SUNWgnome-base-libs-2.16.1/gtk+-2.10.6/gtk/gtkfontbutton.c	2006-10-17 08:51:11.171217000 +0200
7f02db371345 2006-10-17 Erwann Chenede - <[email protected]>
erwannc
parents: 5518
diff changeset 
     4
 
@@ -848,8 +848,8 @@ gtk_font_button_update_font_info (GtkFon
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     5
 
   style = NULL;
8345
7f02db371345 2006-10-17 Erwann Chenede - <[email protected]>
erwannc
parents: 5518
diff changeset 
     6
 
   if (font_button->priv->show_style && family)
5518
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     7
 
     {
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     8
 
-      PangoFontFamily **families;
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
     9
 
-      PangoFontFace **faces;
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    10
 
+      PangoFontFamily **families = NULL;
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    11
 
+      PangoFontFace **faces = NULL;
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    12
 
       gint n_families, n_faces, i;
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    13
235b0b4aa324 merged the gnome-2-10 branch to HEAD
laca
parents:
diff changeset 
    14
 
       n_families = 0;
sustaining/oi_151a/spec-files