Commit 3a050b0c authored by Xavier Claessens's avatar Xavier Claessens Committed by Xavier Claessens

Rename icons to follow fd.o icon naming spec. Move icons to the right

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).


svn path=/trunk/; revision=404
parent 88d4e258
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
......
......@@ -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
......
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
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
icondir = $(datadir)/icons/hicolor/24x24/apps
icon_DATA = \
empathy-proto-jabber.png
EXTRA_DIST = $(icon_DATA)
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
icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = \
empathy.png \
empathy-proto-jabber.png
EXTRA_DIST = $(icon_DATA)
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) \
......
......@@ -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
......
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
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
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)
......@@ -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>
......
......@@ -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"
......
......@@ -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>
......
......@@ -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>
......
......@@ -3,6 +3,7 @@ AM_CPPFLAGS = \
-DPREFIX="\"$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
$(EMPATHY_CFLAGS) \
......
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment