[gtk+/gtk-3-6] win32: handle again gtk-font-name

[Ignacio Casal Quinteiro <icq src gnome org>]

commit b7cd7ca747569a0ba9b02a40bcbf36224734a5b9
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jan 27 09:45:01 2014 +0100

    win32: handle again gtk-font-name
    
    This code is ugly but it seems to do the work

 gdk/win32/gdkproperty-win32.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index 7a3671b..576ef2f 100644
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -399,7 +399,6 @@ _gdk_win32_screen_get_setting (GdkScreen   *screen,
       g_value_set_boolean (value, TRUE);
       return TRUE;
     }
-#if 0
   /*
    * With 'MS Sans Serif' as windows menu font (default on win98se) you'll get a 
    * bunch of :
@@ -416,7 +415,7 @@ _gdk_win32_screen_get_setting (GdkScreen   *screen,
           /* Pango finally uses GetDeviceCaps to scale, we use simple
           * approximation here.
           */
-          int nHeight = (0 > ncm.lfMenuFont.lfHeight ? -3*ncm.lfMenuFont.lfHeight/4 : 10);
+          int nHeight = (0 > ncm.lfMenuFont.lfHeight ? - 3 * ncm.lfMenuFont.lfHeight / 4 : 10);
           if (OUT_STRING_PRECIS == ncm.lfMenuFont.lfOutPrecision)
             GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) : ignoring bitmap font '%s'\n", 
                                    name, ncm.lfMenuFont.lfFaceName));
@@ -424,7 +423,7 @@ _gdk_win32_screen_get_setting (GdkScreen   *screen,
                    /* Avoid issues like those described in bug #135098 */
                    g_utf8_validate (ncm.lfMenuFont.lfFaceName, -1, NULL))
             {
-              char* s = g_strdup_printf ("%s %d", ncm.lfMenuFont.lfFaceName, nHeight);
+              char *s = g_strdup_printf ("%s %d", ncm.lfMenuFont.lfFaceName, nHeight);
               GDK_NOTE(MISC, g_print("gdk_screen_get_setting(%s) : %s\n", name, s));
               g_value_set_string (value, s);
 
@@ -433,7 +432,6 @@ _gdk_win32_screen_get_setting (GdkScreen   *screen,
             }
         }
     }
-#endif
 
   return FALSE;
 }