diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-10-28 21:32:18 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-10-28 21:32:18 +0800 |
| commit | ce9454407b1cddee8c880154b5f6dd7149d7a1a7 (patch) | |
| tree | 732a8b5a5e710d9d43f4d789dff46ee035acd61e /src | |
| parent | 1d34ad877f9f2ed7d2a29670abf3f57c6d9c4bfc (diff) | |
| download | gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar.gz gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar.bz2 gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar.lz gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar.xz gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.tar.zst gsoc2013-empathy-ce9454407b1cddee8c880154b5f6dd7149d7a1a7.zip | |
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).
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@404 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
2 files changed, 2 insertions, 1 deletions
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 */ |