diff --git a/gnome/configure.ac b/gnome/configure.ac index a838f8f17fe2ff4b6c8b5c76f8de3c2b39e8c607..e1c5baab2dd5086d0788eb1adf625a0cd4be4e7c 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -26,7 +26,7 @@ LT_INIT(disable-static) CFLAGS="$CFLAGS -Wall -Wextra -Wshadow" dnl uninstalled gsr ui dir -AC_DEFINE_UNQUOTED(SFLPHONE_UIDIR_UNINSTALLED, "`pwd`/src/", +AC_DEFINE_UNQUOTED(RING_UIDIR_UNINSTALLED, "`pwd`/src/", [path to uninstalled Ring UI dir]) PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1 >= 0.75); diff --git a/gnome/globals.mak b/gnome/globals.mak index 93a5d1c39572d5f7408eb818d5263dd162e38a2d..2aaa52f0a0fddba67fc2c97d5cef8102129c8e74 100644 --- a/gnome/globals.mak +++ b/gnome/globals.mak @@ -23,7 +23,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ - -DSFLPHONE_UIDIR=\""$(datadir)/ring/ui"\" \ + -DRING_UIDIR=\""$(datadir)/ring/ui"\" \ -DPLUGINS_DIR=\""$(sflplugindir)"\" indent: @echo "Indenting code:" diff --git a/gnome/src/uimanager.c b/gnome/src/uimanager.c index a81a372cc09eb245e92ec9b04582e34b093e90c5..1bdd88037c93642ef2cdc9775d136582a6f26ef5 100644 --- a/gnome/src/uimanager.c +++ b/gnome/src/uimanager.c @@ -1087,12 +1087,12 @@ GtkBuilder *uibuilder_new(void) GtkBuilder* uibuilder = gtk_builder_new(); GError *error = NULL; /* try local dir first */ - gchar *ui_path = g_build_filename(SFLPHONE_UIDIR_UNINSTALLED, "ring_menus.ui", NULL); + gchar *ui_path = g_build_filename(RING_UIDIR_UNINSTALLED, "ring_menus.ui", NULL); if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) { /* try install dir */ g_free(ui_path); - ui_path = g_build_filename(SFLPHONE_UIDIR, "ring_menus.ui", NULL); + ui_path = g_build_filename(RING_UIDIR, "ring_menus.ui", NULL); /* if neither dir exists then we cannot load the UI */ if (!g_file_test(ui_path, G_FILE_TEST_EXISTS)) { diff --git a/plugins/globals.mak b/plugins/globals.mak index cbf37baf1045d9dc87d964653fa466396956d195..83df0bb66396259148c7fcc7eec01dfb0b2400a3 100644 --- a/plugins/globals.mak +++ b/plugins/globals.mak @@ -25,7 +25,7 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DLOCALEDIR=\""$(localedir)"\" \ - -DSFLPHONE_UIDIR=\""$(datadir)/ring/ui"\" \ + -DRING_UIDIR=\""$(datadir)/ring/ui"\" \ -DPLUGINS_DIR=\""$(sflplugindir)"\" indent: @echo "Indenting code:"