summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrique Dante de Almeida <hdante@profusion.mobi>2012-12-28 14:59:46 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-12-28 14:59:46 +0000
commit302a7fd19c9764c7df761f466d3b2d4240674d98 (patch)
treeecb8c127b91f3063a169e8f163d19b5ffe8ae039
parent3b6d72e411a9ea8c3be29f867ea3d72d140ef932 (diff)
[elm] Support elementary icon directory in D-Bus menu
Patch by: Henrique Dante de Almeida <hdante@profusion.mobi> SVN revision: 81806
-rw-r--r--configure.ac2
-rw-r--r--data/desktop/Makefile.am2
-rw-r--r--src/lib/Makefile.am1
-rw-r--r--src/lib/elm_dbus_menu.c1
4 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 8c3c7c759..6cde0d4c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,8 @@ else
116fi 116fi
117AC_SUBST(LOCALE_DIR) 117AC_SUBST(LOCALE_DIR)
118#================================================ 118#================================================
119elementary_icon_dir="${datadir}/icons"
120AC_SUBST(elementary_icon_dir)
119 121
120lt_enable_auto_import="" 122lt_enable_auto_import=""
121ELM_UNIX_DEF="#undef" 123ELM_UNIX_DEF="#undef"
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
index c49fe4e7f..fe8c41962 100644
--- a/data/desktop/Makefile.am
+++ b/data/desktop/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
4desktopdir = $(datadir)/applications 4desktopdir = $(datadir)/applications
5desktop_DATA = elementary_test.desktop elementary_config.desktop 5desktop_DATA = elementary_test.desktop elementary_config.desktop
6 6
7icondir = $(datadir)/icons 7icondir = $(elementary_icon_dir)
8icon_DATA = elementary.png 8icon_DATA = elementary.png
9 9
10EXTRA_DIST = $(desktop_DATA) $(icon_DATA) 10EXTRA_DIST = $(desktop_DATA) $(icon_DATA)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 83205f00d..6ab1f7698 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,6 +12,7 @@ AM_CPPFLAGS = \
12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
13-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 13-DLOCALE_DIR=\"@LOCALE_DIR@\" \
14-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 14-DPACKAGE_LIB_DIR=\"$(libdir)\" \
15-DICON_DIR=\"$(elementary_icon_dir)\" \
15@ELEMENTARY_CFLAGS@ \ 16@ELEMENTARY_CFLAGS@ \
16@ELEMENTARY_X_CFLAGS@ \ 17@ELEMENTARY_X_CFLAGS@ \
17@ELEMENTARY_FB_CFLAGS@ \ 18@ELEMENTARY_FB_CFLAGS@ \
diff --git a/src/lib/elm_dbus_menu.c b/src/lib/elm_dbus_menu.c
index a16d5cd3d..eedf17314 100644
--- a/src/lib/elm_dbus_menu.c
+++ b/src/lib/elm_dbus_menu.c
@@ -743,6 +743,7 @@ _prop_icon_theme_path_get(const EDBus_Service_Interface *iface EINA_UNUSED,
743{ 743{
744 EDBus_Message_Iter *actions; 744 EDBus_Message_Iter *actions;
745 edbus_message_iter_arguments_append(iter, "as", &actions); 745 edbus_message_iter_arguments_append(iter, "as", &actions);
746 edbus_message_iter_arguments_append(actions, "s", ICON_DIR);
746 edbus_message_iter_container_close(iter, actions); 747 edbus_message_iter_container_close(iter, actions);
747 748
748 return EINA_TRUE; 749 return EINA_TRUE;