grim/guifications2

Fix mingw build (again?)
org.guifications.gf2
2007-05-01, Daniel Atallah
21875df9940c
Parents 42328fd0798a
Children d9f3834d8f71
Fix mingw build (again?)
14 files changed, 136 insertions(+), 111 deletions(-)
  • +7 -4
    Makefile.mingw
  • +6 -6
    guifications-installer.nsi
  • +39 -39
    nsis/translations/english.nsh
  • +11 -11
    nsis/translations/italian.nsh
  • +11 -11
    nsis/translations/spanish.nsh
  • +5 -3
    pixmaps/Makefile.mingw
  • +7 -4
    po/Makefile.mingw
  • +18 -17
    src/Makefile.mingw
  • +1 -1
    src/gf_preferences.c
  • +6 -3
    themes/Penguins/Makefile.mingw
  • +7 -3
    themes/default/Makefile.mingw
  • +6 -3
    themes/funky/Makefile.mingw
  • +6 -3
    themes/item_test/Makefile.mingw
  • +6 -3
    themes/mini/Makefile.mingw
    • --- a/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -13,8 +13,11 @@
    GF_THEMES := ./themes
    GF_PO := ./po
    -GAIM_TOP := ../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := .
    +-include $(GF_TOP)/local.mak
    +
    +PIDGIN_TREE_TOP ?= ../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    ##
    ## VARIABLE DEFINITIONS
    @@ -22,7 +25,7 @@
    GF_VERSION := $(shell cat ./VERSION)
    -GAIM_VERSION := $(shell cat ../../../VERSION)
    +PIDGIN_VERSION := $(shell cat $(PIDGIN_TREE_TOP)/VERSION)
    .PHONY: all install installer clean
    @@ -39,7 +42,7 @@
    installer: all
    - $(MAKENSIS) /DGUIFICATIONS_VERSION="$(GF_VERSION)" /DGAIM_VERSION="$(GAIM_VERSION)" guifications-installer.nsi
    + $(MAKENSIS) /DGUIFICATIONS_VERSION="$(GF_VERSION)" /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_TREE_TOP="$(PIDGIN_TREE_TOP)" guifications-installer.nsi
    clean:
    $(MAKE) -C $(GF_SRC) -f Makefile.mingw clean
    --- a/guifications-installer.nsi Tue May 01 03:20:16 2007 -0400
    +++ b/guifications-installer.nsi Tue May 01 04:28:49 2007 -0400
    @@ -37,7 +37,7 @@
    ;-------------------------------
    ; Pidgin Plugin installer helper stuff
    - !addincludedir "../../win32/nsis"
    + !addincludedir "${PIDGIN_TREE_TOP}\pidgin\win32\nsis"
    !include "pidgin-plugin.nsh"
    ;--------------------------------
    @@ -329,18 +329,18 @@
    Function gf_checkPidginVersion
    Push $R0
    - Push ${GAIM_VERSION}
    + Push ${PIDGIN_VERSION}
    Call CheckPidginVersion
    Pop $R0
    - StrCmp $R0 ${GAIM_VERSION_OK} gf_checkPidginVersion_OK
    - StrCmp $R0 ${GAIM_VERSION_INCOMPATIBLE} +1 +6
    + StrCmp $R0 ${PIDGIN_VERSION_OK} gf_checkPidginVersion_OK
    + StrCmp $R0 ${PIDGIN_VERSION_INCOMPATIBLE} +1 +6
    Call GetPidginVersion
    IfErrors +3
    Pop $R0
    - MessageBox MB_OK|MB_ICONSTOP "$(BAD_GAIM_VERSION_1) $R0 $(BAD_GAIM_VERSION_2)"
    + MessageBox MB_OK|MB_ICONSTOP "$(BAD_PIDGIN_VERSION_1) $R0 $(BAD_PIDGIN_VERSION_2)"
    goto +2
    - MessageBox MB_OK|MB_ICONSTOP "$(NO_GAIM_VERSION)"
    + MessageBox MB_OK|MB_ICONSTOP "$(NO_PIDGIN_VERSION)"
    Quit
    gf_checkPidginVersion_OK:
    --- a/nsis/translations/english.nsh Tue May 01 03:20:16 2007 -0400
    +++ b/nsis/translations/english.nsh Tue May 01 04:28:49 2007 -0400
    @@ -1,39 +1,39 @@
    -;;
    -;; english.nsh
    -;;
    -;; Default language strings for the Windows guifications NSIS installer.
    -;; Windows Code page: 1252
    -;; Language Code: 1033
    -;;
    -
    -; Startup Gaim check
    -LangString GAIM_NEEDED ${LANG_ENGLISH} "Guifications requires that Gaim be installed. You must install Gaim before installing Guifications."
    -
    -LangString GUIFICATIONS_TITLE ${LANG_ENGLISH} "Guifications plugin for Gaim"
    -
    -LangString BAD_GAIM_VERSION_1 ${LANG_ENGLISH} "Incompatible version.$\r$\n$\r$\nThis version of the Guifications plugin was built for Gaim version ${GAIM_VERSION}. It appears that you have Gaim version"
    -
    -LangString BAD_GAIM_VERSION_2 ${LANG_ENGLISH} "installed.$\r$\n$\r$\nSee http://guifications.sourceforge.net for more information."
    -
    -LangString NO_GAIM_VERSION ${LANG_ENGLISH} "Unable to determine installed Gaim version."
    -
    -
    -; Overrides for default text in windows:
    -
    -LangString WELCOME_TITLE ${LANG_ENGLISH} "Guifications v${GUIFICATIONS_VERSION} Installer"
    -LangString WELCOME_TEXT ${LANG_ENGLISH} "Note: This version of the plugin is designed for Gaim ${GAIM_VERSION}, and will not install or function with versions of Gaim having a different major version number.\r\n\r\nWhen you upgrade your version of Gaim, you must uninstall or upgrade this plugin as well.\r\n\r\n"
    -
    -LangString DIR_SUBTITLE ${LANG_ENGLISH} "Please locate the directory where Gaim is installed"
    -LangString DIR_INNERTEXT ${LANG_ENGLISH} "Install in this Gaim folder:"
    -
    -LangString FINISH_TITLE ${LANG_ENGLISH} "Guifications v${GUIFICATIONS_VERSION} Install Complete"
    -LangString FINISH_TEXT ${LANG_ENGLISH} "You will need to restart Gaim for the plugin to be loaded, then go the Gaim preferences and enable the Guifications Plugin."
    -
    -; during install uninstaller
    -LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_ENGLISH} "The guifications.dll plugin is about to be deleted from your Gaim/plugins directory. Continue?"
    -
    -; for windows uninstall
    -LangString GUIFICATIONS_UNINSTALL_DESC ${LANG_ENGLISH} "Guifications Plugin (remove only)"
    -LangString un.GUIFICATIONS_UNINSTALL_ERROR_1 ${LANG_ENGLISH} "The uninstaller could not find registry entries for Guifications.$\rIt is likely that another user installed the plugin."
    -LangString un.GUIFICATIONS_UNINSTALL_ERROR_2 ${LANG_ENGLISH} "You do not have the permissions necessary to uninstall the plugin."
    -
    +;;
    +;; english.nsh
    +;;
    +;; Default language strings for the Windows guifications NSIS installer.
    +;; Windows Code page: 1252
    +;; Language Code: 1033
    +;;
    +
    +; Startup Pidgin check
    +LangString PIDGIN_NEEDED ${LANG_ENGLISH} "Guifications requires that Pidgin be installed. You must install Pidgin before installing Guifications."
    +
    +LangString GUIFICATIONS_TITLE ${LANG_ENGLISH} "Guifications plugin for Pidgin"
    +
    +LangString BAD_PIDGIN_VERSION_1 ${LANG_ENGLISH} "Incompatible version.$\r$\n$\r$\nThis version of the Guifications plugin was built for Pidgin version ${PIDGIN_VERSION}. It appears that you have Pidgin version"
    +
    +LangString BAD_PIDGIN_VERSION_2 ${LANG_ENGLISH} "installed.$\r$\n$\r$\nSee http://guifications.sourceforge.net for more information."
    +
    +LangString NO_PIDGIN_VERSION ${LANG_ENGLISH} "Unable to determine installed Pidgin version."
    +
    +
    +; Overrides for default text in windows:
    +
    +LangString WELCOME_TITLE ${LANG_ENGLISH} "Guifications v${GUIFICATIONS_VERSION} Installer"
    +LangString WELCOME_TEXT ${LANG_ENGLISH} "Note: This version of the plugin is designed for Pidgin ${PIDGIN_VERSION}, and will not install or function with versions of Pidgin having a different major version number.\r\n\r\nWhen you upgrade your version of Pidgin, you must uninstall or upgrade this plugin as well.\r\n\r\n"
    +
    +LangString DIR_SUBTITLE ${LANG_ENGLISH} "Please locate the directory where Pidgin is installed"
    +LangString DIR_INNERTEXT ${LANG_ENGLISH} "Install in this Pidgin folder:"
    +
    +LangString FINISH_TITLE ${LANG_ENGLISH} "Guifications v${GUIFICATIONS_VERSION} Install Complete"
    +LangString FINISH_TEXT ${LANG_ENGLISH} "You will need to restart Pidgin for the plugin to be loaded, then go the Pidgin preferences and enable the Guifications Plugin."
    +
    +; during install uninstaller
    +LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_ENGLISH} "The guifications.dll plugin is about to be deleted from your Pidgin/plugins directory. Continue?"
    +
    +; for windows uninstall
    +LangString GUIFICATIONS_UNINSTALL_DESC ${LANG_ENGLISH} "Guifications Plugin (remove only)"
    +LangString un.GUIFICATIONS_UNINSTALL_ERROR_1 ${LANG_ENGLISH} "The uninstaller could not find registry entries for Guifications.$\rIt is likely that another user installed the plugin."
    +LangString un.GUIFICATIONS_UNINSTALL_ERROR_2 ${LANG_ENGLISH} "You do not have the permissions necessary to uninstall the plugin."
    +
    --- a/nsis/translations/italian.nsh Tue May 01 03:20:16 2007 -0400
    +++ b/nsis/translations/italian.nsh Tue May 01 04:28:49 2007 -0400
    @@ -7,23 +7,23 @@
    ;; Author: Giacomo Succi <giacsu@sourceforge.net>
    ;;
    -; Startup Gaim check
    -LangString GAIM_NEEDED ${LANG_ITALIAN} "Guifications richiede che Gaim sia installato. Dovete installare Gaim prima di installare Guifications."
    -LangString GUIFICATIONS_TITLE ${LANG_ITALIAN} "Guifications plugin per Gaim"
    -LangString BAD_GAIM_VERSION_1 ${LANG_ITALIAN} "Versione incompatibile.$\r$\n$\r$\nQuesta versione di Guifications e' stata compilata per Gaim ${GAIM_VERSION}. Sembra che avete installato la versione"
    -LangString BAD_GAIM_VERSION_2 ${LANG_ITALIAN} "di Gaim.$\r$\n$\r$\nVisitate http://guifications.sourceforge.net per maggiori informazioni."
    -LangString NO_GAIM_VERSION ${LANG_ITALIAN} "Impossibile determinare la versione di Gaim installata."
    +; Startup Pidgin check
    +LangString PIDGIN_NEEDED ${LANG_ITALIAN} "Guifications richiede che Pidgin sia installato. Dovete installare Pidgin prima di installare Guifications."
    +LangString GUIFICATIONS_TITLE ${LANG_ITALIAN} "Guifications plugin per Pidgin"
    +LangString BAD_PIDGIN_VERSION_1 ${LANG_ITALIAN} "Versione incompatibile.$\r$\n$\r$\nQuesta versione di Guifications e' stata compilata per Pidgin ${PIDGIN_VERSION}. Sembra che avete installato la versione"
    +LangString BAD_PIDGIN_VERSION_2 ${LANG_ITALIAN} "di Pidgin.$\r$\n$\r$\nVisitate http://guifications.sourceforge.net per maggiori informazioni."
    +LangString NO_PIDGIN_VERSION ${LANG_ITALIAN} "Impossibile determinare la versione di Pidgin installata."
    ; Overrides for default text in windows:
    LangString WELCOME_TITLE ${LANG_ITALIAN} "Installatore di Guifications v${GUIFICATIONS_VERSION}"
    -LangString WELCOME_TEXT ${LANG_ITALIAN} "Nota: Questa versione del plugin e' stata pensata per Gaim ${GAIM_VERSION}, e non si installera' e non funzionera' con questa versione di Gaim.\r\n\r\nQuando aggiorna la versione di Gaim, dovete rimuovere o aggiornare la anche il plugin.\r\n\r\n"
    -LangString DIR_SUBTITLE ${LANG_ITALIAN} "Perfavore indicate la cartella dove e' installato Gaim"
    -LangString DIR_INNERTEXT ${LANG_ITALIAN} "Installa in questa cartella di Gaim:"
    +LangString WELCOME_TEXT ${LANG_ITALIAN} "Nota: Questa versione del plugin e' stata pensata per Pidgin ${PIDGIN_VERSION}, e non si installera' e non funzionera' con questa versione di Pidgin.\r\n\r\nQuando aggiorna la versione di Pidgin, dovete rimuovere o aggiornare la anche il plugin.\r\n\r\n"
    +LangString DIR_SUBTITLE ${LANG_ITALIAN} "Perfavore indicate la cartella dove e' installato Pidgin"
    +LangString DIR_INNERTEXT ${LANG_ITALIAN} "Installa in questa cartella di Pidgin:"
    LangString FINISH_TITLE ${LANG_ITALIAN} "Installazione di Guifications v${GUIFICATIONS_VERSION} installata"
    -LangString FINISH_TEXT ${LANG_ITALIAN} "Dovete riavviare Gaim per far caricare il plugin, quindi andate nelle preferenze di Gaim e abilitate Guification Plugin."
    +LangString FINISH_TEXT ${LANG_ITALIAN} "Dovete riavviare Pidgin per far caricare il plugin, quindi andate nelle preferenze di Pidgin e abilitate Guification Plugin."
    ; during install uninstaller
    -LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_ITALIAN} "Il file guifications.dll sta per essere cancellato dalla cartella Gaim/plugins. Continuare?"
    +LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_ITALIAN} "Il file guifications.dll sta per essere cancellato dalla cartella Pidgin/plugins. Continuare?"
    ; for windows uninstall
    LangString GUIFICATIONS_UNINSTALL_DESC ${LANG_ITALIAN} "Guifications Plugin (soltanto rimozione)"
    --- a/nsis/translations/spanish.nsh Tue May 01 03:20:16 2007 -0400
    +++ b/nsis/translations/spanish.nsh Tue May 01 04:28:49 2007 -0400
    @@ -6,23 +6,23 @@
    ;; Author: David Rubio <deifo@ono.com>
    ;;
    -; Startup Gaim check
    -LangString GAIM_NEEDED ${LANG_SPANISH} "Guifications requiere que Gaim est instalado. Debe instalar Gaim antes de instalar Guifications."
    -LangString GUIFICATIONS_TITLE ${LANG_SPANISH} "Plugin Guifications para Gaim"
    -LangString BAD_GAIM_VERSION_1 ${LANG_SPANISH} "Version Incompatible.$\r$\n$\r$\nEsta versin del plugin Guifications fue creada para la versin ${GAIM_VERSION} de Gaim. Parece que usted tiene la versin"
    -LangString BAD_GAIM_VERSION_2 ${LANG_SPANISH} "instalada.$\r$\n$\r$\nVisite http://guifications.sourceforge.net para ms informacin."
    -LangString NO_GAIM_VERSION ${LANG_SPANISH} "Imposible determinar la versin de Gaim instalada."
    +; Startup Pidgin check
    +LangString PIDGIN_NEEDED ${LANG_SPANISH} "Guifications requiere que Pidgin est instalado. Debe instalar Pidgin antes de instalar Guifications."
    +LangString GUIFICATIONS_TITLE ${LANG_SPANISH} "Plugin Guifications para Pidgin"
    +LangString BAD_PIDGIN_VERSION_1 ${LANG_SPANISH} "Version Incompatible.$\r$\n$\r$\nEsta versin del plugin Guifications fue creada para la versin ${PIDGIN_VERSION} de Pidgin. Parece que usted tiene la versin"
    +LangString BAD_PIDGIN_VERSION_2 ${LANG_SPANISH} "instalada.$\r$\n$\r$\nVisite http://guifications.sourceforge.net para ms informacin."
    +LangString NO_PIDGIN_VERSION ${LANG_SPANISH} "Imposible determinar la versin de Pidgin instalada."
    ; Overrides for default text in windows:
    LangString WELCOME_TITLE ${LANG_SPANISH} "Instalador de Guifications v${GUIFICATIONS_VERSION}"
    -LangString WELCOME_TEXT ${LANG_SPANISH} "Nota: Esta versin del plugin est diseada para Gaim ${GAIM_VERSION}, y no se instalar o funcionar con otras versiones de Gaim.\r\n\r\nCuando actualice su versin de Gaim, deber desinstalar o actualizar tambin este plugin.\r\n\r\n"
    -LangString DIR_SUBTITLE ${LANG_SPANISH} "Por favor indique la carpeta donde est instalado Gaim"
    -LangString DIR_INNERTEXT ${LANG_SPANISH} "Instalar en esta carpeta de Gaim:"
    +LangString WELCOME_TEXT ${LANG_SPANISH} "Nota: Esta versin del plugin est diseada para Pidgin ${PIDGIN_VERSION}, y no se instalar o funcionar con otras versiones de Pidgin.\r\n\r\nCuando actualice su versin de Pidgin, deber desinstalar o actualizar tambin este plugin.\r\n\r\n"
    +LangString DIR_SUBTITLE ${LANG_SPANISH} "Por favor indique la carpeta donde est instalado Pidgin"
    +LangString DIR_INNERTEXT ${LANG_SPANISH} "Instalar en esta carpeta de Pidgin:"
    LangString FINISH_TITLE ${LANG_SPANISH} "Instalacin completa de Guifications v${GUIFICATIONS_VERSION}"
    -LangString FINISH_TEXT ${LANG_SPANISH} "Necesitar reiniciar Gaim para que se cargue el plugin, luego vaya a las preferencias de Gaim y active el plugin Guifications."
    +LangString FINISH_TEXT ${LANG_SPANISH} "Necesitar reiniciar Pidgin para que se cargue el plugin, luego vaya a las preferencias de Pidgin y active el plugin Guifications."
    ; during install uninstaller
    -LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_SPANISH} "El plugin guifications.dll est a punto de borrarse de la carpeta de Gaim/plugins. Continuar?"
    +LangString GUIFICATIONS_PROMPT_WIPEOUT ${LANG_SPANISH} "El plugin guifications.dll est a punto de borrarse de la carpeta de Pidgin/plugins. Continuar?"
    ; for windows uninstall
    LangString GUIFICATIONS_UNINSTALL_DESC ${LANG_SPANISH} "Guifications Plugin (borrar slo)"
    --- a/pixmaps/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/pixmaps/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -4,10 +4,12 @@
    # Description: Makefile for guifications pixmaps
    #
    -GAIM_TOP = ../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +-include ../local.mak
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install
    --- a/po/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/po/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -3,8 +3,11 @@
    # Description: Makefile to generate mo files
    #
    -GAIM_TOP = ../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ..
    +-include $(GF_TOP)/local.mak
    +
    +PIDGIN_TREE_TOP ?= ../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    PACKAGE = guifications
    @@ -33,12 +36,12 @@
    all: $(CATALOGS)
    install: all
    - mkdir -p $(GAIM_INSTALL_PO_DIR)
    + mkdir -p $(PIDGIN_INSTALL_PO_DIR)
    @catalogs='$(CATALOGS)'; \
    for cat in $$catalogs; do \
    cat=`basename $$cat`; \
    lang=`echo $$cat | sed 's/\.gmo$$//'`; \
    - dir=$(GAIM_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
    + dir=$(PIDGIN_INSTALL_PO_DIR)/$$lang/LC_MESSAGES; \
    mkdir -p $$dir; \
    cp $$cat $$dir/$(PACKAGE).mo; \
    echo "installing $$cat as $$dir/$(PACKAGE).mo"; \
    --- a/src/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/src/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -8,9 +8,10 @@
    # PATHS
    #
    -GF_TOP := ../
    -GAIM_TOP := ../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ..
    +-include $(GF_TOP)/local.mak
    +PIDGIN_TREE_TOP ?= ../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    GF_VERSION := $(shell cat ${GF_TOP}/VERSION)
    @@ -35,11 +36,11 @@
    ##
    INCLUDE_PATHS += -I. \
    - -I$(GAIM_TOP) \
    - -I$(GAIM_LIB_TOP) \
    - -I$(GAIM_LIB_TOP)/win32 \
    - -I$(GAIM_GTK_TOP) \
    - -I$(GAIM_GTK_TOP)/win32 \
    + -I$(PIDGIN_TREE_TOP) \
    + -I$(PURPLE_TOP) \
    + -I$(PURPLE_TOP)/win32 \
    + -I$(PIDGIN_TOP) \
    + -I$(PIDGIN_TOP)/win32 \
    -I$(GTK_TOP)/include \
    -I$(GTK_TOP)/include/gtk-2.0 \
    -I$(GTK_TOP)/include/glib-2.0 \
    @@ -48,12 +49,12 @@
    -I$(GTK_TOP)/include/freetype2 \
    -I$(GTK_TOP)/lib/glib-2.0/include \
    -I$(GTK_TOP)/lib/gtk-2.0/include \
    - -I$(GAIM_TOP)
    + -I$(PIDGIN_TREE_TOP)
    LIB_PATHS = \
    - -L$(GAIM_LIB_TOP) \
    - -L$(GAIM_GTK_TOP) \
    + -L$(PURPLE_TOP) \
    + -L$(PIDGIN_TOP) \
    -L$(GTK_TOP)/lib
    @@ -102,10 +103,10 @@
    -lgobject-2.0 \
    -lws2_32 \
    -lintl \
    - -lgaim \
    - -lgtkgaim
    + -lpurple \
    + -lpidgin
    -include $(GAIM_COMMON_RULES)
    +include $(PIDGIN_COMMON_RULES)
    ##
    @@ -116,14 +117,14 @@
    all: $(GF).dll
    -install: all $(GAIM_INSTALL_PLUGINS_DIR)
    - cp $(GF).dll $(GAIM_INSTALL_PLUGINS_DIR)
    +install: all $(PIDGIN_INSTALL_PLUGINS_DIR)
    + cp $(GF).dll $(PIDGIN_INSTALL_PLUGINS_DIR)
    ##
    ## BUILD DLL
    ##
    -$(GF).dll: $(GAIM_GTKGAIM_DLL).a $(GF_OBJ)
    +$(GF).dll: $(PIDGIN_DLL).a $(GF_OBJ)
    $(CC) -shared $(GF_OBJ) $(LIB_PATHS) $(PLUGIN_LIBS) $(DLL_LD_FLAGS) -o $(GF).dll
    --- a/src/gf_preferences.c Tue May 01 03:20:16 2007 -0400
    +++ b/src/gf_preferences.c Tue May 01 04:28:49 2007 -0400
    @@ -590,7 +590,7 @@
    command = g_strdup_printf("tar > /dev/null xzf %s -C %s", escaped, destdir);
    g_free(escaped);
    #else
    - if(!gtkwpurple_gz_untar(path, destdir)) {
    + if(!winpidgin_gz_untar(path, destdir)) {
    g_free(destdir);
    return;
    }
    --- a/themes/Penguins/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/themes/Penguins/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -4,10 +4,13 @@
    # Description: Makefile for guifications penguin theme
    #
    -GAIM_TOP = ../../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ../..
    +-include $(GF_TOP)/local.mak
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install
    --- a/themes/default/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/themes/default/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -5,10 +5,14 @@
    #
    -GAIM_TOP = ../../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ../..
    +-include $(GF_TOP)/local.mak
    +
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install
    --- a/themes/funky/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/themes/funky/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -4,10 +4,13 @@
    # Description: Makefile for guifications test theme
    #
    -GAIM_TOP = ../../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ../..
    +-include $(GF_TOP)/local.mak
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install
    --- a/themes/item_test/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/themes/item_test/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -4,10 +4,13 @@
    # Description: Makefile for guifications test theme
    #
    -GAIM_TOP = ../../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ../..
    +-include $(GF_TOP)/local.mak
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install
    --- a/themes/mini/Makefile.mingw Tue May 01 03:20:16 2007 -0400
    +++ b/themes/mini/Makefile.mingw Tue May 01 04:28:49 2007 -0400
    @@ -4,10 +4,13 @@
    # Description: Makefile for guifications default theme
    #
    -GAIM_TOP = ../../../../..
    -include $(GAIM_TOP)/libgaim/win32/global.mak
    +GF_TOP := ../..
    +-include $(GF_TOP)/local.mak
    -GAIM_DATADIR = $(GAIM_INSTALL_DIR)
    +PIDGIN_TREE_TOP ?= ../../../../..
    +include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
    +
    +PIDGIN_DATADIR = $(PIDGIN_INSTALL_DIR)
    include ./Makefile.am
    .PHONY: install