From 3a050b0c01d0f84cc65ffcfe07f9619248c398a6 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 28 Oct 2007 13:32:18 +0000 Subject: [PATCH] Rename icons to follow fd.o icon naming spec. Move icons to the right 2007-10-28 Xavier Claessens * 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 --- ChangeLog | 24 ++++ configure.ac | 7 +- data/16x16/Makefile.am | 22 --- data/22x22/Makefile.am | 15 -- data/22x22/empathy-group-message.png | Bin 1261 -> 0 bytes data/24x24/Makefile.am | 5 - data/24x24/empathy-proto-jabber.png | Bin 934 -> 0 bytes data/32x32/Makefile.am | 12 -- data/48x48/Makefile.am | 6 - data/48x48/empathy-proto-jabber.png | Bin 2418 -> 0 bytes data/Makefile.am | 16 +-- data/gtalk.profile | 2 +- data/icons/Makefile.am | 136 ++++++++++++++++++ .../hicolor_actions_16x16_im-message-new.png} | Bin .../hicolor_actions_22x22_im-message-new.png} | Bin .../hicolor_actions_24x24_im-message-new.png | Bin 0 -> 994 bytes .../hicolor_apps_16x16_empathy.png} | Bin .../hicolor_apps_16x16_im-ekiga.png} | Bin .../hicolor_apps_16x16_im-gizmo.png} | Bin .../hicolor_apps_16x16_im-google-talk.png} | Bin .../hicolor_apps_16x16_im-irc.png} | Bin .../hicolor_apps_16x16_im-local-xmpp.png} | Bin .../hicolor_apps_16x16_im-msn.png} | Bin .../hicolor_apps_16x16_im-xmpp.png} | Bin .../hicolor_apps_16x16_im-xmpp.svg} | 0 .../hicolor_apps_22x22_empathy.png} | Bin .../hicolor_apps_22x22_im-ekiga.png} | Bin .../hicolor_apps_22x22_im-gizmo.png} | Bin .../hicolor_apps_22x22_im-google-talk.png} | Bin .../hicolor_apps_22x22_im-irc.png} | Bin .../hicolor_apps_22x22_im-local-xmpp.png} | Bin .../hicolor_apps_22x22_im-msn.png} | Bin .../hicolor_apps_22x22_im-xmpp.png} | Bin .../hicolor_apps_22x22_im-xmpp.svg} | 0 data/icons/hicolor_apps_24x24_empathy.png | Bin 0 -> 1144 bytes data/icons/hicolor_apps_24x24_im-ekiga.png | Bin 0 -> 1432 bytes data/icons/hicolor_apps_24x24_im-gizmo.png | Bin 0 -> 1450 bytes .../hicolor_apps_24x24_im-google-talk.png | Bin 0 -> 1145 bytes data/icons/hicolor_apps_24x24_im-irc.png | Bin 0 -> 1251 bytes .../hicolor_apps_24x24_im-local-xmpp.png | Bin 0 -> 1570 bytes data/icons/hicolor_apps_24x24_im-msn.png | Bin 0 -> 1230 bytes data/icons/hicolor_apps_24x24_im-xmpp.png | Bin 0 -> 924 bytes .../hicolor_apps_32x32_empathy.png} | Bin .../hicolor_apps_32x32_im-ekiga.png} | Bin .../hicolor_apps_32x32_im-gizmo.png} | Bin .../hicolor_apps_32x32_im-google-talk.png} | Bin .../hicolor_apps_32x32_im-irc.png} | Bin .../hicolor_apps_32x32_im-local-xmpp.png | Bin 0 -> 2454 bytes .../hicolor_apps_32x32_im-msn.png} | Bin .../hicolor_apps_32x32_im-xmpp.png} | Bin .../hicolor_apps_32x32_im-xmpp.svg} | 0 .../hicolor_apps_48x48_empathy.png} | Bin .../hicolor_apps_scalable_empathy.svg} | 0 .../hicolor_apps_scalable_im-ekiga.svg} | 0 .../hicolor_apps_scalable_im-gizmo.svg} | 0 .../hicolor_apps_scalable_im-google-talk.svg} | 0 .../hicolor_apps_scalable_im-irc.svg} | 0 .../hicolor_apps_scalable_im-local-xmpp.svg} | 0 .../hicolor_apps_scalable_im-msn.svg} | 0 .../hicolor_apps_scalable_im-xmpp.svg} | 0 ...icolor_status_16x16_empathy-available.png} | Bin ...icolor_status_16x16_empathy-available.svg} | 0 .../hicolor_status_16x16_empathy-away.png} | Bin .../hicolor_status_16x16_empathy-away.svg} | 0 .../hicolor_status_16x16_empathy-busy.png} | Bin .../hicolor_status_16x16_empathy-busy.svg} | 0 ...or_status_16x16_empathy-extended-away.png} | Bin ...or_status_16x16_empathy-extended-away.svg} | 0 .../hicolor_status_16x16_empathy-offline.png} | Bin .../hicolor_status_16x16_empathy-offline.svg} | 0 .../hicolor_status_16x16_empathy-pending.png} | Bin .../hicolor_status_16x16_empathy-pending.svg} | 0 .../hicolor_status_16x16_im-message.png} | Bin .../hicolor_status_16x16_user-typing.png} | Bin data/irc.profile | 2 +- data/jabber.profile | 2 +- data/msn.profile | 2 +- data/salut.profile | 2 +- data/scalable/Makefile.am | 18 --- libempathy-gtk/empathy-group-chat.glade | 2 +- libempathy-gtk/empathy-images.h | 8 +- libempathy-gtk/empathy-main-window.glade | 4 +- libempathy-gtk/empathy-status-icon.glade | 2 +- src/Makefile.am | 1 + src/empathy.c | 2 +- 85 files changed, 177 insertions(+), 113 deletions(-) delete mode 100644 data/16x16/Makefile.am delete mode 100644 data/22x22/Makefile.am delete mode 100644 data/22x22/empathy-group-message.png delete mode 100644 data/24x24/Makefile.am delete mode 100644 data/24x24/empathy-proto-jabber.png delete mode 100644 data/32x32/Makefile.am delete mode 100644 data/48x48/Makefile.am delete mode 100644 data/48x48/empathy-proto-jabber.png create mode 100644 data/icons/Makefile.am rename data/{16x16/empathy-new-message.png => icons/hicolor_actions_16x16_im-message-new.png} (100%) rename data/{22x22/empathy-new-message.png => icons/hicolor_actions_22x22_im-message-new.png} (100%) create mode 100644 data/icons/hicolor_actions_24x24_im-message-new.png rename data/{16x16/empathy.png => icons/hicolor_apps_16x16_empathy.png} (100%) rename data/{16x16/empathy-proto-ekiga.png => icons/hicolor_apps_16x16_im-ekiga.png} (100%) rename data/{16x16/empathy-proto-gizmo.png => icons/hicolor_apps_16x16_im-gizmo.png} (100%) rename data/{16x16/empathy-proto-google-talk.png => icons/hicolor_apps_16x16_im-google-talk.png} (100%) rename data/{16x16/empathy-proto-irc.png => icons/hicolor_apps_16x16_im-irc.png} (100%) rename data/{16x16/empathy-proto-salut.png => icons/hicolor_apps_16x16_im-local-xmpp.png} (100%) rename data/{16x16/empathy-proto-msn.png => icons/hicolor_apps_16x16_im-msn.png} (100%) rename data/{16x16/empathy-proto-jabber.png => icons/hicolor_apps_16x16_im-xmpp.png} (100%) rename data/{16x16/empathy-proto-jabber.svg => icons/hicolor_apps_16x16_im-xmpp.svg} (100%) rename data/{22x22/empathy.png => icons/hicolor_apps_22x22_empathy.png} (100%) rename data/{22x22/empathy-proto-ekiga.png => icons/hicolor_apps_22x22_im-ekiga.png} (100%) rename data/{22x22/empathy-proto-gizmo.png => icons/hicolor_apps_22x22_im-gizmo.png} (100%) rename data/{22x22/empathy-proto-google-talk.png => icons/hicolor_apps_22x22_im-google-talk.png} (100%) rename data/{22x22/empathy-proto-irc.png => icons/hicolor_apps_22x22_im-irc.png} (100%) rename data/{22x22/empathy-proto-salut.png => icons/hicolor_apps_22x22_im-local-xmpp.png} (100%) rename data/{22x22/empathy-proto-msn.png => icons/hicolor_apps_22x22_im-msn.png} (100%) rename data/{22x22/empathy-proto-jabber.png => icons/hicolor_apps_22x22_im-xmpp.png} (100%) rename data/{22x22/empathy-proto-jabber.svg => icons/hicolor_apps_22x22_im-xmpp.svg} (100%) create mode 100644 data/icons/hicolor_apps_24x24_empathy.png create mode 100644 data/icons/hicolor_apps_24x24_im-ekiga.png create mode 100644 data/icons/hicolor_apps_24x24_im-gizmo.png create mode 100644 data/icons/hicolor_apps_24x24_im-google-talk.png create mode 100644 data/icons/hicolor_apps_24x24_im-irc.png create mode 100644 data/icons/hicolor_apps_24x24_im-local-xmpp.png create mode 100644 data/icons/hicolor_apps_24x24_im-msn.png create mode 100644 data/icons/hicolor_apps_24x24_im-xmpp.png rename data/{32x32/empathy.png => icons/hicolor_apps_32x32_empathy.png} (100%) rename data/{32x32/empathy-proto-ekiga.png => icons/hicolor_apps_32x32_im-ekiga.png} (100%) rename data/{32x32/empathy-proto-gizmo.png => icons/hicolor_apps_32x32_im-gizmo.png} (100%) rename data/{32x32/empathy-proto-google-talk.png => icons/hicolor_apps_32x32_im-google-talk.png} (100%) rename data/{32x32/empathy-proto-irc.png => icons/hicolor_apps_32x32_im-irc.png} (100%) create mode 100644 data/icons/hicolor_apps_32x32_im-local-xmpp.png rename data/{32x32/empathy-proto-msn.png => icons/hicolor_apps_32x32_im-msn.png} (100%) rename data/{32x32/empathy-proto-jabber.png => icons/hicolor_apps_32x32_im-xmpp.png} (100%) rename data/{32x32/empathy-proto-jabber.svg => icons/hicolor_apps_32x32_im-xmpp.svg} (100%) rename data/{48x48/empathy.png => icons/hicolor_apps_48x48_empathy.png} (100%) rename data/{scalable/empathy.svg => icons/hicolor_apps_scalable_empathy.svg} (100%) mode change 100755 => 100644 rename data/{scalable/empathy-proto-ekiga.svg => icons/hicolor_apps_scalable_im-ekiga.svg} (100%) rename data/{scalable/empathy-proto-gizmo.svg => icons/hicolor_apps_scalable_im-gizmo.svg} (100%) rename data/{scalable/empathy-proto-google-talk.svg => icons/hicolor_apps_scalable_im-google-talk.svg} (100%) rename data/{scalable/empathy-proto-irc.svg => icons/hicolor_apps_scalable_im-irc.svg} (100%) rename data/{scalable/empathy-proto-salut.svg => icons/hicolor_apps_scalable_im-local-xmpp.svg} (100%) rename data/{scalable/empathy-proto-msn.svg => icons/hicolor_apps_scalable_im-msn.svg} (100%) rename data/{scalable/empathy-proto-jabber.svg => icons/hicolor_apps_scalable_im-xmpp.svg} (100%) rename data/{16x16/empathy-available.png => icons/hicolor_status_16x16_empathy-available.png} (100%) rename data/{scalable/empathy-available.svg => icons/hicolor_status_16x16_empathy-available.svg} (100%) rename data/{16x16/empathy-away.png => icons/hicolor_status_16x16_empathy-away.png} (100%) rename data/{scalable/empathy-away.svg => icons/hicolor_status_16x16_empathy-away.svg} (100%) rename data/{16x16/empathy-busy.png => icons/hicolor_status_16x16_empathy-busy.png} (100%) rename data/{scalable/empathy-busy.svg => icons/hicolor_status_16x16_empathy-busy.svg} (100%) rename data/{16x16/empathy-extended-away.png => icons/hicolor_status_16x16_empathy-extended-away.png} (100%) rename data/{scalable/empathy-extended-away.svg => icons/hicolor_status_16x16_empathy-extended-away.svg} (100%) rename data/{16x16/empathy-offline.png => icons/hicolor_status_16x16_empathy-offline.png} (100%) rename data/{scalable/empathy-offline.svg => icons/hicolor_status_16x16_empathy-offline.svg} (100%) rename data/{16x16/empathy-pending.png => icons/hicolor_status_16x16_empathy-pending.png} (100%) rename data/{scalable/empathy-pending.svg => icons/hicolor_status_16x16_empathy-pending.svg} (100%) rename data/{16x16/empathy-message.png => icons/hicolor_status_16x16_im-message.png} (100%) rename data/{16x16/empathy-typing.png => icons/hicolor_status_16x16_user-typing.png} (100%) delete mode 100644 data/scalable/Makefile.am diff --git a/ChangeLog b/ChangeLog index 6f768535..0c008c30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2007-10-28 Xavier Claessens + + * 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 * libempathy-gtk/empathy-smiley-manager.c: Update to new icon naming diff --git a/configure.ac b/configure.ac index 3dbb6b3e..4e6f32ee 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 68823014..00000000 --- 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 37467bde..00000000 --- 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 7b803b1be734f3816f37fc996d864ef10ef71f13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1261 zcmVj20G{5R9ax1Z@~&6G5OCdXZ^6XD(;X z-32W&l_s+AOTN|r<;nZL-~azY5Cr@mB|pe;sx#H7C~~*&dK&;lNxJN~Zg*dA-?_!J z!hcoVwY&3hEE;{Yz5PXfWpx7I_Zc4>=ggTi1;a2t>izu7Lk|p2b*37ZRaSlf`Wvt5 z#bSYME{kK^sH#qdrgP%NiNZ{FuKix+_l+XenQDxvYPaV&8vxXB*n4_ogKpUtwrin9 zBA7rnJB#NzY~8w5|N7f+x`DgoF*h?uZ8C}P-N}8S#KlTu(b&Fs-+514y?QmS>tb6rwKX*yIPezN|GdG~ ztJg4#CXVCcc^*DK_e--398uNoJ$v?Q5Fj9+su4mV1>3f<9gCND?&Q+oC9;M=u~48? zvWQj0n3$MAl%&f`f<4FCuxiyRT+bsM4x@%6$dZgGikPNJvNp->zcQGG61Hg*k5&?o zRr2H6vjxX>yYFTFE8`#t@H`L8wh#mX*YogwpCIsofFKB{sjk5fd~QulaO%`4$H*C9 zEWXQSU`bIfkBp4GkWAK6EEYfza9s!6u?dC4jE;^X$r3$1Jpe@GF%pS{Y&mx4t6i^H zz8k!K^5n@pEV{?3&Q#-ys;VCj9z3Mkj!nrd;`ttm5+WQ5bL`j$RM*xJQB?rK;V`s|8XBHb>(;J)EM67;tSpMIu9p&`qJ0{R#aq`u`GkD>bU%}m zQvf6q4^zLco-0?Yinb2`WCVx zBP&b)rdeZ_9XocgfB$~AZEGW6$dfbjWHOoH+SO~WAPBHbY?c+{>!gJO=?74qsUUVAP^7yAnX$eB9h}1 z6dc#NT{278OC@_?&d8qzvP;Ev_vNi`*eC)OKqasoSTWx+Fb8Djdj>Fo;?Us5CHL?* Xc0~ZoWW_ev00000NkvXXu0mjfZe~ay diff --git a/data/24x24/Makefile.am b/data/24x24/Makefile.am deleted file mode 100644 index c0a44da4..00000000 --- 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 0629c95fca2d03c002a8351a4a6b75a032c86945..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 934 zcmV;X16lluP)FHRm=?y9RXfz3ZP&F zdwW}f6fg&bfdJs&kd%Qnpa>Mg2M-Pb`>NHdI%EUZB@_b4yR-54FcTd>9>{KF9y8J5 z&csK6EB@|o0pc}kZ4L+iq*A$q->;|`ieAR7>i+=n+J(Y8aINVV_+ZH{7ER!OkGkUk z61IX8H|6gH${vw%pvM{;vw(|D1LCSH<@xz(U?1LlzpthNgh1p1Fpy8Bk^-MK4FCuo zI56p2)=m1(?*#pAvqG~xFxFW(aU#5y$+RTli~j^b)hV1j`5mqsQwdzybnOXFR0@Se zZg}`bfmf-q)M^8O_M=B{teNJlC%pgqCSz#e`qe{+`kdwE&y%X>Yt^U=00^8uJ!N~J zyhzvC-9Ql72J~1n9fjh#bM3&J_54*=#XsZ64`q+xwjJKl{`9r>*bDQn4TaHn`>j*s zPgO$J@qusj(|Z1f>l)#c=p(~D#q8*6=G5~Bf2?|Zc^v7&?>@s@z?K0kErGChJs92I z7QMv!!YbuU_-@VNAgna9H=Kcj2OJayRm1}x1EgVRO#)DyyJK?h9$j#4P@01@1Z1+I zkFTbWJEdh4$1b5ZRMud1mpE5)+rDh%Z}=BI_ITfp=lT~jvE5cjC}<-#SS5qZ!aX-e z)2+Q{zs=m*5&+=gWFjOYZ-~fC0IK@Fs=ocp^vsH9{>OV07*qo IM6N<$f`&x2nE(I) diff --git a/data/32x32/Makefile.am b/data/32x32/Makefile.am deleted file mode 100644 index c5487426..00000000 --- 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 994c7109..00000000 --- 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 052aeb5e5b5b9c97aa8b4959f702ac1723b0965f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2418 zcmV-&361uNP)rw*HuQTIpzijH9isI(E=@`eO>j=?H@$wMl^dAdDf9 z1jYO^VKdlaRLef|3D5m^@!Ih3XU?g=y~ zb+xyw>}!>somI;3{|oR2@FU>TY>hhT0A2u|ANk+|b@ck{R|7R6k@jqqxFXP?)GQ+q z_*0_3^v!z67{2lto&2T#l<*^y;etv#4kQ zc;0C%1wP5j-7`@N#DE8jH*NaItd%SMvBt&+f#11RFl_`Hl=6B?O1@du+q+Sj<|DvS zr|SmnTAvHrfPK#OJyvh;SDVVpt_9|YMAB{)xQW30`OiLEq)fAs3FiSCoZmv%?oLJ| zLkGay-qOO2Va05YZh z-ML%0uI}ElCIav7K+JyjnL^|7MD<0neN{7EpdZ z38a*1TG%r<0i{wR{8u+szr~RiOWhizsrqths@g7EeTYbEO7E}{3~FGGTXk+yC@NZ8 z$~4W)Mgw*TY*om;k}@{YR26k;Gl(;BhQW?0eM(28Ch(a{T`mb&*2l^;OUX>5Xu)ps zqoY6`cHS4cHR>Qi(zkm`+m-Q;K01m0Ou2%a6dKX7*eAfeNv*5*j{@Tki14EF=y~T9 z;feA46?+KP$EFe(eDlo|;QGbRO$1_zj*gE!vu9UfFZ~lfi0lxhHjEKvdCR$H?(jsK zDcCus*8naXeEs!hz;+jYjo&mKlHCtI)XYS^pMX~~b68EQNlB)?sri4Ub?Q_!H88Li zsB_^L;DSI%L}CXI4yXG2KLplI>RjG(4B?pLoC^ZVv8TGIY|32KP2jfU_uY3H@J2|a z&!zvaSI_u~&71ckQii?f9fzD*NzM*!+mkbA|Ats&qZQq|cLVU0YkjyR5E3D>b7weq z=+Hm0qY%hY;5cKrj)0*gGye;KYmeQ2`x@Yv+04FU-yK3C>9&A68LjL3wrxvVr%qi1{KBn2V{lCXAS9CLe)!=7*zfW7>N};Jo)a1a)IOHC zj8&uRWLHQD<{{Qf8EPW`i-DC# zSFO4Ot=|fXxUM{z$eKV%MA|oO=u38X{s*`j@ZyynXqPEu=f45ebkx=^uzGuE0YAvr zk8#ZOJfS5=4MdZEr?yZLd^{^2 zJ0EzUAU!mc0{)zfePHG(G$t*}@aaV2MiD7>F@C{lYwNmt)A(&YEX>vRjE)w^u>TM0 zD&=82LYdbyZ`ZsPkA5)siU)Riy(K+N?7kHC>vk}e=qvAOdUCF!9FR`iKZT5fvcRywxCA^a@tZ|3Y!V;rK`YJFJ@NmKfT38Z4UCedPX?6UOFG^P ze2S+qLP0QNtE(X$1sMh%hGYk%I`MH8am?`(>=|RmRY-)>A~1O3iKL_>7~X}L{^gjy zOF?C9p9T9M#Q;?ZzRSUP8!08A1-JX?^G`shNhy%x#ZP;b5ky}IQ7#HYj9BmE zo^wS20kloPC8keD1hl1Zrv|Whh#F0g@xVPjc2MXgl|fAb1x;-pvrm$1**fsHr*Q zXfbQdcpU&J4DiC~I1AbuPCp{*UBl~#KtLovUn`&A9+ON!G-?o!E7BGy5$!egpR~mf zb9Eka{LnpyHEXJWUX*V=vba1LxcDMXfq#_Q!4W_hiWU$Z&0`>}==^v%5gzuvw0Ga( z@8s^fjq^f4DP>kxR<1L>=8J}*$_j%)v#>De1BgV1lab-!wARvVC9H3?wzlp9(&F+H z(zLd7A)xGI5^ts~Uc8_pKUlcQ>-F9ZU|Gp`qLIiuU0t6X1yW3W}4&iqD@6>@rrv1im^@|lo!+Q;?-W1p8&OpZXp`JWTc*E687&o`$E k*n~6_B+`IBA9ex$2cQKcn-m&vivR!s07*qoM6N<$f`cKCUH||9 diff --git a/data/Makefile.am b/data/Makefile.am index 964abc78..87566981 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 6d32f072..edc2b40f 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 00000000..95a62027 --- /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 similarity index 100% rename from data/16x16/empathy-new-message.png rename to data/icons/hicolor_actions_16x16_im-message-new.png diff --git a/data/22x22/empathy-new-message.png b/data/icons/hicolor_actions_22x22_im-message-new.png similarity index 100% rename from data/22x22/empathy-new-message.png rename to data/icons/hicolor_actions_22x22_im-message-new.png 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 0000000000000000000000000000000000000000..70f7a66227443fe1b59ecdd1638c36e8480a3fac GIT binary patch literal 994 zcmV<810DQ{P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iFQ2 z4-z$jRdr4P00Ux4L_t(Y$Gw%yZyQwTK>||Q z@gIOFOR!=E#3~T7?V7IHL92pBVRBk=^3`{YP`-V=s|8l4-Hc>X@xz;T;UcY?+{b zm93>~q|R0liNT!Eb!wFDAi?r)?uFa)gAAYf#RtA<0UXE4jlDRIs&Hp%0RdDM)e3Ip z9&Tij$jYTwR*9h>8sfm=;XK9Ly#O2q7VY8%u#W*+fFKCy%k*(~X#o{MRS{7fCm^Ce zk(En$r*Gg!M^TOLDWPhL-g5>(7%Xsleh4_50nmp{B~5Wv#ZkpkL!BCO{5|}|7ZA}$ znxQy9#JYPPAkhZE-vCimohHl>X?$Vz{yUgiTk-Af9~Y@rez* zO@6L%7CSit)G5w4z_Ech5$&N|{uPif+X5cWrqOU7CZ~WpB1+fby9jGQ8M8XEf#-o9 z%#x@M@cSS4@#3>fj|DW`(sYdVgLoJoB1w<};3KvT=3sOKX`IL?fBv=7(ulOZU(H%p zwC3K-2rZ8C97qW$Ago~om?W_HP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L00N2t00N2u06CPL00007bV*G`2iFQ2 z3M&NI#5yGa00a0*L_t(Y$IVttXk1ko{?5I3?!1yrCX-AiY4d7gsuZ#iLC{S!5_~Ou zAV?`LM390YVokfSFoN|##f7*LLC}?=7Kt*MWF}fH1;vGtHpaASQlg9@on(4v?z#7# zr;Em5UPH8-{_to|?{u{!5Hi&zQ^Qnk*a78PK08LY4q50QdyJ z(|ZLl>KRR&JOP4Jis0nv$b%k$*8qH!&1Q|M>D&i}LLqTOloX4_)Z}#T)najCXsazh zoxlBtk{7ACI^DY0c1_YOE+ji>mYp8`}vc1}O|EVEukZ7E;+1az% z+U7L7NdM^RvgsGC&tzIVw1(-{+{)tO()$-ae*WcM z0lFW0J=wi4bEdT|ITVdW6G|x^_-u7)>92FXS2{fVX_f&%`{?QTp~1}D;H~{#b~uEp z2!Rw50psvoTIDV~x(y(3JT5uc zQb=$^Ktpc?N+GWUDFwqcQ${VKSCw^}9Gr6qAs~f>Wtl0v(SG6A@fUyeJns)meYma%k9w#&wKApR@UFY) z>T2b^TGdsIaWH=!B=`qJKnMXPHL-2$2mpB1$~PXRin<=Ej#IgIWp->KcdWE&pKa=* z%-u7}GLJ-}k)&1%QeLM=a0$T$DD`z^&6y1-eX@M1xV%>S;iqu(!Dhc&o-hAA@m6_0 z_dS5Cbtn12!*7nH+grbAY>GD!09tEEr67fb>rzo(sf;Y-PJH{X5F0=Q00R&J&~?}K z?_V9Cu2h^a9j7WbC<+)@z(H$XDR#yGZc7LQ-~jNqCf`QUMlI&@XX4$3JGIt58pISr zB47-Dt+x2f`IDam@ODbJ<4xK5`IS(4zF4%=L;Hk4XAlI0Qn$Q3S2)4e7Rvx!0CFz? zq>e4Qu8BnVUH$ILTuFFqs{ob(tnT%$kUgB#$ofFCbyYXjPvmd-iYHxR118%50000< KMNUMnLSTZ}D-7-c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..622aee84bf97e79445f8c627a77e1c1824ade48c GIT binary patch literal 1432 zcmV;J1!ww+P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iFQ2 z3Mw^_0SjIL00kIHL_t(Y$HkT1ZyZ+{#((dencbP$^?uoFJ9Ww0h@?qFQoOV@v}@D*{sg0K^}_4VTe?H}>#ptH zwfAdwXU^ebot29U3POl;dvu=PocBEQJn%nW^6xh1FOmVy0FPQ0=ZxVY0I^uqnyVPD z0dE&)sQ<@+`HOr5OD<;~%&X+#wC_%2tk`%85PFqef;)B7SgW_IOPf6tnQs+m`0YIb z<}Z>H;YxhOKVNuZ+E=bauUtiM@1nQ&5GAOw6!vf$HJU*OA*(-MXty^Tf6|fpPH~3n zzXZ%*BnK>ypPS4MKly;u`pZp%_t$Vg2kxZ7&TB-0iG*m=rnl~(Mhn=-CaKST7?%F< z!Ip`5@F2wg1Wowy*jFZV*+&X?^%t{0jW(UCd%Nt^aG7%*Xv*3w&Ko_>j_xeGv8S;PDMm+|ux zi09K;_$$HIJcqt{9+giZY8S~r4&g2I(kz5}AbWR2i$S@LGn``k)gKV;lu@Z+qIv~@ zXs1m4$QO~gj|`2|S^t>YwI!0%(}bn#n7vI*uz_^z;KT`Q4J;*#gBuvb)y_u!F*lQv zHg^C+`umlV;ExK~BQZn-OKT)%p)y0*xk>7` zKaOs{xBA)_ermq{scC8qm&(g`mPI6+JNb}mt*;Smm5I4vYfT|-5HXlWfN>p6!okjt zVJF9_udYX>`PHh?T)LOS`H7qI&KJIP%(axzZPd|06WwiNDM9%Ol$*r%lIRFl=axI| zTKjb!nM=hPw(hkupGD+yb|PyhMut2ula$y{vj0yun{@V?rcv2#SJ!sJ{h9yrzbXCG m`=x*CQ%ZmK?t}hc);|D#9zFRhP--9m0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iFQ2 z3MvO!)>_^G00k;ZL_t(Y$HkRhY+Oeb$A5D_*1LCi{jpxJV>k7eLev_yl*SRE4M|Cw zR#bW65vf%LsEAjDgm|q`D33f5B%TlgB;Kjg1QDns6w(qmQJMth!**gPjyGQK?!CL$ z_uiQ~JlNf|DyrHC#5~Ms&Pe~?oO9;Pf&cMPpLKZrq(6#q3^<@1b>tbYH z4Ch5SbLvM~{R;z*pY*@$y6Trx)6;%+xSAg<52;dN5G#gO)S%Jaka~S1zPor&8*P91 z&X2P{elEcAlm26l%kQhzk^Rrj9SSrF?PQ%OX%c5GtU%zE$$KS=xgl&OTsVKR+uUr= zTg_{yfAUFh)ThK9_2JyyTxn`-uY0F`iH+_GB7pE{-JTGEf&2*7;v~z^@g6EH(@Lv5$*9AEKE5GKr>g}V4j}=$Kt8~&P(R;h; zyt|iNXB5>55YJ#AR1pC+vVp$28*_Vt=tddUm*Cdg7?UwJKJKqBuOFLw!THVNS=)60 zL^wP-Iq7D0i_Pvm#6q?@L?H-pT$k*|B-z#Jog664^=Zt_NtAN%eV=%xj93WcCdxBZ zs$~b^NH0W6@qDFH$+wd_A|N94zj7IWW~~=U=ka^wzI_`1rE{>WPO1~)cnj}Kt5jaT z(aTjgi6{*Q0r0g)NmlAme`!E%CU+4LT4(oADEUzAAfCpVx`Th=6J3}@1d4M@q-ji0>Ql;5hk5{`<;h}DVzu5xEOZwp$PEr+jm20?Ze|Iw!cI6r zAphkRqHDvX|J=Q8LkRXQk!2~xLJ6y7_K^n`u~s9Z5P^2PO{O(s1wp78^Ql@eM#zlb zu?ag21Tfklg6#p6qpmjFoBMKZkt|Co?_Z%W@URxbi(@n|jxzFc^a)6Np@#LhC_lB< z^Gqx#*CTAjC`VoC0YuBYjm_q>!BC(g*`)U3eXy|h_6%tU(#sW$w)8)<4i=gVBZOB6 z5P_`YQ9ZJZV%vLHxing_HCq1O16a#HHtLNZRBKbkhdZ&p|K}-Mmxd5AfY7>DW^-W> z0aTyHW)?x%c)x~B)4O(kTvvmfZ zStHxo4}9eT#o2oA+^@ul2%h894O66yail_U!`JT8a~0%2P4@dqaY;EkNNpIo6k=q|?^# z%%9M2{@35sXkK5uwsKu-Qy!lf^V{79akBk-Mh|XK{dxlgl(LB3emSn=A);8j9VX4S zq$QT`e`doudcvzIhu`K4xkG!NdMt2#NV6?6onef|ip9l6lmb!2p=R~pVaKHQuh#Ir zbHC6JKUd2<@-y!{DEW2&P@oE>zG9*1Ik|#|F_t(?=!BV#n_1M2GQ{x4{9F1@U%2Ui z^G$D1gl_-`l;Q<3JdGeYT(*Y4iRC=Px%szrlmFNF4_U$94DIq1;Q#;t07*qoM6N<$ Eg04Kh1poj5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b93e368c91be2bf1e86cd22425f71623d3675ff GIT binary patch literal 1145 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 s#+}^l(O07*qoM6N<$f@mr;iU0rr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9334ce4ed6dbf1fd450eb2c91ddd423bdfcf4526 GIT binary patch literal 924 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 literal 0 HcmV?d00001 diff --git a/data/32x32/empathy-proto-msn.png b/data/icons/hicolor_apps_32x32_im-msn.png similarity index 100% rename from data/32x32/empathy-proto-msn.png rename to data/icons/hicolor_apps_32x32_im-msn.png diff --git a/data/32x32/empathy-proto-jabber.png b/data/icons/hicolor_apps_32x32_im-xmpp.png similarity index 100% rename from data/32x32/empathy-proto-jabber.png rename to data/icons/hicolor_apps_32x32_im-xmpp.png diff --git a/data/32x32/empathy-proto-jabber.svg b/data/icons/hicolor_apps_32x32_im-xmpp.svg similarity index 100% rename from data/32x32/empathy-proto-jabber.svg rename to data/icons/hicolor_apps_32x32_im-xmpp.svg diff --git a/data/48x48/empathy.png b/data/icons/hicolor_apps_48x48_empathy.png similarity index 100% rename from data/48x48/empathy.png rename to data/icons/hicolor_apps_48x48_empathy.png diff --git a/data/scalable/empathy.svg b/data/icons/hicolor_apps_scalable_empathy.svg old mode 100755 new mode 100644 similarity index 100% rename from data/scalable/empathy.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-ekiga.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-gizmo.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-google-talk.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-irc.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-salut.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-msn.svg rename to 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 similarity index 100% rename from data/scalable/empathy-proto-jabber.svg rename to 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 similarity index 100% rename from data/16x16/empathy-available.png rename to data/icons/hicolor_status_16x16_empathy-available.png diff --git a/data/scalable/empathy-available.svg b/data/icons/hicolor_status_16x16_empathy-available.svg similarity index 100% rename from data/scalable/empathy-available.svg rename to 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 similarity index 100% rename from data/16x16/empathy-away.png rename to data/icons/hicolor_status_16x16_empathy-away.png diff --git a/data/scalable/empathy-away.svg b/data/icons/hicolor_status_16x16_empathy-away.svg similarity index 100% rename from data/scalable/empathy-away.svg rename to 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 similarity index 100% rename from data/16x16/empathy-busy.png rename to data/icons/hicolor_status_16x16_empathy-busy.png diff --git a/data/scalable/empathy-busy.svg b/data/icons/hicolor_status_16x16_empathy-busy.svg similarity index 100% rename from data/scalable/empathy-busy.svg rename to 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 similarity index 100% rename from data/16x16/empathy-extended-away.png rename to data/icons/hicolor_status_16x16_empathy-extended-away.png diff --git a/data/scalable/empathy-extended-away.svg b/data/icons/hicolor_status_16x16_empathy-extended-away.svg similarity index 100% rename from data/scalable/empathy-extended-away.svg rename to 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 similarity index 100% rename from data/16x16/empathy-offline.png rename to data/icons/hicolor_status_16x16_empathy-offline.png diff --git a/data/scalable/empathy-offline.svg b/data/icons/hicolor_status_16x16_empathy-offline.svg similarity index 100% rename from data/scalable/empathy-offline.svg rename to 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 similarity index 100% rename from data/16x16/empathy-pending.png rename to data/icons/hicolor_status_16x16_empathy-pending.png diff --git a/data/scalable/empathy-pending.svg b/data/icons/hicolor_status_16x16_empathy-pending.svg similarity index 100% rename from data/scalable/empathy-pending.svg rename to 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 similarity index 100% rename from data/16x16/empathy-message.png rename to data/icons/hicolor_status_16x16_im-message.png diff --git a/data/16x16/empathy-typing.png b/data/icons/hicolor_status_16x16_user-typing.png similarity index 100% rename from data/16x16/empathy-typing.png rename to data/icons/hicolor_status_16x16_user-typing.png diff --git a/data/irc.profile b/data/irc.profile index 75736caa..a3fc7c4e 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 1ad05075..0dfd14a8 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 554893de..06860e64 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 bd8baa35..87397920 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 cb7998eb..00000000 --- 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 885afc5b..5cb6fc3e 100644 --- a/libempathy-gtk/empathy-group-chat.glade +++ b/libempathy-gtk/empathy-group-chat.glade @@ -13,7 +13,7 @@ 400 True False - empathy-group-message.png + system-users True False False diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h index ae11b1e1..25446781 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 a5d4a05f..4573a852 100644 --- a/libempathy-gtk/empathy-main-window.glade +++ b/libempathy-gtk/empathy-main-window.glade @@ -52,7 +52,7 @@ True 1 - empathy-new-message + im-message-new 0.5 0.5 0 @@ -298,7 +298,7 @@ True 1 - empathy-group-message + system-users 0.5 0.5 0 diff --git a/libempathy-gtk/empathy-status-icon.glade b/libempathy-gtk/empathy-status-icon.glade index d76a5dfd..eb7d02a3 100644 --- a/libempathy-gtk/empathy-status-icon.glade +++ b/libempathy-gtk/empathy-status-icon.glade @@ -30,7 +30,7 @@ True 1 - empathy-new-message + im-message-new 0.5 0.5 0 diff --git a/src/Makefile.am b/src/Makefile.am index ae336df0..36161fb7 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 6e1abb11..5786cb7a 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 */ -- 2.39.2