[elm] Support elementary icon directory in D-Bus menu

Patch by: Henrique Dante de Almeida <hdante@profusion.mobi>



SVN revision: 81806

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"

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)

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@ \

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;