[Guifications-commits] r255 - in trunk/guifications2: . src
Brought to you by:
amc_grim,
rekkanoryo
Menu
▾
▴
[Guifications-commits] r255 - in trunk/guifications2: . src
|
From: <gui...@re...> - 2007-04-09 01:54:34
|
Author: jbailey Date: 2007-04-08 20:54:24 -0500 (Sun, 08 Apr 2007) New Revision: 255 Modified: trunk/guifications2/Makefile.am trunk/guifications2/configure.ac trunk/guifications2/gaim-guifications.spec.in trunk/guifications2/gf_config.h.mingw trunk/guifications2/guifications-installer.nsi trunk/guifications2/src/Makefile.am trunk/guifications2/src/gf_action.c trunk/guifications2/src/gf_blist.c trunk/guifications2/src/gf_display.c trunk/guifications2/src/gf_event.c trunk/guifications2/src/gf_event.h trunk/guifications2/src/gf_event_info.c trunk/guifications2/src/gf_item.c trunk/guifications2/src/gf_item_icon.c trunk/guifications2/src/gf_item_image.c trunk/guifications2/src/gf_item_offset.c trunk/guifications2/src/gf_item_text.c trunk/guifications2/src/gf_notification.c trunk/guifications2/src/gf_preferences.c trunk/guifications2/src/gf_stock.c trunk/guifications2/src/gf_theme.c trunk/guifications2/src/gf_theme_editor.c trunk/guifications2/src/gf_theme_info.c trunk/guifications2/src/gf_theme_ops.c trunk/guifications2/src/guifications.c Log: I *think* this is all of the Pidginizing that Gary and I did to make this thing build against Pidgin. I'm not testing this because I actually have a working build and don't care to break it right now. This revision's diffstat output: Makefile.am | 4 +- configure.ac | 8 ++--- gaim-guifications.spec.in | 64 +++++++++++++++++++++++---------------------- gf_config.h.mingw | 6 ++-- guifications-installer.nsi | 58 ++++++++++++++++++++-------------------- src/Makefile.am | 4 ++ src/gf_action.c | 4 ++ src/gf_blist.c | 2 + src/gf_display.c | 2 + src/gf_event.c | 2 + src/gf_event.h | 2 + src/gf_event_info.c | 2 + src/gf_item.c | 2 + src/gf_item_icon.c | 2 + src/gf_item_image.c | 2 + src/gf_item_offset.c | 2 + src/gf_item_text.c | 1 src/gf_notification.c | 2 + src/gf_preferences.c | 2 + src/gf_stock.c | 2 + src/gf_theme.c | 8 +++-- src/gf_theme_editor.c | 4 ++ src/gf_theme_info.c | 2 + src/gf_theme_ops.c | 2 + src/guifications.c | 8 +++-- 25 files changed, 120 insertions(+), 77 deletions(-) Modified: trunk/guifications2/Makefile.am =================================================================== --- trunk/guifications2/Makefile.am 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/Makefile.am 2007-04-09 01:54:24 UTC (rev 255) @@ -3,7 +3,7 @@ ChangeLog \ COPYING \ gf_config.h.mingw \ - gaim-guifications.spec \ + pidgin-guifications.spec \ guifications-installer.nsi \ INSTALL \ INSTALL.WIN32 \ @@ -27,6 +27,6 @@ gf_config.h: pre_config.h cp -f po/Makefile po/.tmp-Makefile - sed -e "s#localedir = .*#localedir = $(GAIM_DATADIR)/locale#g" < po/.tmp-Makefile > po/Makefile + sed -e "s#localedir = .*#localedir = $(PIDGIN_DATADIR)/locale#g" < po/.tmp-Makefile > po/Makefile rm -f po/.tmp-Makefile $(sedpath) 's/\#define PACKAGE/\#define GF_PACKAGE/g' pre_config.h > $@ Modified: trunk/guifications2/configure.ac =================================================================== --- trunk/guifications2/configure.ac 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/configure.ac 2007-04-09 01:54:24 UTC (rev 255) @@ -1,6 +1,6 @@ # -# Most of this configure script was ripped from gaim or the -# gaim-encryption configure script, thanks guys ;) +# Most of this configure script was ripped from pidgin or the +# pidgin-encryption configure script, thanks guys ;) # AC_INIT([gaim-guifications], [2.13svn], [gui...@li...]) @@ -28,7 +28,7 @@ # # I'm lazy and figured config.h is the best place for this ;) # -AC_DEFINE_UNQUOTED(GF_WEBSITE, "http://gaim.guifications.org", [Guifications Website]) +AC_DEFINE_UNQUOTED(GF_WEBSITE, "http://pidgin.guifications.org", [Guifications Website]) # # Our header @@ -147,7 +147,7 @@ # AC_OUTPUT([Makefile VERSION - gaim-guifications.spec + pidgin-guifications.spec doc/Makefile nsis/Makefile nsis/translations/Makefile Modified: trunk/guifications2/gaim-guifications.spec.in =================================================================== --- trunk/guifications2/gaim-guifications.spec.in 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/gaim-guifications.spec.in 2007-04-09 01:54:24 UTC (rev 255) @@ -1,32 +1,32 @@ # -# gaim_major_ver and gaim_minor_ver should be defined to match the minimum -# Gaim API version _required_ to build Guifications -# Due to the way Gaim checks plugin versions, we need to also ensure that -# the correct minimum version of Gaim is Require:'d based on what version of -# the Gaim headers we actually build with. +# pidgin_major_ver and pidgin_minor_ver should be defined to match the minimum +# Pidgin API version _required_ to build Guifications +# Due to the way Pidgin checks plugin versions, we need to also ensure that +# the correct minimum version of Pidgin is Require:'d based on what version of +# the Pidgin headers we actually build with. # -# This allows --define 'gaimver 1' to be used to build an rpm for Gaim 1.x -# default is to build for Gaim 2.x -%{!?gaimver: %{expand: %%define gaimver 2}} -%define gaim_major_ver %{gaimver} -%define gaim_minor_ver 0 -%define gaim_next_major_ver %(echo $((%{gaim_major_ver}+1))) -%define gaim_build_minor_ver %(pkg-config --modversion gaim | awk -F. '{ print $2 }') +# This allows --define 'pidginver 1' to be used to build an rpm for Pidgin 1.x +# default is to build for Pidgin 2.x +%{!?pidginver: %{expand: %%define pidginver 2}} +%define pidgin_major_ver %{pidginver} +%define pidgin_minor_ver 0 +%define pidgin_next_major_ver %(echo $((%{pidgin_major_ver}+1))) +%define pidgin_build_minor_ver %(pkg-config --modversion pidgin | awk -F. '{ print $2 }') -Summary: Guifications Plugin for Gaim +Summary: Guifications Plugin for Pidgin Name: @PACKAGE@ Version: @VERSION@ -Release: 0%{?gaimdist:.%{gaimdist}} +Release: 0%{?pidgindist:.%{pidgindist}} License: GPL Group: Applications/Internet -Url: http://gaim.guifications.org -Source: http://downloads.guifications.org/gaim-plugins/Guifications2/%{name}-%{version}.tar.gz +Url: http://pidgin.guifications.org +Source: http://downloads.guifications.org/pidgin-plugins/Guifications2/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: gaim >= 1:%{gaim_major_ver}.%{gaim_build_minor_ver}, gaim < 1:%{gaim_next_major_ver} +Requires: pidgin >= 1:%{pidgin_major_ver}.%{pidgin_build_minor_ver}, pidgin < 1:%{pidgin_next_major_ver} BuildRequires: pkgconfig, libtool, gettext -BuildRequires: gaim-devel >= 1:%{gaim_major_ver}.%{gaim_minor_ver}, gaim-devel < 1:%{gaim_next_major_ver} +BuildRequires: pidgin-devel >= 1:%{pidgin_major_ver}.%{pidgin_minor_ver}, pidgin-devel < 1:%{pidgin_next_major_ver} %if "%{_vendor}" == "MandrakeSoft" BuildRequires: libgtk+2.0_0-devel %else @@ -34,10 +34,10 @@ %endif %description -Guifications is a graphical notification plugin for the open source instant messaging client Gaim +Guifications is a graphical notification plugin for the open source instant messaging client Pidgin -To rebuild for a specific Gaim version: -rpmbuild --rebuild %{name}-%{version}-%{release}.src.rpm --define 'gaimdist %{!?gaimdist:fc1}%{?gaimdist:%{gaimdist}}' +To rebuild for a specific Pidgin version: +rpmbuild --rebuild %{name}-%{version}-%{release}.src.rpm --define 'pidgindist %{!?pidgindist:fc1}%{?pidgindist:%{pidgindist}}' %prep %setup -q @@ -51,11 +51,11 @@ make DESTDIR="$RPM_BUILD_ROOT" install %if "%{_vendor}" == "MandrakeSoft" -mv -f $RPM_BUILD_ROOT%{_libdir}/gaim/guifications $RPM_BUILD_ROOT%{_libdir}/gaim/guifications.so || : +mv -f $RPM_BUILD_ROOT%{_libdir}/pidgin/guifications $RPM_BUILD_ROOT%{_libdir}/pidgin/guifications.so || : %endif -strip $RPM_BUILD_ROOT%{_libdir}/gaim/*.so || : -rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/*.la $RPM_BUILD_ROOT%{_libdir}/gaim/*.a +strip $RPM_BUILD_ROOT%{_libdir}/pidgin/*.so || : +rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la $RPM_BUILD_ROOT%{_libdir}/pidgin/*.a %find_lang guifications @@ -65,10 +65,14 @@ %files -f guifications.lang %defattr(-, root, root) %doc AUTHORS ChangeLog COPYING README doc/flow.png doc/flow.dia doc/QUOTES -%{_libdir}/gaim/*.so -%{_datadir}/pixmaps/gaim/guifications +%{_libdir}/pidgin/*.so +%{_datadir}/pixmaps/pidgin/guifications %changelog +* Sun Apr 1 2007 +- :%s/gaim/pidgin/g and :%s/Gaim/Pidgin/g to prep for eventual Pidgin + releases. + * Tue Dec 5 2006 John Bailey <rek...@re...> - Fix the source URL to point to our new download location @@ -76,18 +80,18 @@ - Fix finding the translations * Thu Nov 3 2005 Stu Tomlinson <st...@no...> -- Default to building for Gaim 2.x with a bit of trickery to optionally - build for Gaim 1.x +- Default to building for Pidgin 2.x with a bit of trickery to optionally + build for Pidgin 1.x * Fri Apr 8 2005 Stu Tomlinson <st...@no...> - spec file cleanup, build vs. install dependency fixes, use %%find_lang, tidy up release version, fix directory ownership * Fri Dec 17 2004 Stu Tomlinson <st...@no...> -- Tweaks to the Gaim version dependencies +- Tweaks to the Pidgin version dependencies * Sat Oct 9 2004 Stu Tomlinson <st...@no...> -- Add Gaim version checks to match new Gaim versioning +- Add Pidgin version checks to match new Pidgin versioning * Wed Jun 30 2004 Stu Tomlinson <st...@no...> - Initial spec file for Guifications 2 Modified: trunk/guifications2/gf_config.h.mingw =================================================================== --- trunk/guifications2/gf_config.h.mingw 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/gf_config.h.mingw 2007-04-09 01:54:24 UTC (rev 255) @@ -22,7 +22,7 @@ #define ENABLE_NLS 1 /* Guifications Website */ -#define GF_WEBSITE "http://gaim.guifications.org" +#define GF_WEBSITE "http://pidgin.guifications.org" /* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 @@ -67,8 +67,8 @@ /* Define to 1 if you have the `fwprintf' function. */ #define HAVE_FWPRINTF 1 -/* Define if we've found gaim. */ -#define HAVE_GAIM 1 +/* Define if we've found pidgin. */ +#define HAVE_PIDGIN 1 /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 Modified: trunk/guifications2/guifications-installer.nsi =================================================================== --- trunk/guifications2/guifications-installer.nsi 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/guifications-installer.nsi 2007-04-09 01:54:24 UTC (rev 255) @@ -1,6 +1,6 @@ ; NSIS Script For Guifications Plugin ; Author Daniel A. Atallah -; Based on the Gaim installer by Herman Bloggs and the Gaim-Encryption installer by Bill Tompkins +; Based on the Pidgin installer by Herman Bloggs and the Pidgin-Encryption installer by Bill Tompkins ; Uses NSIS v2.0 ;-------------------------------- @@ -9,36 +9,36 @@ ;-------------------------------- ;General - Name "Gaim Guifications ${GUIFICATIONS_VERSION}" + Name "Pidgin Guifications ${GUIFICATIONS_VERSION}" ;Do A CRC Check CRCCheck On ;Output File Name - OutFile "gaim-guifications-${GUIFICATIONS_VERSION}.exe" + OutFile "pidgin-guifications-${GUIFICATIONS_VERSION}.exe" ;The Default Installation Directory - InstallDir "$PROGRAMFILES\gaim" - InstallDirRegKey HKLM SOFTWARE\gaim "" + InstallDir "$PROGRAMFILES\pidgin" + InstallDirRegKey HKLM SOFTWARE\pidgin "" ShowInstDetails show ShowUnInstDetails show SetCompressor /SOLID lzma - !define GUIFICATIONS_UNINST_EXE "gaim-guifications-uninst.exe" + !define GUIFICATIONS_UNINST_EXE "pidgin-guifications-uninst.exe" !define GUIFICATIONS_DLL "guifications.dll" !define GUIFICATIONS_UNINSTALL_LNK "Guifications Uninstall.lnk" ;-------------------------------- ; Registry keys: - !define GUIFICATIONS_REG_KEY "SOFTWARE\gaim-guifications" - !define GUIFICATIONS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\gaim-guifications" + !define GUIFICATIONS_REG_KEY "SOFTWARE\pidgin-guifications" + !define GUIFICATIONS_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\pidgin-guifications" ;------------------------------- -; Gaim Plugin installer helper stuff +; Pidgin Plugin installer helper stuff !addincludedir "../../win32/nsis" - !include "gaim-plugin.nsh" + !include "pidgin-plugin.nsh" ;-------------------------------- ; Modern UI Configuration @@ -46,7 +46,7 @@ !define MUI_UNICON .\nsis\install.ico !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "nsis\header.bmp" - !define MUI_CUSTOMFUNCTION_GUIINIT gf_checkGaimVersion + !define MUI_CUSTOMFUNCTION_GUIINIT gf_checkPidginVersion !define MUI_ABORTWARNING @@ -147,7 +147,7 @@ ; plugin DLL Delete "$R1\plugins\${GUIFICATIONS_DLL}" ; pixmaps - RMDir /r "$R1\pixmaps\gaim\guifications" + RMDir /r "$R1\pixmaps\pidgin\guifications" Delete "$R3" done: @@ -191,16 +191,16 @@ SetOverwrite on File "src\${GUIFICATIONS_DLL}" - SetOutPath "$INSTDIR\pixmaps\gaim\guifications\conf" + SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\conf" File "pixmaps\*.png" - SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\default" + SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\default" File "themes\default\theme.xml" File "themes\default\background.png" - SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\mini" + SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\mini" File "themes\mini\theme.xml" File "themes\mini\background.png" - SetOutPath "$INSTDIR\pixmaps\gaim\guifications\themes\Penguins" + SetOutPath "$INSTDIR\pixmaps\pidgin\guifications\themes\Penguins" File "themes\Penguins\theme.xml" File "themes\Penguins\penguin.png" @@ -237,7 +237,7 @@ File /oname=guifications.mo po\zh_TW.gmo StrCmp $R0 "NONE" done - CreateShortCut "$SMPROGRAMS\Gaim\${GUIFICATIONS_UNINSTALL_LNK}" "$INSTDIR\${GUIFICATIONS_UNINST_EXE}" + CreateShortCut "$SMPROGRAMS\Pidgin\${GUIFICATIONS_UNINSTALL_LNK}" "$INSTDIR\${GUIFICATIONS_UNINST_EXE}" WriteUninstaller "$INSTDIR\${GUIFICATIONS_UNINST_EXE}" SetOverWrite off @@ -271,7 +271,7 @@ ; plugin Delete "$INSTDIR\plugins\${GUIFICATIONS_DLL}" ; pixmaps - RMDir /r "$INSTDIR\pixmaps\gaim\guifications" + RMDir /r "$INSTDIR\pixmaps\pidgin\guifications" ; translations ; loop through locale dirs and try to delete any guifications translations @@ -299,12 +299,12 @@ ; uninstaller Delete "$INSTDIR\${GUIFICATIONS_UNINST_EXE}" ; uninstaller shortcut - Delete "$SMPROGRAMS\Gaim\${GUIFICATIONS_UNINSTALL_LNK}" + Delete "$SMPROGRAMS\Pidgin\${GUIFICATIONS_UNINSTALL_LNK}" - ; try to delete the Gaim directories, in case it has already uninstalled + ; try to delete the Pidgin directories, in case it has already uninstalled RMDir "$INSTDIR\plugins" RMDir "$INSTDIR" - RMDir "$SMPROGRAMS\Gaim" + RMDir "$SMPROGRAMS\Pidgin" Goto done @@ -319,23 +319,23 @@ done: SectionEnd -; Check that the selected installation dir contains gaim.exe +; Check that the selected installation dir contains pidgin.exe Function .onVerifyInstDir - IfFileExists $INSTDIR\gaim.exe +2 + IfFileExists $INSTDIR\pidgin.exe +2 Abort FunctionEnd -; Check that the currently installed gaim version is compatible with the version of guifications we are installing -Function gf_checkGaimVersion +; Check that the currently installed pidgin version is compatible with the version of guifications we are installing +Function gf_checkPidginVersion Push $R0 Push ${GAIM_VERSION} - Call CheckGaimVersion + Call CheckPidginVersion Pop $R0 - StrCmp $R0 ${GAIM_VERSION_OK} gf_checkGaimVersion_OK + StrCmp $R0 ${GAIM_VERSION_OK} gf_checkPidginVersion_OK StrCmp $R0 ${GAIM_VERSION_INCOMPATIBLE} +1 +6 - Call GetGaimVersion + Call GetPidginVersion IfErrors +3 Pop $R0 MessageBox MB_OK|MB_ICONSTOP "$(BAD_GAIM_VERSION_1) $R0 $(BAD_GAIM_VERSION_2)" @@ -343,7 +343,7 @@ MessageBox MB_OK|MB_ICONSTOP "$(NO_GAIM_VERSION)" Quit - gf_checkGaimVersion_OK: + gf_checkPidginVersion_OK: Pop $R0 FunctionEnd Modified: trunk/guifications2/src/Makefile.am =================================================================== --- trunk/guifications2/src/Makefile.am 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/Makefile.am 2007-04-09 01:54:24 UTC (rev 255) @@ -59,7 +59,9 @@ $(BINRELOC_LIBS) \ $(GTK_LIBS) \ $(GLIB_LIBS) \ - $(PANGOFT2_LIBS) + $(PANGOFT2_LIBS) \ + $(PIDGIN_LIBS) \ + $(PURPLE_LIBS) endif Modified: trunk/guifications2/src/gf_action.c =================================================================== --- trunk/guifications2/src/gf_action.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_action.c 2007-04-09 01:54:24 UTC (rev 255) @@ -26,11 +26,13 @@ #include <gtkdialogs.h> #include <gtklog.h> #include <gtkpounce.h> -#include <gaimstock.h> #include <gtkutils.h> +#include <pidginstock.h> #include <plugin.h> #include <version.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_blist.c =================================================================== --- trunk/guifications2/src/gf_blist.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_blist.c 2007-04-09 01:54:24 UTC (rev 255) @@ -27,6 +27,8 @@ #include <request.h> #include <version.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_display.c =================================================================== --- trunk/guifications2/src/gf_display.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_display.c 2007-04-09 01:54:24 UTC (rev 255) @@ -40,6 +40,8 @@ #include <prefs.h> #include <version.h> +#include <gaim-compat.h> + #include "gf_action.h" #include "gf_event_info.h" #include "gf_notification.h" Modified: trunk/guifications2/src/gf_event.c =================================================================== --- trunk/guifications2/src/gf_event.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_event.c 2007-04-09 01:54:24 UTC (rev 255) @@ -31,6 +31,8 @@ #include <util.h> #include <version.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_event.h =================================================================== --- trunk/guifications2/src/gf_event.h 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_event.h 2007-04-09 01:54:24 UTC (rev 255) @@ -39,6 +39,8 @@ #include <plugin.h> +#include <gaim-compat.h> + G_BEGIN_DECLS GfEvent *gf_event_new(const gchar *notification_type, const gchar *tokens, Modified: trunk/guifications2/src/gf_event_info.c =================================================================== --- trunk/guifications2/src/gf_event_info.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_event_info.c 2007-04-09 01:54:24 UTC (rev 255) @@ -25,6 +25,8 @@ #include <conversation.h> #include <prefs.h> +#include <gaim-compat.h> + #include "gf_event.h" #include "gf_event_info.h" Modified: trunk/guifications2/src/gf_item.c =================================================================== --- trunk/guifications2/src/gf_item.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_item.c 2007-04-09 01:54:24 UTC (rev 255) @@ -21,6 +21,8 @@ #include <debug.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_item_icon.c =================================================================== --- trunk/guifications2/src/gf_item_icon.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_item_icon.c 2007-04-09 01:54:24 UTC (rev 255) @@ -27,6 +27,8 @@ #include <gtkblist.h> #include <gtkutils.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_item_image.c =================================================================== --- trunk/guifications2/src/gf_item_image.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_item_image.c 2007-04-09 01:54:24 UTC (rev 255) @@ -22,6 +22,8 @@ #include <debug.h> #include <xmlnode.h> +#include <gaim-compat.h> + #include "gf_event_info.h" #include "gf_gtk_utils.h" #include "gf_item.h" Modified: trunk/guifications2/src/gf_item_offset.c =================================================================== --- trunk/guifications2/src/gf_item_offset.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_item_offset.c 2007-04-09 01:54:24 UTC (rev 255) @@ -22,6 +22,8 @@ #include <xmlnode.h> +#include <gaim-compat.h> + #include "gf_item.h" struct _GfItemOffset { Modified: trunk/guifications2/src/gf_item_text.c =================================================================== --- trunk/guifications2/src/gf_item_text.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_item_text.c 2007-04-09 01:54:24 UTC (rev 255) @@ -48,6 +48,7 @@ #include <xmlnode.h> #include <version.h> +#include <gaim-compat.h> #ifndef _WIN32 # include <gdk/gdkx.h> Modified: trunk/guifications2/src/gf_notification.c =================================================================== --- trunk/guifications2/src/gf_notification.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_notification.c 2007-04-09 01:54:24 UTC (rev 255) @@ -23,6 +23,8 @@ #include <debug.h> #include <xmlnode.h> +#include <gaim-compat.h> + #include "gf_event_info.h" #include "gf_gtk_utils.h" #include "gf_item.h" Modified: trunk/guifications2/src/gf_preferences.c =================================================================== --- trunk/guifications2/src/gf_preferences.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_preferences.c 2007-04-09 01:54:24 UTC (rev 255) @@ -33,6 +33,8 @@ #include <gtkutils.h> #include <gtkprefs.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_stock.c =================================================================== --- trunk/guifications2/src/gf_stock.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_stock.c 2007-04-09 01:54:24 UTC (rev 255) @@ -20,6 +20,8 @@ #include <debug.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_theme.c =================================================================== --- trunk/guifications2/src/gf_theme.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_theme.c 2007-04-09 01:54:24 UTC (rev 255) @@ -23,10 +23,12 @@ #include <string.h> #include <stdlib.h> -#include "debug.h" -#include "util.h" -#include "xmlnode.h" +#include <debug.h> +#include <util.h> +#include <xmlnode.h> +#include <gaim-compat.h> + #ifdef HAVE_CONFIG_H # include "../gf_config.h" #endif Modified: trunk/guifications2/src/gf_theme_editor.c =================================================================== --- trunk/guifications2/src/gf_theme_editor.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_theme_editor.c 2007-04-09 01:54:24 UTC (rev 255) @@ -29,7 +29,7 @@ #define GAIM_PLUGINS #include <debug.h> -#include <gaim.h> +#include <pidgin.h> #include <notify.h> #include <plugin.h> #include <request.h> @@ -37,6 +37,8 @@ #include <util.h> #include <gtkplugin.h> +#include <gaim-compat.h> + #include "gf_event.h" #include "gf_file.h" #include "gf_internal.h" Modified: trunk/guifications2/src/gf_theme_info.c =================================================================== --- trunk/guifications2/src/gf_theme_info.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_theme_info.c 2007-04-09 01:54:24 UTC (rev 255) @@ -33,6 +33,8 @@ #include <debug.h> #include <xmlnode.h> +#include <gaim-compat.h> + GfThemeInfo * gf_theme_info_new() { GfThemeInfo *info; Modified: trunk/guifications2/src/gf_theme_ops.c =================================================================== --- trunk/guifications2/src/gf_theme_ops.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/gf_theme_ops.c 2007-04-09 01:54:24 UTC (rev 255) @@ -31,6 +31,8 @@ #include <debug.h> #include <xmlnode.h> +#include <gaim-compat.h> + GfThemeOptions * gf_theme_options_new() { GfThemeOptions *ops; Modified: trunk/guifications2/src/guifications.c =================================================================== --- trunk/guifications2/src/guifications.c 2007-02-26 04:20:32 UTC (rev 254) +++ trunk/guifications2/src/guifications.c 2007-04-09 01:54:24 UTC (rev 255) @@ -20,7 +20,7 @@ # include "../gf_config.h" #endif -#define GAIM_PLUGINS +#define PURPLE_PLUGINS #include "gf_action.h" #include "gf_blist.h" @@ -35,11 +35,13 @@ #include "gf_stock.h" #include <debug.h> -#include <gaim.h> +#include <pidgin.h> #include <plugin.h> #include <gtkplugin.h> #include <version.h> +#include <gaim-compat.h> + #include <stdlib.h> #include <time.h> @@ -135,4 +137,4 @@ gf_preferences_add(); } -GAIM_INIT_PLUGIN(Guifications2, init_plugin, gf_info) +PURPLE_INIT_PLUGIN(Guifications2, init_plugin, gf_info) |