From 232ba652da0ec7a525c89f79585e77b212638a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Tue, 27 Jan 2015 11:51:00 -0500
Subject: [PATCH] rebranding: update configure path
Refs #64797
Change-Id: Ieed7b25a0c04b2b50c58d828626a345ddfdb6903
---
gnome/configure.ac | 2 +-
gnome/globals.mak | 2 +-
gnome/src/uimanager.c | 4 ++--
plugins/globals.mak | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gnome/configure.ac b/gnome/configure.ac
index a838f8f17f..e1c5baab2d 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 93a5d1c395..2aaa52f0a0 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 a81a372cc0..1bdd88037c 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 cbf37baf10..83df0bb663 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:"
--
GitLab