Commit e19dbdb1 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Fix path for GTK+ icons; clean up

parent 04e25fe2
......@@ -43,8 +43,8 @@ EXTRA_DIST = marshaller.list
sflphone_gtk_LDADD = $(DEPS_LIBS) $(NOTIFY_LIBS) $(SEXY_LIBS)
AM_CPPFLAGS = $(DEPS_CFLAGS) \
-DICONS_DIR=\""/usr/share/sflphone"\" \
-DCODECS_DIR=\""/usr/lib/sflphone/codecs"\"
-DICONS_DIR=\""$(prefix)/share/sflphone"\" \
-DCODECS_DIR=\""$(prefix)/lib/sflphone/codecs"\"
# add symbolic link
install-exec-local:
......
......@@ -1990,32 +1990,6 @@ void ManagerImpl::setAccountDetails( const std::string& accountID, const std::ma
setConfig(accountID, HOSTNAME, (*details.find(HOSTNAME)).second);
setConfig(accountID, CONFIG_ACCOUNT_MAILBOX,(*details.find(CONFIG_ACCOUNT_MAILBOX)).second);
// SIP SPECIFIC
/*
if (accountType == "SIP") {
link = Manager::instance().getAccountLink( accountID );
if( link==0 )
{
_debug("Can not retrieve SIP link...\n");
return;
}
setConfig(accountID, SIP_STUN_SERVER,(*details.find(SIP_STUN_SERVER)).second);
setConfig(accountID, SIP_USE_STUN, (*details.find(SIP_USE_STUN)).second == "TRUE" ? "1" : "0");
if((*details.find(SIP_USE_STUN)).second == "TRUE")
{
link->setStunServer((*details.find(SIP_STUN_SERVER)).second.data());
}
else
{
link->setStunServer("");
}
restartPJSIP();
}*/
saveConfig();
acc = getAccount(accountID);
......@@ -2030,8 +2004,6 @@ void ManagerImpl::setAccountDetails( const std::string& accountID, const std::ma
// Update account details to the client side
if (_dbus) _dbus->getConfigurationManager()->accountsChanged();
//delete link; link=0;
}
void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment