Attachment #360690 for bug #487778





#include "dview.h"
#ifndef SDLMAME_WIN32
#include <gconf/gconf-client.h>
#endif

G_DEFINE_TYPE(DView, dview, GTK_TYPE_CONTAINER);


static void dview_class_init(DViewClass *dvc)
{
	dvc->fixedfont = pango_font_description_from_string("Monospace 10");
	GConfClient *conf = gconf_client_get_default();
	char *name = 0;
	dvc->fixedfont = 0;

	if(conf)
		name = gconf_client_get_string(conf, "/desktop/gnome/interface/monospace_font_name", 0);

	if(name) {
		dvc->fixedfont = pango_font_description_from_string(name);
		g_free(name);
	}

	if(!dvc->fixedfont)
#endif
		dvc->fixedfont = pango_font_description_from_string("Monospace 10");

	if(!dvc->fixedfont) {
		mame_printf_error("Couldn't find a monospace font, aborting\n");

Lines 692-700 Link Here

(-)src/osd/sdl/sdl.mak.bak (-3 / +3 lines)
692		692
693	# the new debugger relies on GTK+ in addition to the base SDLMAME needs	693	# the new debugger relies on GTK+ in addition to the base SDLMAME needs
694	# Non-X11 builds can not use the debugger	694	# Non-X11 builds can not use the debugger
695	INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0)	695	INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0)
696	CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0)	696	CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0)
697	LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0)	697	LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0)
698	#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED	698	#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
699		699
700	# The newer debugger uses QT	700	# The newer debugger uses QT

Return to bug 487778

Lines 1-7 Link Here

(-)src/osd/sdl/dview.c.bak (-17 / +1 lines)
1		1
2	#include "dview.h"	2	#include "dview.h"
3	#ifndef SDLMAME_WIN32	3	#ifndef SDLMAME_WIN32
4	#include <gconf/gconf-client.h>
5	#endif	4	#endif
6		5
7	G_DEFINE_TYPE(DView, dview, GTK_TYPE_CONTAINER);	6	G_DEFINE_TYPE(DView, dview, GTK_TYPE_CONTAINER);
Lines 345-366 Link Here
345		344
346	static void dview_class_init(DViewClass *dvc)	345	static void dview_class_init(DViewClass *dvc)
347	{	346	{
348	#ifndef SDLMAME_WIN32	347	dvc->fixedfont = pango_font_description_from_string("Monospace 10");
349	GConfClient *conf = gconf_client_get_default();
350	char *name = 0;
351	dvc->fixedfont = 0;
352
353	if(conf)
354	name = gconf_client_get_string(conf, "/desktop/gnome/interface/monospace_font_name", 0);
355
356	if(name) {
357	dvc->fixedfont = pango_font_description_from_string(name);
358	g_free(name);
359	}
360
361	if(!dvc->fixedfont)
362	#endif
363	dvc->fixedfont = pango_font_description_from_string("Monospace 10");
364		348
365	if(!dvc->fixedfont) {	349	if(!dvc->fixedfont) {
366	mame_printf_error("Couldn't find a monospace font, aborting\n");	350	mame_printf_error("Couldn't find a monospace font, aborting\n");