From cdfe5155f8e51fe6a417820695f9e92a0847723c Mon Sep 17 00:00:00 2001 From: Henrique Dante de Almeida Date: Fri, 28 Dec 2012 14:59:46 +0000 Subject: [PATCH] [elm] Support elementary icon directory in D-Bus menu Patch by: Henrique Dante de Almeida SVN revision: 81806 --- legacy/elementary/configure.ac | 2 ++ legacy/elementary/data/desktop/Makefile.am | 2 +- legacy/elementary/src/lib/Makefile.am | 1 + legacy/elementary/src/lib/elm_dbus_menu.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index 8c3c7c7593..6cde0d4c1c 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/configure.ac @@ -116,6 +116,8 @@ else fi AC_SUBST(LOCALE_DIR) #================================================ +elementary_icon_dir="${datadir}/icons" +AC_SUBST(elementary_icon_dir) lt_enable_auto_import="" ELM_UNIX_DEF="#undef" diff --git a/legacy/elementary/data/desktop/Makefile.am b/legacy/elementary/data/desktop/Makefile.am index c49fe4e7f9..fe8c41962b 100644 --- a/legacy/elementary/data/desktop/Makefile.am +++ b/legacy/elementary/data/desktop/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in desktopdir = $(datadir)/applications desktop_DATA = elementary_test.desktop elementary_config.desktop -icondir = $(datadir)/icons +icondir = $(elementary_icon_dir) icon_DATA = elementary.png EXTRA_DIST = $(desktop_DATA) $(icon_DATA) diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 83205f00db..6ab1f7698b 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DLOCALE_DIR=\"@LOCALE_DIR@\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DICON_DIR=\"$(elementary_icon_dir)\" \ @ELEMENTARY_CFLAGS@ \ @ELEMENTARY_X_CFLAGS@ \ @ELEMENTARY_FB_CFLAGS@ \ diff --git a/legacy/elementary/src/lib/elm_dbus_menu.c b/legacy/elementary/src/lib/elm_dbus_menu.c index a16d5cd3d4..eedf173144 100644 --- a/legacy/elementary/src/lib/elm_dbus_menu.c +++ b/legacy/elementary/src/lib/elm_dbus_menu.c @@ -743,6 +743,7 @@ _prop_icon_theme_path_get(const EDBus_Service_Interface *iface EINA_UNUSED, { EDBus_Message_Iter *actions; edbus_message_iter_arguments_append(iter, "as", &actions); + edbus_message_iter_arguments_append(actions, "s", ICON_DIR); edbus_message_iter_container_close(iter, actions); return EINA_TRUE;