Fixed a compilation break in the gnome frontend.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1868 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/gnome/gnome_helpers.C b/src/frontends/gnome/gnome_helpers.C
index f517132c8c8d7b6965ec462c9d16970130e3320a..faa4e70678c9005da6b9e761f264de13125f7fa3 100644 (file)
--- a/src/frontends/gnome/gnome_helpers.C
+++ b/src/frontends/gnome/gnome_helpers.C
@@ -26,11 +26,12 @@ string get_font_name(Gdk_Font const & font)
 }
 
 
+extern "C"
 gchar *
 get_font_name (const GdkFont * font)
 {
        Atom font_atom, atom;
-       Bool status;
+       bool status = false;
 
 #ifdef E_FONT_VERBOSE
        gint i;
@@ -44,14 +45,14 @@ get_font_name (const GdkFont * font)
                gint num_fonts;
                gchar **font_names;
 
-               num_fonts = XFontsOfFontSet (GDK_FONT_XFONT (font), &font_structs, &font_names);
+               num_fonts = XFontsOfFontSet (XFontSet(GDK_FONT_XFONT (font)), &font_structs, &font_names);
 #ifdef E_FONT_VERBOSE
                g_print ("Fonts of fontset:\n");
                for (i = 0; i < num_fonts; i++) g_print ("  %s\n", font_names[i]);
 #endif
                status = XGetFontProperty (font_structs[0], font_atom, &atom);
        } else {
-               status = XGetFontProperty (GDK_FONT_XFONT (font), font_atom, &atom);
+               status = XGetFontProperty ( (XFontStruct*)GDK_FONT_XFONT (font), font_atom, &atom);
        }
 
        if (status) {

diff --git a/src/frontends/gnome/gnome_helpers.h b/src/frontends/gnome/gnome_helpers.h
index 8c7094e0fe52cb25929634090171416502d7d1be..a011eb3715ce5bba55192dffd0f59225877186b9 100644 (file)
--- a/src/frontends/gnome/gnome_helpers.h
+++ b/src/frontends/gnome/gnome_helpers.h
@@ -49,6 +49,7 @@ string get_font_name(Gdk_Font const & font);
  *
  * This function was lifted from e-font.c from the gabber package.
  */
+extern "C"
 gchar * get_font_name(GdkFont const * font);
 
 #endif