diff --git a/.gitignore b/.gitignore index 0b74c7ced7840c8478cca1096a4694be2c7f718f..9a2aed39b81ac387825c7810af08e145b21606af 100644 --- a/.gitignore +++ b/.gitignore @@ -118,8 +118,7 @@ build-aux/ configure bin/dbus/*.adaptor.h bin/dbus/cx.ring.Ring.service -bin/dring -bin/ringcli +bin/jamid doltcompile doltlibtool __pycache__ diff --git a/bin/Makefile.am b/bin/Makefile.am index c85c9656975a3308aa671119fccf2f9f1ba40ea9..254cdb9586c36ae0e078a905bed049cb78cc223f 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,21 +1,21 @@ if HAVE_WIN32 -libexec_PROGRAMS = ringcli -ringcli_SOURCES = winmain.cpp -ringcli_CXXFLAGS = -I$(top_srcdir)/src \ +libexec_PROGRAMS = jamid +jamid_SOURCES = winmain.cpp +jamid_CXXFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/dring \ -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \ $(AM_CXXFLAGS) -ringcli_LDADD = $(top_builddir)/src/libring.la +jamid_LDADD = $(top_builddir)/src/libring.la endif if HAVE_OSX -libexec_PROGRAMS = ringcli -ringcli_SOURCES = osxmain.cpp -ringcli_CXXFLAGS = -I$(top_srcdir)/src \ +libexec_PROGRAMS = jamid +jamid_SOURCES = osxmain.cpp +jamid_CXXFLAGS = -I$(top_srcdir)/src \ -I$(top_srcdir)/src/dring \ -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \ $(AM_CXXFLAGS) -ringcli_LDADD = $(top_builddir)/src/libring.la +jamid_LDADD = $(top_builddir)/src/libring.la endif SUBDIRS= @@ -23,15 +23,15 @@ SUBDIRS= if RING_DBUS SUBDIRS+=dbus -libexec_PROGRAMS = dring +libexec_PROGRAMS = jamid -dring_SOURCES = main.cpp +jamid_SOURCES = main.cpp -dring_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \ +jamid_CXXFLAGS= -I$(top_srcdir)/src ${DBUSCPP_CFLAGS} \ -I$(top_srcdir)/src/dring \ -DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" -dring_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl +jamid_LDADD = dbus/libclient_dbus.la ${DBUSCPP_LIBS} $(top_builddir)/src/libring.la -ldl endif if ENABLE_NODEJS diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in index a1f7fa5020d89e6701cc9105be58a59cb41d67b0..e150e1c8411df659665db30e80d99fc5bc9fd8f2 100644 --- a/bin/dbus/cx.ring.Ring.service.in +++ b/bin/dbus/cx.ring.Ring.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=cx.ring.Ring -Exec=@libexec@/dring +Exec=@libexec@/jamid diff --git a/src/manager.cpp b/src/manager.cpp index b5c3bf97e97b4aea2fbd60326ca42d493bcce4e9..cd4608a52cbf54a6c3a0759d14a99ef1cf538dd6 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -583,8 +583,7 @@ Manager::ManagerPimpl::processRemainingParticipants(Conference& conf) std::string Manager::ManagerPimpl::retrieveConfigPath() const { - static const char* const PROGNAME = "dring"; - return fileutils::get_config_dir() + DIR_SEPARATOR_STR + PROGNAME + ".yml"; + return fileutils::get_config_dir() + DIR_SEPARATOR_STR + "dring.yml"; } void