Use gdk_window_get_root_cords to get popup position for combobox

[~andy/gtk] / gdk / x11 / gdkxftdefaults.c

diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
index 4accd9d351ab4d7d1104e0639e3109b2201c449e..79dd26cd32b5b9c4826f5b368776a65198930a61 100644 (file)
--- a/gdk/x11/gdkxftdefaults.c
+++ b/gdk/x11/gdkxftdefaults.c
@@ -129,7 +129,6 @@ get_integer_default (Display *dpy,
                     gchar   *option,
                     gint    *value)
 {
-  gint i;
   gchar *v, *e;
   
   v = XGetDefault (dpy, "Xft", option);
@@ -138,7 +137,7 @@ get_integer_default (Display *dpy,
       if (FcNameConstant ((FcChar8 *) v, value))
        return TRUE;
       
-      i = strtol (v, &e, 0);
+      *value = strtol (v, &e, 0);
       if (e != v)
        return TRUE;
     }
@@ -201,9 +200,9 @@ init_xft_settings (GdkScreen *screen)
              break;
            }
        }
+#endif
 
       screen_x11->xft_rgba = subpixel;
-#endif
     }
 
   if (!get_double_default (xdisplay, "dpi", &dpi_double))