forked from enlightenment/efl
[elm] Support elementary icon directory in D-Bus menu
Patch by: Henrique Dante de Almeida <hdante@profusion.mobi> SVN revision: 81806
This commit is contained in:
parent
895d038885
commit
cdfe5155f8
|
@ -116,6 +116,8 @@ else
|
||||||
fi
|
fi
|
||||||
AC_SUBST(LOCALE_DIR)
|
AC_SUBST(LOCALE_DIR)
|
||||||
#================================================
|
#================================================
|
||||||
|
elementary_icon_dir="${datadir}/icons"
|
||||||
|
AC_SUBST(elementary_icon_dir)
|
||||||
|
|
||||||
lt_enable_auto_import=""
|
lt_enable_auto_import=""
|
||||||
ELM_UNIX_DEF="#undef"
|
ELM_UNIX_DEF="#undef"
|
||||||
|
|
|
@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
||||||
desktopdir = $(datadir)/applications
|
desktopdir = $(datadir)/applications
|
||||||
desktop_DATA = elementary_test.desktop elementary_config.desktop
|
desktop_DATA = elementary_test.desktop elementary_config.desktop
|
||||||
|
|
||||||
icondir = $(datadir)/icons
|
icondir = $(elementary_icon_dir)
|
||||||
icon_DATA = elementary.png
|
icon_DATA = elementary.png
|
||||||
|
|
||||||
EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
|
EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
|
||||||
|
|
|
@ -12,6 +12,7 @@ AM_CPPFLAGS = \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
|
||||||
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
|
-DICON_DIR=\"$(elementary_icon_dir)\" \
|
||||||
@ELEMENTARY_CFLAGS@ \
|
@ELEMENTARY_CFLAGS@ \
|
||||||
@ELEMENTARY_X_CFLAGS@ \
|
@ELEMENTARY_X_CFLAGS@ \
|
||||||
@ELEMENTARY_FB_CFLAGS@ \
|
@ELEMENTARY_FB_CFLAGS@ \
|
||||||
|
|
|
@ -743,6 +743,7 @@ _prop_icon_theme_path_get(const EDBus_Service_Interface *iface EINA_UNUSED,
|
||||||
{
|
{
|
||||||
EDBus_Message_Iter *actions;
|
EDBus_Message_Iter *actions;
|
||||||
edbus_message_iter_arguments_append(iter, "as", &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);
|
edbus_message_iter_container_close(iter, actions);
|
||||||
|
|
||||||
return EINA_TRUE;
|
return EINA_TRUE;
|
||||||
|
|
Loading…
Reference in New Issue