Mercurial > pidgin.yaz
changeset 14825:a02c29df922f
[gaim-migrate @ 17592]
Enable QQ in wingaim.
I don't really have a way to test it.
Also disable some debug stuff in the about screen that doesn't make sense in wingaim.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sat, 28 Oct 2006 00:28:06 +0000 |
| parents | 6ec7e963d186 |
| children | 955798236bf4 |
| files | gaim-installer.nsi gtk/gtkdialogs.c gtk/pixmaps/smileys/default/Makefile.mingw gtk/pixmaps/status/default/Makefile.mingw libgaim/protocols/Makefile.mingw |
| diffstat | 5 files changed, 16 insertions(+), 62 deletions(-) [+] |
line wrap: on
line diff
--- a/gaim-installer.nsi Fri Oct 27 18:30:56 2006 +0000 +++ b/gaim-installer.nsi Sat Oct 28 00:28:06 2006 +0000 @@ -670,6 +670,7 @@ Delete "$INSTDIR\plugins\libnapster.dll" Delete "$INSTDIR\plugins\libnovell.dll" Delete "$INSTDIR\plugins\liboscar.dll" + Delete "$INSTDIR\plugins\libqq.dll" Delete "$INSTDIR\plugins\libsametime.dll" Delete "$INSTDIR\plugins\libsilc.dll" Delete "$INSTDIR\plugins\libsimple.dll"
--- a/gtk/gtkdialogs.c Fri Oct 27 18:30:56 2006 +0000 +++ b/gtk/gtkdialogs.c Sat Oct 28 00:28:06 2006 +0000 @@ -528,17 +528,21 @@ #endif #endif +#ifndef _WIN32 #ifdef ENABLE_MONO g_string_append(str, " <b>Mono:</b> Enabled<br/>"); #else g_string_append(str, " <b>Mono:</b> Disabled<br/>"); #endif +#endif +#ifndef _WIN32 #ifdef HAVE_LIBNM g_string_append(str, " <b>NetworkManager:</b> Enabled<br/>"); #else g_string_append(str, " <b>NetworkManager:</b> Disabled<br/>"); #endif +#endif #ifdef HAVE_NSS g_string_append(str, " <b>Network Security Services (NSS):</b> Enabled<br/>");
--- a/gtk/pixmaps/smileys/default/Makefile.mingw Fri Oct 27 18:30:56 2006 +0000 +++ b/gtk/pixmaps/smileys/default/Makefile.mingw Sat Oct 28 00:28:06 2006 +0000 @@ -12,11 +12,9 @@ .PHONY: install -#Exclude 132k of qq smileys that aren't used on wingaim install: if test '$(gaimsmileypix_DATA)'; then \ mkdir -p $(gaimsmileypixdir); \ cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \ - rm -f $(gaimsmileypixdir)/qq_*; \ fi;
--- a/gtk/pixmaps/status/default/Makefile.mingw Fri Oct 27 18:30:56 2006 +0000 +++ b/gtk/pixmaps/status/default/Makefile.mingw Sat Oct 28 00:28:06 2006 +0000 @@ -10,11 +10,9 @@ datadir = $(GAIM_INSTALL_DIR) include ./Makefile.am -#Exclude 264k of qq icons that aren't used on wingaim install: if test '$(gaimstatuspix_DATA)'; then \ mkdir -p $(gaimstatuspixdir); \ cp $(gaimstatuspix_DATA) $(gaimstatuspixdir); \ - rm -f $(gaimstatuspixdir)/qq*; \ fi;
--- a/libgaim/protocols/Makefile.mingw Fri Oct 27 18:30:56 2006 +0000 +++ b/libgaim/protocols/Makefile.mingw Sat Oct 28 00:28:06 2006 +0000 @@ -8,69 +8,22 @@ GAIM_TOP := ../.. include $(GAIM_TOP)/libgaim/win32/global.mak -GG = $(GAIM_PROTOS_TOP)/gg -IRC = $(GAIM_PROTOS_TOP)/irc -JABBER = $(GAIM_PROTOS_TOP)/jabber -MSN = $(GAIM_PROTOS_TOP)/msn -NOVELL = $(GAIM_PROTOS_TOP)/novell -OSCAR = $(GAIM_PROTOS_TOP)/oscar -SAMETIME = $(GAIM_PROTOS_TOP)/sametime -SILC = $(GAIM_PROTOS_TOP)/silc -SIMPLE = $(GAIM_PROTOS_TOP)/simple -TOC = $(GAIM_PROTOS_TOP)/toc -YAHOO = $(GAIM_PROTOS_TOP)/yahoo - -## -## Don't forget to change STATIC_PROTO_INIT, in config.h.mingw if you -## change the status of a protocol (static/plugin) -## - -GG_TYPE = PLUGIN -IRC_TYPE = PLUGIN -JABBER_TYPE = PLUGIN -MSN_TYPE = PLUGIN -NOVELL_TYPE = PLUGIN -OSCAR_TYPE = PLUGIN -SAMETIME_TYPE = PLUGIN -SILC_TYPE = PLUGIN -SIMPLE_TYPE = PLUGIN -TOC_TYPE = PLUGIN -YAHOO_TYPE = PLUGIN +SUBDIRS = gg irc jabber msn novell oscar qq sametime silc simple yahoo .PHONY: all install clean all: - $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) - $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) + for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) || exit 1; \ + done; install: all - $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) install - $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) install + for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) install || exit 1; \ + done; clean: - $(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(OSCAR_TYPE)' -C $(OSCAR) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(SAMETIME_TYPE)' -C $(SAMETIME) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(SIMPLE_TYPE)' -C $(SIMPLE) -f $(GAIM_WIN32_MAKEFILE) clean - $(MAKE) TYPE='$(YAHOO_TYPE)' -C $(YAHOO) -f $(GAIM_WIN32_MAKEFILE) clean + for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir -f $(GAIM_WIN32_MAKEFILE) clean || exit 1; \ + done; +