# HG changeset patch # User Daniel Atallah # Date 1170019536 0 # Node ID c6115dc73b2827ed012206fd9a4593d73a52564d # Parent ce2446107ef340f36eafadd8236fad48ce1873f8 dist fixes diff -r ce2446107ef3 -r c6115dc73b28 libpurple/Makefile.am --- a/libpurple/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/libpurple/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -11,7 +11,7 @@ win32/libc_interface.c \ win32/libc_interface.h \ win32/libc_internal.h \ - win32/libgaimrc.rc.in \ + win32/libpurplerc.rc.in \ win32/rules.mak \ win32/targets.mak \ win32/wgaimerror.h \ diff -r ce2446107ef3 -r c6115dc73b28 libpurple/tests/Makefile.am --- a/libpurple/tests/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/libpurple/tests/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -9,7 +9,7 @@ test_cipher.c \ test_jabber_jutil.c \ test_util.c \ - $(top_builddir)/libgaim/util.h + $(top_builddir)/libpurple/util.h check_libgaim_CFLAGS=\ @CHECK_CFLAGS@ \ @@ -20,7 +20,7 @@ check_libgaim_LDADD=\ @CHECK_LIBS@ \ $(GLIB_LIBS) \ - $(top_builddir)/libgaim/protocols/jabber/libjabber.la \ - $(top_builddir)/libgaim/libgaim.la + $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ + $(top_builddir)/libpurple/libgaim.la endif diff -r ce2446107ef3 -r c6115dc73b28 pidgin/Makefile.am --- a/pidgin/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -8,15 +8,15 @@ win32/IdleTracker/idletrack.h \ win32/MinimizeToTray.h \ win32/MinimizeToTray.c \ - win32/gaimrc.rc.in \ + win32/pidgin_dll_rc.rc.in \ + win32/pidgin_exe_rc.rc.in \ win32/gtkdocklet-win32.c \ - win32/gtkgaimrc.rc.in \ win32/gtkwin32dep.c \ win32/gtkwin32dep.h \ win32/resource.h \ win32/untar.c \ win32/untar.h \ - win32/win_gaim.c \ + win32/winpidgin.c \ win32/wspell.c \ win32/wspell.h \ win32/nsis/gaim-header.bmp \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/buddy_icons/Makefile.am --- a/pidgin/pixmaps/buddy_icons/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/buddy_icons/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -1,1 +1,5 @@ SUBDIRS = qq + +EXTRA_DIST = \ + Makefile.mingw \ + qq/Makefile.mingw diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/dialogs/64/Makefile.am --- a/pidgin/pixmaps/dialogs/64/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/dialogs/64/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -6,7 +6,6 @@ error.png \ info.png \ mail.png \ - Makefile.am \ question.png \ warning.png diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/emotes/default/22/scalable/Makefile.am --- a/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/22/scalable/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -86,7 +86,7 @@ meeting.svg \ mobile.svg \ monkey.svg \ - moneymouth.png + moneymouth.svg \ moon.svg \ msn-away.svg \ msn-busy.svg \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/emotes/default/Makefile.am --- a/pidgin/pixmaps/emotes/default/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/emotes/default/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -1,4 +1,5 @@ SUBDIRS=22 EXTRA_DIST= \ + Makefile.mingw \ 22/Makefile.mingw diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/16/Makefile.am --- a/pidgin/pixmaps/protocols/16/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/protocols/16/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -7,7 +7,6 @@ icq.png \ irc.png \ jabber.png \ - Makefile.am \ meanwhile.png \ msn.png \ qq.png \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/16/scalable/Makefile.am --- a/pidgin/pixmaps/protocols/16/scalable/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/protocols/16/scalable/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -6,7 +6,7 @@ irc.svg \ jabber.svg \ meanwhile.svg \ - msn2.svg \ + msn.svg \ qq.svg \ silc.svg \ simple.svg \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/22/Makefile.am --- a/pidgin/pixmaps/protocols/22/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/protocols/22/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -7,7 +7,6 @@ icq.png \ irc.png \ jabber.png \ - Makefile.am \ meanwhile.png \ msn.png \ qq.png \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/22/scalable/msn.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/protocols/22/scalable/msn.svg Sun Jan 28 21:25:36 2007 +0000 @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/22/scalable/msn2.svg --- a/pidgin/pixmaps/protocols/22/scalable/msn2.svg Sun Jan 28 20:21:08 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/protocols/48/Makefile.am --- a/pidgin/pixmaps/protocols/48/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/protocols/48/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -7,7 +7,6 @@ icq.png \ irc.png \ jabber.png \ - Makefile.am \ meanwhile.png \ msn.png \ qq.png \ diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/status/16/scalable/Makefile.am --- a/pidgin/pixmaps/status/16/scalable/Makefile.am Sun Jan 28 20:21:08 2007 +0000 +++ b/pidgin/pixmaps/status/16/scalable/Makefile.am Sun Jan 28 21:25:36 2007 +0000 @@ -3,9 +3,10 @@ busy.svg \ chat.svg \ extended-away.svg \ - half-operator.svg \ log-in.svg \ log-out.svg \ offline.svg \ - operator.svg \ person.svg + +# half-operator.svg +# operator.svg diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/status/22/scalable/busy.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/scalable/busy.svg Sun Jan 28 21:25:36 2007 +0000 @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/status/22/scalable/busy22.svg --- a/pidgin/pixmaps/status/22/scalable/busy22.svg Sun Jan 28 20:21:08 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/status/22/scalable/offline.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/status/22/scalable/offline.svg Sun Jan 28 21:25:36 2007 +0000 @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff -r ce2446107ef3 -r c6115dc73b28 pidgin/pixmaps/status/22/scalable/offline22.svg --- a/pidgin/pixmaps/status/22/scalable/offline22.svg Sun Jan 28 20:21:08 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,187 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - -