aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog24
-rw-r--r--configure.ac7
-rw-r--r--data/16x16/Makefile.am22
-rw-r--r--data/22x22/Makefile.am15
-rw-r--r--data/22x22/empathy-group-message.pngbin1261 -> 0 bytes
-rw-r--r--data/24x24/Makefile.am5
-rw-r--r--data/24x24/empathy-proto-jabber.pngbin934 -> 0 bytes
-rw-r--r--data/32x32/Makefile.am12
-rw-r--r--data/48x48/Makefile.am6
-rw-r--r--data/48x48/empathy-proto-jabber.pngbin2418 -> 0 bytes
-rw-r--r--data/Makefile.am16
-rw-r--r--data/gtalk.profile2
-rw-r--r--data/icons/Makefile.am136
-rw-r--r--data/icons/hicolor_actions_16x16_im-message-new.png (renamed from data/16x16/empathy-new-message.png)bin693 -> 693 bytes
-rw-r--r--data/icons/hicolor_actions_22x22_im-message-new.png (renamed from data/22x22/empathy-new-message.png)bin955 -> 955 bytes
-rw-r--r--data/icons/hicolor_actions_24x24_im-message-new.pngbin0 -> 994 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_empathy.png (renamed from data/16x16/empathy.png)bin797 -> 797 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-ekiga.png (renamed from data/16x16/empathy-proto-ekiga.png)bin882 -> 882 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-gizmo.png (renamed from data/16x16/empathy-proto-gizmo.png)bin902 -> 902 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-google-talk.png (renamed from data/16x16/empathy-proto-google-talk.png)bin815 -> 815 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-irc.png (renamed from data/16x16/empathy-proto-irc.png)bin782 -> 782 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-local-xmpp.png (renamed from data/16x16/empathy-proto-salut.png)bin863 -> 863 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-msn.png (renamed from data/16x16/empathy-proto-msn.png)bin802 -> 802 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-xmpp.png (renamed from data/16x16/empathy-proto-jabber.png)bin617 -> 617 bytes
-rw-r--r--data/icons/hicolor_apps_16x16_im-xmpp.svg (renamed from data/16x16/empathy-proto-jabber.svg)0
-rw-r--r--data/icons/hicolor_apps_22x22_empathy.png (renamed from data/22x22/empathy.png)bin1176 -> 1176 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-ekiga.png (renamed from data/22x22/empathy-proto-ekiga.png)bin1407 -> 1407 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-gizmo.png (renamed from data/22x22/empathy-proto-gizmo.png)bin1407 -> 1407 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-google-talk.png (renamed from data/22x22/empathy-proto-google-talk.png)bin1125 -> 1125 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-irc.png (renamed from data/22x22/empathy-proto-irc.png)bin1185 -> 1185 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-local-xmpp.png (renamed from data/22x22/empathy-proto-salut.png)bin1534 -> 1534 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-msn.png (renamed from data/22x22/empathy-proto-msn.png)bin1216 -> 1216 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-xmpp.png (renamed from data/22x22/empathy-proto-jabber.png)bin923 -> 923 bytes
-rw-r--r--data/icons/hicolor_apps_22x22_im-xmpp.svg (renamed from data/22x22/empathy-proto-jabber.svg)0
-rw-r--r--data/icons/hicolor_apps_24x24_empathy.pngbin0 -> 1144 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-ekiga.pngbin0 -> 1432 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-gizmo.pngbin0 -> 1450 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-google-talk.pngbin0 -> 1145 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-irc.pngbin0 -> 1251 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-local-xmpp.pngbin0 -> 1570 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-msn.pngbin0 -> 1230 bytes
-rw-r--r--data/icons/hicolor_apps_24x24_im-xmpp.pngbin0 -> 924 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_empathy.png (renamed from data/32x32/empathy.png)bin1811 -> 1811 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-ekiga.png (renamed from data/32x32/empathy-proto-ekiga.png)bin2178 -> 2178 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-gizmo.png (renamed from data/32x32/empathy-proto-gizmo.png)bin2029 -> 2029 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-google-talk.png (renamed from data/32x32/empathy-proto-google-talk.png)bin1980 -> 1980 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-irc.png (renamed from data/32x32/empathy-proto-irc.png)bin1597 -> 1597 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-local-xmpp.pngbin0 -> 2454 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-msn.png (renamed from data/32x32/empathy-proto-msn.png)bin1865 -> 1865 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-xmpp.png (renamed from data/32x32/empathy-proto-jabber.png)bin1473 -> 1473 bytes
-rw-r--r--data/icons/hicolor_apps_32x32_im-xmpp.svg (renamed from data/32x32/empathy-proto-jabber.svg)0
-rw-r--r--data/icons/hicolor_apps_48x48_empathy.png (renamed from data/48x48/empathy.png)bin2934 -> 2934 bytes
-rw-r--r--[-rwxr-xr-x]data/icons/hicolor_apps_scalable_empathy.svg (renamed from data/scalable/empathy.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-ekiga.svg (renamed from data/scalable/empathy-proto-ekiga.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-gizmo.svg (renamed from data/scalable/empathy-proto-gizmo.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-google-talk.svg (renamed from data/scalable/empathy-proto-google-talk.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-irc.svg (renamed from data/scalable/empathy-proto-irc.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-local-xmpp.svg (renamed from data/scalable/empathy-proto-salut.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-msn.svg (renamed from data/scalable/empathy-proto-msn.svg)0
-rw-r--r--data/icons/hicolor_apps_scalable_im-xmpp.svg (renamed from data/scalable/empathy-proto-jabber.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-available.png (renamed from data/16x16/empathy-available.png)bin689 -> 689 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-available.svg (renamed from data/scalable/empathy-available.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-away.png (renamed from data/16x16/empathy-away.png)bin538 -> 538 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-away.svg (renamed from data/scalable/empathy-away.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-busy.png (renamed from data/16x16/empathy-busy.png)bin616 -> 616 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-busy.svg (renamed from data/scalable/empathy-busy.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-extended-away.png (renamed from data/16x16/empathy-extended-away.png)bin729 -> 729 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-extended-away.svg (renamed from data/scalable/empathy-extended-away.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-offline.png (renamed from data/16x16/empathy-offline.png)bin401 -> 401 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-offline.svg (renamed from data/scalable/empathy-offline.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_empathy-pending.png (renamed from data/16x16/empathy-pending.png)bin605 -> 605 bytes
-rw-r--r--data/icons/hicolor_status_16x16_empathy-pending.svg (renamed from data/scalable/empathy-pending.svg)0
-rw-r--r--data/icons/hicolor_status_16x16_im-message.png (renamed from data/16x16/empathy-message.png)bin510 -> 510 bytes
-rw-r--r--data/icons/hicolor_status_16x16_user-typing.png (renamed from data/16x16/empathy-typing.png)bin587 -> 587 bytes
-rw-r--r--data/irc.profile2
-rw-r--r--data/jabber.profile2
-rw-r--r--data/msn.profile2
-rw-r--r--data/salut.profile2
-rw-r--r--data/scalable/Makefile.am18
-rw-r--r--libempathy-gtk/empathy-group-chat.glade2
-rw-r--r--libempathy-gtk/empathy-images.h8
-rw-r--r--libempathy-gtk/empathy-main-window.glade4
-rw-r--r--libempathy-gtk/empathy-status-icon.glade2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/empathy.c2
85 files changed, 177 insertions, 113 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f7685358..0c008c303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
2007-10-28 Xavier Claessens <xclaesse@gmail.com>
+ * libempathy-gtk/empathy-status-icon.glade:
+ * libempathy-gtk/empathy-group-chat.glade:
+ * libempathy-gtk/empathy-main-window.glade:
+ * libempathy-gtk/empathy-images.h:
+ * src/empathy.c:
+ * src/Makefile.am:
+ * configure.ac:
+ * data/jabber.profile:
+ * data/salut.profile:
+ * data/msn.profile:
+ * data/gtalk.profile:
+ * data/irc.profile:
+ * data/22x22:
+ * data/32x32:
+ * data/24x24:
+ * data/16x16:
+ * data/48x48:
+ * data/scalable:
+ * data/Makefile.am:
+ * data/icons/*: Rename icons to follow fd.o icon naming spec. Move icons
+ to the right directory. Fixes bug #470418 (Michael Monreal).
+
+2007-10-28 Xavier Claessens <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-smiley-manager.c: Update to new icon naming
spec for new avatars. Fixes bug #490173 (Michael Monreal).
diff --git a/configure.ac b/configure.ac
index 3dbb6b3e3..4e6f32ee6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,12 +274,7 @@ AC_OUTPUT([
Makefile
data/Makefile
data/empathy.desktop.in
- data/16x16/Makefile
- data/22x22/Makefile
- data/24x24/Makefile
- data/32x32/Makefile
- data/48x48/Makefile
- data/scalable/Makefile
+ data/icons/Makefile
po/Makefile.in
libempathy/Makefile
libempathy/libempathy.pc
diff --git a/data/16x16/Makefile.am b/data/16x16/Makefile.am
deleted file mode 100644
index 68823014a..000000000
--- a/data/16x16/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = \
- empathy.png \
- empathy-available.png \
- empathy-offline.png \
- empathy-away.png \
- empathy-extended-away.png \
- empathy-busy.png \
- empathy-pending.png \
- empathy-message.png \
- empathy-new-message.png \
- empathy-typing.png \
- empathy-proto-ekiga.png \
- empathy-proto-google-talk.png \
- empathy-proto-msn.png \
- empathy-proto-gizmo.png \
- empathy-proto-irc.png \
- empathy-proto-jabber.png \
- empathy-proto-salut.png
-
-EXTRA_DIST = $(icon_DATA) \
- empathy-proto-jabber.svg
diff --git a/data/22x22/Makefile.am b/data/22x22/Makefile.am
deleted file mode 100644
index 37467bde9..000000000
--- a/data/22x22/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = \
- empathy.png \
- empathy-new-message.png \
- empathy-group-message.png \
- empathy-proto-ekiga.png \
- empathy-proto-google-talk.png \
- empathy-proto-msn.png \
- empathy-proto-gizmo.png \
- empathy-proto-irc.png \
- empathy-proto-jabber.png \
- empathy-proto-salut.png
-
-EXTRA_DIST = $(icon_DATA) \
- empathy-proto-jabber.svg
diff --git a/data/22x22/empathy-group-message.png b/data/22x22/empathy-group-message.png
deleted file mode 100644
index 7b803b1be..000000000
--- a/data/22x22/empathy-group-message.png
+++ /dev/null
Binary files differ
diff --git a/data/24x24/Makefile.am b/data/24x24/Makefile.am
deleted file mode 100644
index c0a44da40..000000000
--- a/data/24x24/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = \
- empathy-proto-jabber.png
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/data/24x24/empathy-proto-jabber.png b/data/24x24/empathy-proto-jabber.png
deleted file mode 100644
index 0629c95fc..000000000
--- a/data/24x24/empathy-proto-jabber.png
+++ /dev/null
Binary files differ
diff --git a/data/32x32/Makefile.am b/data/32x32/Makefile.am
deleted file mode 100644
index c54874268..000000000
--- a/data/32x32/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = \
- empathy.png \
- empathy-proto-ekiga.png \
- empathy-proto-google-talk.png \
- empathy-proto-msn.png \
- empathy-proto-gizmo.png \
- empathy-proto-irc.png \
- empathy-proto-jabber.png
-
-EXTRA_DIST = $(icon_DATA) \
- empathy-proto-jabber.svg
diff --git a/data/48x48/Makefile.am b/data/48x48/Makefile.am
deleted file mode 100644
index 994c71096..000000000
--- a/data/48x48/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = \
- empathy.png \
- empathy-proto-jabber.png
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/data/48x48/empathy-proto-jabber.png b/data/48x48/empathy-proto-jabber.png
deleted file mode 100644
index 052aeb5e5..000000000
--- a/data/48x48/empathy-proto-jabber.png
+++ /dev/null
Binary files differ
diff --git a/data/Makefile.am b/data/Makefile.am
index 964abc78e..87566981a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+SUBDIRS = icons
profiledir = $(datadir)/mission-control/profiles
profile_DATA = \
@@ -10,19 +10,6 @@ profile_DATA = \
sofiasip.profile \
aim.profile
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After (un)install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
-
autostartdir = $(sysconfdir)/xdg/autostart
autostart_in_files = empathy.desktop.in
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
@@ -45,7 +32,6 @@ install-data-local:
endif
EXTRA_DIST = \
- $(image_DATA) \
$(profile_DATA) \
$(autostart_in_files) \
$(autostart_DATA) \
diff --git a/data/gtalk.profile b/data/gtalk.profile
index 6d32f0728..edc2b40fa 100644
--- a/data/gtalk.profile
+++ b/data/gtalk.profile
@@ -2,7 +2,7 @@
Manager=gabble
Protocol=jabber
DisplayName=Google Talk
-IconName = empathy-proto-google-talk
+IconName = im-google-talk
ConfigurationUI = jabber
Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, supports-avatars, supports-alias
SupportedPresences = offline,available,away,extended-away,do-not-disturb
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 000000000..95a62027d
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,136 @@
+NULL =
+
+public_icons_themes = \
+ hicolor \
+ $(NULL)
+
+public_icons = \
+ hicolor_apps_16x16_empathy.png \
+ hicolor_apps_22x22_empathy.png \
+ hicolor_apps_24x24_empathy.png \
+ hicolor_apps_32x32_empathy.png \
+ hicolor_apps_48x48_empathy.png \
+ hicolor_apps_scalable_empathy.svg \
+ $(NULL)
+
+private_icons = \
+ hicolor_actions_16x16_im-message-new.png \
+ hicolor_actions_22x22_im-message-new.png \
+ hicolor_actions_24x24_im-message-new.png \
+ hicolor_apps_16x16_im-ekiga.png \
+ hicolor_apps_16x16_im-gizmo.png \
+ hicolor_apps_16x16_im-google-talk.png \
+ hicolor_apps_16x16_im-irc.png \
+ hicolor_apps_16x16_im-xmpp.png \
+ hicolor_apps_16x16_im-msn.png \
+ hicolor_apps_16x16_im-local-xmpp.png \
+ hicolor_apps_22x22_im-ekiga.png \
+ hicolor_apps_22x22_im-gizmo.png \
+ hicolor_apps_22x22_im-google-talk.png \
+ hicolor_apps_22x22_im-irc.png \
+ hicolor_apps_22x22_im-xmpp.png \
+ hicolor_apps_22x22_im-msn.png \
+ hicolor_apps_22x22_im-local-xmpp.png \
+ hicolor_apps_24x24_im-ekiga.png \
+ hicolor_apps_24x24_im-gizmo.png \
+ hicolor_apps_24x24_im-google-talk.png \
+ hicolor_apps_24x24_im-irc.png \
+ hicolor_apps_24x24_im-xmpp.png \
+ hicolor_apps_24x24_im-msn.png \
+ hicolor_apps_24x24_im-local-xmpp.png \
+ hicolor_apps_32x32_im-ekiga.png \
+ hicolor_apps_32x32_im-gizmo.png \
+ hicolor_apps_32x32_im-google-talk.png \
+ hicolor_apps_32x32_im-irc.png \
+ hicolor_apps_32x32_im-xmpp.png \
+ hicolor_apps_32x32_im-msn.png \
+ hicolor_apps_32x32_im-local-xmpp.png \
+ hicolor_apps_scalable_im-ekiga.svg \
+ hicolor_apps_scalable_im-gizmo.svg \
+ hicolor_apps_scalable_im-google-talk.svg \
+ hicolor_apps_scalable_im-irc.svg \
+ hicolor_apps_scalable_im-xmpp.svg \
+ hicolor_apps_scalable_im-msn.svg \
+ hicolor_apps_scalable_im-local-xmpp.svg \
+ hicolor_status_16x16_im-message.png \
+ hicolor_status_16x16_empathy-available.png \
+ hicolor_status_16x16_empathy-away.png \
+ hicolor_status_16x16_empathy-busy.png \
+ hicolor_status_16x16_empathy-extended-away.png \
+ hicolor_status_16x16_empathy-offline.png \
+ hicolor_status_16x16_empathy-pending.png \
+ hicolor_status_16x16_user-typing.png \
+ $(NULL)
+
+noinst_DATA = \
+ hicolor_apps_16x16_im-xmpp.svg \
+ hicolor_apps_22x22_im-xmpp.svg \
+ hicolor_apps_32x32_im-xmpp.svg \
+ hicolor_status_16x16_empathy-available.svg \
+ hicolor_status_16x16_empathy-away.svg \
+ hicolor_status_16x16_empathy-busy.svg \
+ hicolor_status_16x16_empathy-extended-away.svg \
+ hicolor_status_16x16_empathy-offline.svg \
+ hicolor_status_16x16_empathy-pending.svg \
+ $(NULL)
+
+EXTRA_DIST = \
+ $(public_icons) \
+ $(private_icons) \
+ $(noinst_DATA) \
+ $(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ for theme in $(public_icons_themes); do \
+ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+ done; \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ for theme in $(public_icons_themes); do \
+ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+ done; \
+ fi
+
+install-icons:
+ for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+uninstall-icons:
+ -for icon in $(public_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done; \
+ for icon in $(private_icons); do \
+ THEME=`echo $$icon | cut -d_ -f1`; \
+ CONTEXT=`echo $$icon | cut -d_ -f2`; \
+ SIZE=`echo $$icon | cut -d_ -f3`; \
+ ICONFILE=`echo $$icon | cut -d_ -f4`; \
+ rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+ done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache
diff --git a/data/16x16/empathy-new-message.png b/data/icons/hicolor_actions_16x16_im-message-new.png
index da01aff75..da01aff75 100644
--- a/data/16x16/empathy-new-message.png
+++ b/data/icons/hicolor_actions_16x16_im-message-new.png
Binary files differ
diff --git a/data/22x22/empathy-new-message.png b/data/icons/hicolor_actions_22x22_im-message-new.png
index f75737ff2..f75737ff2 100644
--- a/data/22x22/empathy-new-message.png
+++ b/data/icons/hicolor_actions_22x22_im-message-new.png
Binary files differ
diff --git a/data/icons/hicolor_actions_24x24_im-message-new.png b/data/icons/hicolor_actions_24x24_im-message-new.png
new file mode 100644
index 000000000..70f7a6622
--- /dev/null
+++ b/data/icons/hicolor_actions_24x24_im-message-new.png
Binary files differ
diff --git a/data/16x16/empathy.png b/data/icons/hicolor_apps_16x16_empathy.png
index 3d400d8ef..3d400d8ef 100644
--- a/data/16x16/empathy.png
+++ b/data/icons/hicolor_apps_16x16_empathy.png
Binary files differ
diff --git a/data/16x16/empathy-proto-ekiga.png b/data/icons/hicolor_apps_16x16_im-ekiga.png
index 74d097d38..74d097d38 100644
--- a/data/16x16/empathy-proto-ekiga.png
+++ b/data/icons/hicolor_apps_16x16_im-ekiga.png
Binary files differ
diff --git a/data/16x16/empathy-proto-gizmo.png b/data/icons/hicolor_apps_16x16_im-gizmo.png
index 6cfbef5de..6cfbef5de 100644
--- a/data/16x16/empathy-proto-gizmo.png
+++ b/data/icons/hicolor_apps_16x16_im-gizmo.png
Binary files differ
diff --git a/data/16x16/empathy-proto-google-talk.png b/data/icons/hicolor_apps_16x16_im-google-talk.png
index e80b03b16..e80b03b16 100644
--- a/data/16x16/empathy-proto-google-talk.png
+++ b/data/icons/hicolor_apps_16x16_im-google-talk.png
Binary files differ
diff --git a/data/16x16/empathy-proto-irc.png b/data/icons/hicolor_apps_16x16_im-irc.png
index 00647bba6..00647bba6 100644
--- a/data/16x16/empathy-proto-irc.png
+++ b/data/icons/hicolor_apps_16x16_im-irc.png
Binary files differ
diff --git a/data/16x16/empathy-proto-salut.png b/data/icons/hicolor_apps_16x16_im-local-xmpp.png
index 8ff47406e..8ff47406e 100644
--- a/data/16x16/empathy-proto-salut.png
+++ b/data/icons/hicolor_apps_16x16_im-local-xmpp.png
Binary files differ
diff --git a/data/16x16/empathy-proto-msn.png b/data/icons/hicolor_apps_16x16_im-msn.png
index 779c9e106..779c9e106 100644
--- a/data/16x16/empathy-proto-msn.png
+++ b/data/icons/hicolor_apps_16x16_im-msn.png
Binary files differ
diff --git a/data/16x16/empathy-proto-jabber.png b/data/icons/hicolor_apps_16x16_im-xmpp.png
index 542cd7293..542cd7293 100644
--- a/data/16x16/empathy-proto-jabber.png
+++ b/data/icons/hicolor_apps_16x16_im-xmpp.png
Binary files differ
diff --git a/data/16x16/empathy-proto-jabber.svg b/data/icons/hicolor_apps_16x16_im-xmpp.svg
index 33cc3429e..33cc3429e 100644
--- a/data/16x16/empathy-proto-jabber.svg
+++ b/data/icons/hicolor_apps_16x16_im-xmpp.svg
diff --git a/data/22x22/empathy.png b/data/icons/hicolor_apps_22x22_empathy.png
index d3e89c919..d3e89c919 100644
--- a/data/22x22/empathy.png
+++ b/data/icons/hicolor_apps_22x22_empathy.png
Binary files differ
diff --git a/data/22x22/empathy-proto-ekiga.png b/data/icons/hicolor_apps_22x22_im-ekiga.png
index 62ecc446a..62ecc446a 100644
--- a/data/22x22/empathy-proto-ekiga.png
+++ b/data/icons/hicolor_apps_22x22_im-ekiga.png
Binary files differ
diff --git a/data/22x22/empathy-proto-gizmo.png b/data/icons/hicolor_apps_22x22_im-gizmo.png
index a47b462d0..a47b462d0 100644
--- a/data/22x22/empathy-proto-gizmo.png
+++ b/data/icons/hicolor_apps_22x22_im-gizmo.png
Binary files differ
diff --git a/data/22x22/empathy-proto-google-talk.png b/data/icons/hicolor_apps_22x22_im-google-talk.png
index e1997891e..e1997891e 100644
--- a/data/22x22/empathy-proto-google-talk.png
+++ b/data/icons/hicolor_apps_22x22_im-google-talk.png
Binary files differ
diff --git a/data/22x22/empathy-proto-irc.png b/data/icons/hicolor_apps_22x22_im-irc.png
index fefb85130..fefb85130 100644
--- a/data/22x22/empathy-proto-irc.png
+++ b/data/icons/hicolor_apps_22x22_im-irc.png
Binary files differ
diff --git a/data/22x22/empathy-proto-salut.png b/data/icons/hicolor_apps_22x22_im-local-xmpp.png
index 447e59cb5..447e59cb5 100644
--- a/data/22x22/empathy-proto-salut.png
+++ b/data/icons/hicolor_apps_22x22_im-local-xmpp.png
Binary files differ
diff --git a/data/22x22/empathy-proto-msn.png b/data/icons/hicolor_apps_22x22_im-msn.png
index ec32ee71e..ec32ee71e 100644
--- a/data/22x22/empathy-proto-msn.png
+++ b/data/icons/hicolor_apps_22x22_im-msn.png
Binary files differ
diff --git a/data/22x22/empathy-proto-jabber.png b/data/icons/hicolor_apps_22x22_im-xmpp.png
index 6f3d30934..6f3d30934 100644
--- a/data/22x22/empathy-proto-jabber.png
+++ b/data/icons/hicolor_apps_22x22_im-xmpp.png
Binary files differ
diff --git a/data/22x22/empathy-proto-jabber.svg b/data/icons/hicolor_apps_22x22_im-xmpp.svg
index a00d82301..a00d82301 100644
--- a/data/22x22/empathy-proto-jabber.svg
+++ b/data/icons/hicolor_apps_22x22_im-xmpp.svg
diff --git a/data/icons/hicolor_apps_24x24_empathy.png b/data/icons/hicolor_apps_24x24_empathy.png
new file mode 100644
index 000000000..c23641b3c
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_empathy.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-ekiga.png b/data/icons/hicolor_apps_24x24_im-ekiga.png
new file mode 100644
index 000000000..622aee84b
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-ekiga.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-gizmo.png b/data/icons/hicolor_apps_24x24_im-gizmo.png
new file mode 100644
index 000000000..487879ede
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-gizmo.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-google-talk.png b/data/icons/hicolor_apps_24x24_im-google-talk.png
new file mode 100644
index 000000000..5b93e368c
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-google-talk.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-irc.png b/data/icons/hicolor_apps_24x24_im-irc.png
new file mode 100644
index 000000000..91adfafef
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-irc.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-local-xmpp.png b/data/icons/hicolor_apps_24x24_im-local-xmpp.png
new file mode 100644
index 000000000..db47eae62
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-local-xmpp.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-msn.png b/data/icons/hicolor_apps_24x24_im-msn.png
new file mode 100644
index 000000000..21e4e2576
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-msn.png
Binary files differ
diff --git a/data/icons/hicolor_apps_24x24_im-xmpp.png b/data/icons/hicolor_apps_24x24_im-xmpp.png
new file mode 100644
index 000000000..9334ce4ed
--- /dev/null
+++ b/data/icons/hicolor_apps_24x24_im-xmpp.png
Binary files differ
diff --git a/data/32x32/empathy.png b/data/icons/hicolor_apps_32x32_empathy.png
index 9e29d7f42..9e29d7f42 100644
--- a/data/32x32/empathy.png
+++ b/data/icons/hicolor_apps_32x32_empathy.png
Binary files differ
diff --git a/data/32x32/empathy-proto-ekiga.png b/data/icons/hicolor_apps_32x32_im-ekiga.png
index 639e118e6..639e118e6 100644
--- a/data/32x32/empathy-proto-ekiga.png
+++ b/data/icons/hicolor_apps_32x32_im-ekiga.png
Binary files differ
diff --git a/data/32x32/empathy-proto-gizmo.png b/data/icons/hicolor_apps_32x32_im-gizmo.png
index 83fa95458..83fa95458 100644
--- a/data/32x32/empathy-proto-gizmo.png
+++ b/data/icons/hicolor_apps_32x32_im-gizmo.png
Binary files differ
diff --git a/data/32x32/empathy-proto-google-talk.png b/data/icons/hicolor_apps_32x32_im-google-talk.png
index 25e8aae67..25e8aae67 100644
--- a/data/32x32/empathy-proto-google-talk.png
+++ b/data/icons/hicolor_apps_32x32_im-google-talk.png
Binary files differ
diff --git a/data/32x32/empathy-proto-irc.png b/data/icons/hicolor_apps_32x32_im-irc.png
index 471742a86..471742a86 100644
--- a/data/32x32/empathy-proto-irc.png
+++ b/data/icons/hicolor_apps_32x32_im-irc.png
Binary files differ
diff --git a/data/icons/hicolor_apps_32x32_im-local-xmpp.png b/data/icons/hicolor_apps_32x32_im-local-xmpp.png
new file mode 100644
index 000000000..a128bdb6b
--- /dev/null
+++ b/data/icons/hicolor_apps_32x32_im-local-xmpp.png
Binary files differ
diff --git a/data/32x32/empathy-proto-msn.png b/data/icons/hicolor_apps_32x32_im-msn.png
index 50c4c7ad0..50c4c7ad0 100644
--- a/data/32x32/empathy-proto-msn.png
+++ b/data/icons/hicolor_apps_32x32_im-msn.png
Binary files differ
diff --git a/data/32x32/empathy-proto-jabber.png b/data/icons/hicolor_apps_32x32_im-xmpp.png
index d43a374ce..d43a374ce 100644
--- a/data/32x32/empathy-proto-jabber.png
+++ b/data/icons/hicolor_apps_32x32_im-xmpp.png
Binary files differ
diff --git a/data/32x32/empathy-proto-jabber.svg b/data/icons/hicolor_apps_32x32_im-xmpp.svg
index 2039bf299..2039bf299 100644
--- a/data/32x32/empathy-proto-jabber.svg
+++ b/data/icons/hicolor_apps_32x32_im-xmpp.svg
diff --git a/data/48x48/empathy.png b/data/icons/hicolor_apps_48x48_empathy.png
index 753779a9c..753779a9c 100644
--- a/data/48x48/empathy.png
+++ b/data/icons/hicolor_apps_48x48_empathy.png
Binary files differ
diff --git a/data/scalable/empathy.svg b/data/icons/hicolor_apps_scalable_empathy.svg
index 875c0ef0a..875c0ef0a 100755..100644
--- a/data/scalable/empathy.svg
+++ b/data/icons/hicolor_apps_scalable_empathy.svg
diff --git a/data/scalable/empathy-proto-ekiga.svg b/data/icons/hicolor_apps_scalable_im-ekiga.svg
index 78a9e7344..78a9e7344 100644
--- a/data/scalable/empathy-proto-ekiga.svg
+++ b/data/icons/hicolor_apps_scalable_im-ekiga.svg
diff --git a/data/scalable/empathy-proto-gizmo.svg b/data/icons/hicolor_apps_scalable_im-gizmo.svg
index 0c6aa4a56..0c6aa4a56 100644
--- a/data/scalable/empathy-proto-gizmo.svg
+++ b/data/icons/hicolor_apps_scalable_im-gizmo.svg
diff --git a/data/scalable/empathy-proto-google-talk.svg b/data/icons/hicolor_apps_scalable_im-google-talk.svg
index 53d543309..53d543309 100644
--- a/data/scalable/empathy-proto-google-talk.svg
+++ b/data/icons/hicolor_apps_scalable_im-google-talk.svg
diff --git a/data/scalable/empathy-proto-irc.svg b/data/icons/hicolor_apps_scalable_im-irc.svg
index a4ee660e3..a4ee660e3 100644
--- a/data/scalable/empathy-proto-irc.svg
+++ b/data/icons/hicolor_apps_scalable_im-irc.svg
diff --git a/data/scalable/empathy-proto-salut.svg b/data/icons/hicolor_apps_scalable_im-local-xmpp.svg
index cd9827459..cd9827459 100644
--- a/data/scalable/empathy-proto-salut.svg
+++ b/data/icons/hicolor_apps_scalable_im-local-xmpp.svg
diff --git a/data/scalable/empathy-proto-msn.svg b/data/icons/hicolor_apps_scalable_im-msn.svg
index eb6511638..eb6511638 100644
--- a/data/scalable/empathy-proto-msn.svg
+++ b/data/icons/hicolor_apps_scalable_im-msn.svg
diff --git a/data/scalable/empathy-proto-jabber.svg b/data/icons/hicolor_apps_scalable_im-xmpp.svg
index a0a9eb866..a0a9eb866 100644
--- a/data/scalable/empathy-proto-jabber.svg
+++ b/data/icons/hicolor_apps_scalable_im-xmpp.svg
diff --git a/data/16x16/empathy-available.png b/data/icons/hicolor_status_16x16_empathy-available.png
index 66b24967a..66b24967a 100644
--- a/data/16x16/empathy-available.png
+++ b/data/icons/hicolor_status_16x16_empathy-available.png
Binary files differ
diff --git a/data/scalable/empathy-available.svg b/data/icons/hicolor_status_16x16_empathy-available.svg
index 8d4cc585f..8d4cc585f 100644
--- a/data/scalable/empathy-available.svg
+++ b/data/icons/hicolor_status_16x16_empathy-available.svg
diff --git a/data/16x16/empathy-away.png b/data/icons/hicolor_status_16x16_empathy-away.png
index ff59e309d..ff59e309d 100644
--- a/data/16x16/empathy-away.png
+++ b/data/icons/hicolor_status_16x16_empathy-away.png
Binary files differ
diff --git a/data/scalable/empathy-away.svg b/data/icons/hicolor_status_16x16_empathy-away.svg
index 7e7b0ed6b..7e7b0ed6b 100644
--- a/data/scalable/empathy-away.svg
+++ b/data/icons/hicolor_status_16x16_empathy-away.svg
diff --git a/data/16x16/empathy-busy.png b/data/icons/hicolor_status_16x16_empathy-busy.png
index fec554d89..fec554d89 100644
--- a/data/16x16/empathy-busy.png
+++ b/data/icons/hicolor_status_16x16_empathy-busy.png
Binary files differ
diff --git a/data/scalable/empathy-busy.svg b/data/icons/hicolor_status_16x16_empathy-busy.svg
index 66fc70945..66fc70945 100644
--- a/data/scalable/empathy-busy.svg
+++ b/data/icons/hicolor_status_16x16_empathy-busy.svg
diff --git a/data/16x16/empathy-extended-away.png b/data/icons/hicolor_status_16x16_empathy-extended-away.png
index 9f74bd01a..9f74bd01a 100644
--- a/data/16x16/empathy-extended-away.png
+++ b/data/icons/hicolor_status_16x16_empathy-extended-away.png
Binary files differ
diff --git a/data/scalable/empathy-extended-away.svg b/data/icons/hicolor_status_16x16_empathy-extended-away.svg
index 3104dff54..3104dff54 100644
--- a/data/scalable/empathy-extended-away.svg
+++ b/data/icons/hicolor_status_16x16_empathy-extended-away.svg
diff --git a/data/16x16/empathy-offline.png b/data/icons/hicolor_status_16x16_empathy-offline.png
index 0321dc6bb..0321dc6bb 100644
--- a/data/16x16/empathy-offline.png
+++ b/data/icons/hicolor_status_16x16_empathy-offline.png
Binary files differ
diff --git a/data/scalable/empathy-offline.svg b/data/icons/hicolor_status_16x16_empathy-offline.svg
index 975f7dc8f..975f7dc8f 100644
--- a/data/scalable/empathy-offline.svg
+++ b/data/icons/hicolor_status_16x16_empathy-offline.svg
diff --git a/data/16x16/empathy-pending.png b/data/icons/hicolor_status_16x16_empathy-pending.png
index 4adfdb648..4adfdb648 100644
--- a/data/16x16/empathy-pending.png
+++ b/data/icons/hicolor_status_16x16_empathy-pending.png
Binary files differ
diff --git a/data/scalable/empathy-pending.svg b/data/icons/hicolor_status_16x16_empathy-pending.svg
index 89c626c85..89c626c85 100644
--- a/data/scalable/empathy-pending.svg
+++ b/data/icons/hicolor_status_16x16_empathy-pending.svg
diff --git a/data/16x16/empathy-message.png b/data/icons/hicolor_status_16x16_im-message.png
index be0e2e157..be0e2e157 100644
--- a/data/16x16/empathy-message.png
+++ b/data/icons/hicolor_status_16x16_im-message.png
Binary files differ
diff --git a/data/16x16/empathy-typing.png b/data/icons/hicolor_status_16x16_user-typing.png
index 5c272a339..5c272a339 100644
--- a/data/16x16/empathy-typing.png
+++ b/data/icons/hicolor_status_16x16_user-typing.png
Binary files differ
diff --git a/data/irc.profile b/data/irc.profile
index 75736caab..a3fc7c4e8 100644
--- a/data/irc.profile
+++ b/data/irc.profile
@@ -2,7 +2,7 @@
Manager=idle
Protocol=irc
DisplayName=IRC
-IconName = empathy-proto-irc
+IconName = im-irc
ConfigurationUI = irc
Capabilities = chat-p2p,chat-room,chat-room-list,supports-alias
SupportedPresences = offline,away
diff --git a/data/jabber.profile b/data/jabber.profile
index 1ad05075e..0dfd14a84 100644
--- a/data/jabber.profile
+++ b/data/jabber.profile
@@ -2,7 +2,7 @@
Manager=gabble
Protocol=jabber
DisplayName=Jabber
-IconName = empathy-proto-jabber
+IconName = im-xmpp
ConfigurationUI = jabber
Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, split-account, registration-ui, supports-avatars, supports-alias
SupportedPresences = offline,available,away,extended-away,do-not-disturb
diff --git a/data/msn.profile b/data/msn.profile
index 554893dee..06860e64b 100644
--- a/data/msn.profile
+++ b/data/msn.profile
@@ -2,7 +2,7 @@
Manager=butterfly
Protocol=msn
DisplayName=MSN
-IconName = empathy-proto-msn
+IconName = im-msn
ConfigurationUI = msn
Capabilities = chat-p2p, split-account, supports-avatars, supports-alias
SupportedPresences = offline,available,away,extended-away,hidden,do-not-disturb
diff --git a/data/salut.profile b/data/salut.profile
index bd8baa350..873979209 100644
--- a/data/salut.profile
+++ b/data/salut.profile
@@ -2,7 +2,7 @@
Manager=salut
Protocol=local-xmpp
DisplayName=Salut
-IconName = empathy-proto-salut
+IconName = im-local-xmpp
ConfigurationUI = local-xmpp
Capabilities = chat-p2p, chat-room, chat-room-list, voice-p2p, supports-avatars, supports-alias
SupportedPresences = offline,available,away,extended-away,do-not-disturb
diff --git a/data/scalable/Makefile.am b/data/scalable/Makefile.am
deleted file mode 100644
index cb7998eb0..000000000
--- a/data/scalable/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-icondir = $(datadir)/icons/hicolor/scalable/apps
-icon_DATA = \
- empathy.svg \
- empathy-available.svg \
- empathy-offline.svg \
- empathy-away.svg \
- empathy-extended-away.svg \
- empathy-busy.svg \
- empathy-pending.svg \
- empathy-proto-ekiga.svg \
- empathy-proto-google-talk.svg \
- empathy-proto-msn.svg \
- empathy-proto-gizmo.svg \
- empathy-proto-irc.svg \
- empathy-proto-jabber.svg \
- empathy-proto-salut.svg
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/libempathy-gtk/empathy-group-chat.glade b/libempathy-gtk/empathy-group-chat.glade
index 885afc5b4..5cb6fc3ef 100644
--- a/libempathy-gtk/empathy-group-chat.glade
+++ b/libempathy-gtk/empathy-group-chat.glade
@@ -13,7 +13,7 @@
<property name="default_height">400</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="icon">empathy-group-message.png</property>
+ <property name="icon_name">system-users</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h
index ae11b1e15..254467819 100644
--- a/libempathy-gtk/empathy-images.h
+++ b/libempathy-gtk/empathy-images.h
@@ -32,11 +32,11 @@ G_BEGIN_DECLS
#define EMPATHY_IMAGE_EXT_AWAY "empathy-extended-away"
#define EMPATHY_IMAGE_UNKNOWN "empathy-pending"
-#define EMPATHY_IMAGE_MESSAGE "empathy-message"
-#define EMPATHY_IMAGE_NEW_MESSAGE "empathy-new-message"
-#define EMPATHY_IMAGE_TYPING "empathy-typing"
+#define EMPATHY_IMAGE_MESSAGE "im-message"
+#define EMPATHY_IMAGE_NEW_MESSAGE "im-message-new"
+#define EMPATHY_IMAGE_TYPING "user-typing"
#define EMPATHY_IMAGE_CONTACT_INFORMATION "gtk-info"
-#define EMPATHY_IMAGE_GROUP_MESSAGE "empathy-group-message"
+#define EMPATHY_IMAGE_GROUP_MESSAGE "system-users"
#define EMPATHY_IMAGE_VOIP "gnome-stock-mic"
#define EMPATHY_IMAGE_LOG "document-open-recent"
diff --git a/libempathy-gtk/empathy-main-window.glade b/libempathy-gtk/empathy-main-window.glade
index a5d4a05f8..4573a852c 100644
--- a/libempathy-gtk/empathy-main-window.glade
+++ b/libempathy-gtk/empathy-main-window.glade
@@ -52,7 +52,7 @@
<widget class="GtkImage" id="image885">
<property name="visible">True</property>
<property name="icon_size">1</property>
- <property name="icon_name">empathy-new-message</property>
+ <property name="icon_name">im-message-new</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -298,7 +298,7 @@
<widget class="GtkImage" id="image890">
<property name="visible">True</property>
<property name="icon_size">1</property>
- <property name="icon_name">empathy-group-message</property>
+ <property name="icon_name">system-users</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
diff --git a/libempathy-gtk/empathy-status-icon.glade b/libempathy-gtk/empathy-status-icon.glade
index d76a5dfda..eb7d02a35 100644
--- a/libempathy-gtk/empathy-status-icon.glade
+++ b/libempathy-gtk/empathy-status-icon.glade
@@ -30,7 +30,7 @@
<widget class="GtkImage" id="image599">
<property name="visible">True</property>
<property name="icon_size">1</property>
- <property name="icon_name">empathy-new-message</property>
+ <property name="icon_name">im-message-new</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
diff --git a/src/Makefile.am b/src/Makefile.am
index ae336df09..36161fb78 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
-DPREFIX="\"$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
+ -DPKGDATADIR=\""$(pkgdatadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(EMPATHY_CFLAGS) \
diff --git a/src/empathy.c b/src/empathy.c
index 6e1abb118..5786cb7ae 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -288,7 +288,7 @@ main (int argc, char *argv[])
gtk_init (&argc, &argv);
gtk_window_set_default_icon_name ("empathy");
gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
- DATADIR G_DIR_SEPARATOR_S "empathy");
+ PKGDATADIR G_DIR_SEPARATOR_S "icons");
gnome_vfs_init ();
/* Setting up MC */