Let ede-desktop run system installed ede-desktop-conf

Set Gtk/FontName in ede-settings.conf to the sane values so firefox (and other gtk apps)
does not yield unreadable windows

Removed some debugging code in evoke
This commit is contained in:
Sanel Zukan 2009-02-20 17:14:31 +00:00
parent a571dbc923
commit b781d14805
4 changed files with 10 additions and 11 deletions

View File

@ -123,11 +123,11 @@ void settings_changed_cb(void* data) {
}
void background_conf_cb(Fl_Widget*, void*) {
Desktop::instance()->execute("../ede-desktop-conf/ede-desktop-conf");
Desktop::instance()->execute("ede-desktop-conf");
}
void icons_conf_cb(Fl_Widget*, void*) {
Desktop::instance()->execute("../ede-desktop-conf/ede-desktop-conf --icons");
Desktop::instance()->execute("ede-desktop-conf --icons");
}
int desktop_xmessage_handler(int event) {

View File

@ -66,8 +66,6 @@ EvokeService::EvokeService() : lock_name(NULL), xsm(NULL), is_running(false) {
}
EvokeService::~EvokeService() {
E_DEBUG(E_STRLOC ": EvokeService::~EvokeService()\n");
clear_startup_items();
stop_xsettings_manager(true);
remove_lock();
@ -101,8 +99,6 @@ void EvokeService::remove_lock(void) {
}
void EvokeService::clear_startup_items(void) {
E_DEBUG(E_STRLOC ": EvokeService::clear_startup_items()\n");
if(startup_items.empty())
return;

View File

@ -20,12 +20,16 @@ SOURCE = evoke.cpp
Logout.cpp
Autostart.cpp ;
CONFIG = ede-settings.conf
ede-startup.conf ;
#ObjectC++Flags $(SOURCE) : -DUSE_LOCAL_CONFIG ;
EdeProgram evoke : $(SOURCE) ;
EdeManualWithToc [ FFileName doc evoke.txt ] ;
TranslationStrings locale : $(SOURCE) ;
FltkProgramBare test/evoke_test : test/evoke_test.cpp : "noinstall" ;
EdeManualWithToc [ FFileName doc evoke.txt ] ;
TranslationStrings locale : $(SOURCE) ;
InstallEdeConfigFiles $(CONFIG) ;
SubInclude TOP evoke splash-themes ;

View File

@ -5,7 +5,7 @@
<setting name="Gtk/CanChangeAccels" type="int" value="0" />
<setting name="Gtk/CursorThemeName" type="string" value="default" />
<setting name="Gtk/CursorThemeSize" type="int" value="16" />
<setting name="Gtk/FontName" type="string" value="Sans 8" />
<setting name="Gtk/FontName" type="string" value="Verdana 10" />
<setting name="Gtk/KeyThemeName" type="string" value="Default" />
<setting name="Gtk/ToolbarStyle" type="string" value="icons" />
<setting name="Net/Background/Normal" type="color" red="186" green="45" blue="23" alpha="0" />
@ -15,5 +15,4 @@
<setting name="Net/DoubleClickTime" type="int" value="300" />
<setting name="Net/IconThemeName" type="string" value="edeneu" />
<setting name="Net/ThemeName" type="string" value="Raleigh" />
<setting name="Net/UserName" type="string" value="John Foo" />
</ede-settings>