guifications-commits Mailing List for guifications
Brought to you by:
amc_grim,
rekkanoryo
Menu
▾
▴
guifications-commits — commits to cvs
This list is closed, nobody may subscribe to it.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(181) |
Sep
(114) |
Oct
(65) |
Nov
(55) |
Dec
(158) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(75) |
Feb
(84) |
Mar
(31) |
Apr
(74) |
May
(136) |
Jun
(4) |
Jul
(107) |
Aug
(266) |
Sep
(98) |
Oct
(195) |
Nov
(231) |
Dec
(258) |
| 2006 |
Jan
(329) |
Feb
(166) |
Mar
(118) |
Apr
(36) |
May
(24) |
Jun
(47) |
Jul
(39) |
Aug
(38) |
Sep
(25) |
Oct
(153) |
Nov
(49) |
Dec
(80) |
| 2007 |
Jan
(31) |
Feb
(15) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
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) |
|
From: <gui...@re...> - 2007-02-26 04:20:33
|
Author: jbailey Date: 2007-02-25 22:20:32 -0600 (Sun, 25 Feb 2007) New Revision: 254 Modified: trunk/plugin_pack/ChangeLog Log: Changelogging This revision's diffstat output: ChangeLog | 2 ++ 1 file changed, 2 insertions(+) Modified: trunk/plugin_pack/ChangeLog =================================================================== --- trunk/plugin_pack/ChangeLog 2007-02-23 04:29:09 UTC (rev 253) +++ trunk/plugin_pack/ChangeLog 2007-02-26 04:20:32 UTC (rev 254) @@ -1,4 +1,6 @@ Version 1.0svn: + * Added the Ignorance plugin to the main development line + * Added broadcast plugin Version 1.0beta6: 1/19/07 * Extensive changes to the irssi plugin, especially in its text formatting. |
|
From: <gui...@re...> - 2007-02-23 04:29:13
|
Author: jbailey Date: 2007-02-22 22:29:09 -0600 (Thu, 22 Feb 2007) New Revision: 253 Modified: trunk/plugin_pack/configure.ac Log: And the configure.ac bit... This revision's diffstat output: configure.ac | 1 + 1 file changed, 1 insertion(+) Modified: trunk/plugin_pack/configure.ac =================================================================== --- trunk/plugin_pack/configure.ac 2007-02-23 04:26:13 UTC (rev 252) +++ trunk/plugin_pack/configure.ac 2007-02-23 04:29:09 UTC (rev 253) @@ -201,6 +201,7 @@ bash/Makefile bit/Makefile blistops/Makefile + broadcast/Makefile buddytime/Makefile chronic/Makefile dice/Makefile |
|
From: <gui...@re...> - 2007-02-23 04:26:18
|
Author: jbailey
Date: 2007-02-22 22:26:13 -0600 (Thu, 22 Feb 2007)
New Revision: 252
Added:
trunk/plugin_pack/broadcast/
trunk/plugin_pack/broadcast/.abusive
trunk/plugin_pack/broadcast/.plugin
trunk/plugin_pack/broadcast/Makefile.am
trunk/plugin_pack/broadcast/Makefile.mingw
trunk/plugin_pack/broadcast/broadcast.c
Log:
Adding a new abusive plugin. Don't know if it builds and right now
couldn't possibly care less. The configure.ac bit is intentionally
missing for now.
This revision's diffstat output:
Makefile.am | 29 ++++++++
Makefile.mingw | 11 +++
broadcast.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 230 insertions(+)
Added: trunk/plugin_pack/broadcast/.abusive
===================================================================
Added: trunk/plugin_pack/broadcast/.plugin
===================================================================
Added: trunk/plugin_pack/broadcast/Makefile.am
===================================================================
--- trunk/plugin_pack/broadcast/Makefile.am (rev 0)
+++ trunk/plugin_pack/broadcast/Makefile.am 2007-02-23 04:26:13 UTC (rev 252)
@@ -0,0 +1,29 @@
+EXTRA_DIST = \
+ .plugin \
+ .abusive \
+ Makefile.mingw
+
+broadcastdir = $(GAIM_LIBDIR)/gaim
+
+broadcast_la_LDFLAGS = -module -avoid-version
+
+if PLUGINS
+
+broadcast_LTLIBRARIES = broadcast.la
+
+broadcast_la_SOURCES = \
+ broadcast.c
+
+broadcast_la_LIBADD = \
+ $(GLIB_LIBS) \
+ $(GAIM_LIBS)
+
+endif
+
+AM_CPPFLAGS = \
+ -DLIBDIR=\"$(GAIM_LIBDIR)/gaim/\" \
+ -DDATADIR=\"$(GAIM_DATADIR)\" \
+ -DLOCALEDIR=\"$(GAIM_DATADIR)/locale\" \
+ $(DEBUG_CFLAGS) \
+ $(GAIM_CFLAGS)
+
Added: trunk/plugin_pack/broadcast/Makefile.mingw
===================================================================
--- trunk/plugin_pack/broadcast/Makefile.mingw (rev 0)
+++ trunk/plugin_pack/broadcast/Makefile.mingw 2007-02-23 04:26:13 UTC (rev 252)
@@ -0,0 +1,11 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for broadcast plugin.
+#
+
+GPP_TOP := ..
+
+GPP = broadcast
+
+include $(GPP_TOP)/win_gpp.mak
Added: trunk/plugin_pack/broadcast/broadcast.c
===================================================================
--- trunk/plugin_pack/broadcast/broadcast.c (rev 0)
+++ trunk/plugin_pack/broadcast/broadcast.c 2007-02-23 04:26:13 UTC (rev 252)
@@ -0,0 +1,190 @@
+/*
+ * Broadcast - Send an IM to your entire buddy list
+ * Copyright (C) 2007 John Bailey <rek...@re...>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "../gpp_config.h"
+#endif /* HAVE_CONFIG_H */
+
+#define GAIM_PLUGINS
+
+#include <blist.h>
+#include <debug.h>
+#include <request.h>
+#include <util.h>
+#include <version.h>
+
+#include "../common/i18n.h"
+
+#define BROADCAST_CATEGORY "plugin pack: broadcast"
+
+/* These two functions directly ripped from groupmsg and renamed (shamelessly,
+ * I should add). */
+static void
+broadcast_request_cancel_cb(GList *list, const char *text)
+{
+ g_list_free(list);
+}
+
+static void
+broadcast_request_send_cb(GList *list, const char *message)
+{
+ char *stripped;
+ GList *l;
+ GaimBuddy *b;
+ GaimConversation *conv = NULL;
+
+ gaim_markup_html_to_xhtml(message, NULL, &stripped);
+
+ for (l = list; l; l = l->next) {
+ b = l->data;
+ conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, b->account, b->name);
+ if(conv) {
+ if (b->account->gc->flags & GAIM_CONNECTION_HTML)
+ gaim_conv_im_send(GAIM_CONV_IM(conv), message);
+ else
+ gaim_conv_im_send(GAIM_CONV_IM(conv), stripped);
+ }
+ }
+
+ g_free(stripped);
+ g_list_free(list);
+}
+
+static void
+broadcast_action_cb(GaimPluginAction *action)
+{
+ GList *buddies = NULL, *ltmp = NULL;
+ GString stmp = NULL;
+ const gchar *bname = NULL, *balias = NULL;
+ GaimBlistNode *root = NULL, *g = NULL, *c = NULL;
+ GaimBuddy *b = NULL;
+ GaimBuddyList *blist = NULL;
+
+ blist = gaim_get_blist();
+ root = blist->root;
+
+ for(g = root; g && GAIM_BLIST_NODE_IS_GROUP(g); g = g->next) {
+ for (c = g->child; c; c = c->next) {
+ if(!GAIM_BLIST_NODE_IS_CHAT(c)) {
+ buddies = g_list_append(buddies,
+ gaim_contact_get_priority_buddy((GaimContact *)c));
+
+ gaim_debug_info(BROADCAST_CATEGORY, "added a buddy to queue\n");
+ }
+ }
+ }
+
+ if(buddies == NULL) {
+ gaim_debug_error(BROADCAST_CATEGORY, "no buddies in queue!\n");
+
+ return;
+ }
+
+ if(g_list_length(buddies) > 6) { /* arbitrary number that I like */
+ stmp = g_string_new(_("Your message will be sent to and possibly annoy"
+ " EVERYONE on your buddy list!"));
+
+ gaim_debug_info(BROADCAST_CATEGORY,
+ "too many buddies on list; showing generic message!\n");
+ } else {
+ stmp = g_string_new("Your message will be sent to these buddies:\n");
+
+ for(ltmp = buddies; ltmp; ltmp = ltmp->next) {
+ b = (GaimBuddy *)(ltmp->data);
+ bname = gaim_buddy_get_alias(b);
+ balias = gaim_buddy_get_alias(b);
+
+ stmp = g_string_append_printf(stmp, " %s (%s)\n", balias, bname);
+
+ gaim_debug_info(BROADCAST_CATEGORY, "added %s (%s) to dialog string\n",
+ balias, bname);
+ }
+ }
+
+ gaim_debug_info(BROADCAST_CATEGORY, "requesting message input\n");
+
+ gaim_request_input(action, _("Broadcast Spim"),
+ _("Enter the message to send"), stmp->str, "", TRUE, FALSE, "html",
+ _("Send"), G_CALLBACK(broadcast_request_send_cb), _("Cancel"),
+ G_CALLBACK(broadcast_request_cancel_cb), buddies);
+
+ g_string_free(stmp, TRUE);
+
+ return;
+}
+
+static GList *
+broadcast_actions(GaimPlugin *plugin, gpointer context)
+{
+ gaim_debug_info(BROADCAST_CATEGORY, "creating the action list\n");
+
+ return g_list_append(NULL, gaim_plugin_action_new(_("Broadcast a Message"),
+ broadcast_action_cb));
+}
+
+static gboolean
+broadcast_load(GaimPlugin *plugin)
+{
+ gaim_debug_misc(BROADCAST_CATEGORY, "broadcast_load called\n");
+
+ return TRUE;
+}
+
+static GaimPluginInfo broadcast_info =
+{
+ GAIM_PLUGIN_MAGIC,
+ GAIM_MAJOR_VERSION,
+ GAIM_MINOR_VERSION,
+ GAIM_PLUGIN_STANDARD,
+ NULL,
+ 0,
+ NULL,
+ GAIM_PRIORITY_DEFAULT,
+ "core-plugin_pack-broadcast",
+ NULL,
+ GPP_VERSION,
+ NULL,
+ NULL,
+ "John Bailey <rek...@re...>",
+ GPP_WEBSITE,
+ broadcast_load,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ broadcast_actions
+};
+
+
+static void
+broadcast_init(GaimPlugin *plugin) {
+#ifdef ENABLE_NLS
+ bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+#endif /* ENABLE_NLS */
+
+ broadcast_info.name = _("Broadcaster");
+ broadcast_info.summary = _("Send an IM to everyone on your buddy list.");
+ broadcast_info.description = _("Adds the ability to send an IM to every "
+ "Gaim Contact on your Buddy List");
+}
+
+GAIM_INIT_PLUGIN(broadcast, broadcast_init, broadcast_info)
+
|
|
From: <gui...@re...> - 2007-02-21 16:04:51
|
Author: jbailey Date: 2007-02-21 10:04:43 -0600 (Wed, 21 Feb 2007) New Revision: 251 Added: trunk/plugin_pack/ignorance/ Modified: trunk/plugin_pack/configure.ac Log: Adding ignorance to the main line here. I can always disable it from building by default if I need to. This revision's diffstat output: configure.ac | 1 + 1 file changed, 1 insertion(+) Modified: trunk/plugin_pack/configure.ac =================================================================== --- trunk/plugin_pack/configure.ac 2007-02-21 15:57:28 UTC (rev 250) +++ trunk/plugin_pack/configure.ac 2007-02-21 16:04:43 UTC (rev 251) @@ -210,6 +210,7 @@ gaim-schedule/Makefile groupmsg/Makefile gRIM/Makefile + ignorance/Makefile irssi/Makefile lastseen/Makefile listhandler/Makefile Copied: trunk/plugin_pack/ignorance (from rev 233, branches/ignorance_pluginpack/ignorance) |
|
From: <gui...@re...> - 2007-02-21 15:57:28
|
Author: jbailey
Date: 2007-02-21 09:57:28 -0600 (Wed, 21 Feb 2007)
New Revision: 250
Modified:
trunk/plugin_pack/listhandler/migrate.c
Log:
Fixing a warning on strict ANSI C compilers
This revision's diffstat output:
migrate.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
Modified: trunk/plugin_pack/listhandler/migrate.c
===================================================================
--- trunk/plugin_pack/listhandler/migrate.c 2007-02-11 18:23:15 UTC (rev 249)
+++ trunk/plugin_pack/listhandler/migrate.c 2007-02-21 15:57:28 UTC (rev 250)
@@ -48,9 +48,12 @@
static void
lh_migrate_build_lists(void)
{
- GaimBuddyList *blist = gaim_get_blist();
- GaimBlistNode *root = blist->root, *g = NULL, *c = NULL, *b = NULL;
+ GaimBuddyList *blist = NULL;
+ GaimBlistNode *root = NULL, *g = NULL, *c = NULL, *b = NULL;
+ blist = gaim_get_blist();
+ root = blist->root;
+
/* walk the blist tree and build a list of the buddies and a list of
* the groups corresponding to each buddy */
/* group level */
@@ -58,7 +61,7 @@
/* contact level */
for(c = g->child; c && GAIM_BLIST_NODE_IS_CONTACT(c); c = c->next)
/* buddy level */
- for(b = c->child; b && GAIM_BLIST_NODE_IS_BUDDY(b); b = b-> next) {
+ for(b = c->child; b && GAIM_BLIST_NODE_IS_BUDDY(b); b = b->next) {
GaimGroup *tmp_group = gaim_group_new(((GaimGroup *)g)->name);
GaimBuddy *tmp_buddy = (GaimBuddy *)b;
|
|
From: <gui...@re...> - 2007-02-17 00:43:21
|
Author: jbailey
Date: 2007-02-16 18:43:21 -0600 (Fri, 16 Feb 2007)
New Revision: 1754
Modified:
trunk/extras/trac/plugininfo/PluginInfo.py
Log:
Bad spaces! Bad!
This revision's diffstat output:
PluginInfo.py | 1 +
1 file changed, 1 insertion(+)
Modified: trunk/extras/trac/plugininfo/PluginInfo.py
===================================================================
--- trunk/extras/trac/plugininfo/PluginInfo.py 2007-02-17 00:14:44 UTC (rev 1753)
+++ trunk/extras/trac/plugininfo/PluginInfo.py 2007-02-17 00:43:21 UTC (rev 1754)
@@ -10,6 +10,7 @@
depends = args[4]
authors = authors.replace('&', ', ')
+ dirname = dirname.replace(' ', '')
platforms = platforms.replace('&', ', ')
depends = depends.replace('&', ', ')
|
|
From: <gui...@re...> - 2007-02-17 00:14:45
|
Author: jbailey
Date: 2007-02-16 18:14:44 -0600 (Fri, 16 Feb 2007)
New Revision: 1753
Modified:
trunk/extras/trac/plugininfo/PluginInfo.py
Log:
Provide a link to the source for the plugin using trac's source browser.
This revision's diffstat output:
PluginInfo.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Modified: trunk/extras/trac/plugininfo/PluginInfo.py
===================================================================
--- trunk/extras/trac/plugininfo/PluginInfo.py 2007-02-04 04:45:14 UTC (rev 1752)
+++ trunk/extras/trac/plugininfo/PluginInfo.py 2007-02-17 00:14:44 UTC (rev 1753)
@@ -17,7 +17,9 @@
buff.write("<table class=\"wiki\">")
buff.write("<tr><td><b>Author(s)</b></td><td>" + authors + "</td></tr>")
buff.write("<tr><td><b>First Released</b></td><td>" + release + "</td></tr>")
- buff.write("<tr><td><b>Directory</b></td><td>" + dirname + "</td></tr>")
+ buff.write("<tr><td><b>Directory</b></td><td>" + dirname +
+ " (<a href=\"/trac/browser/trunk/plugin_pack/" + dirname +
+ "/\">browse source</a>)</td></tr>")
buff.write("<tr><td><b>Platforms</b></td><td>" + platforms + "</td></tr>")
buff.write("<tr><td><b>Dependencies</b></td><td>" + depends + "</td></tr>")
buff.write("</table>")
|
|
From: <gui...@re...> - 2007-02-11 18:23:20
|
Author: grim Date: 2007-02-11 12:23:15 -0600 (Sun, 11 Feb 2007) New Revision: 249 Modified: trunk/gf_theme_howto/output/ trunk/gf_theme_howto/siteupdate.sh Log: updates that I apparently forgot to commit... This revision's diffstat output: siteupdate.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) Property changes on: trunk/gf_theme_howto/output ___________________________________________________________________ Name: svn:ignore - * + *.html images Modified: trunk/gf_theme_howto/siteupdate.sh =================================================================== --- trunk/gf_theme_howto/siteupdate.sh 2007-02-09 23:55:47 UTC (rev 248) +++ trunk/gf_theme_howto/siteupdate.sh 2007-02-11 18:23:15 UTC (rev 249) @@ -11,9 +11,11 @@ # block to your ~/.ssh/config containing your username for sourceforge. Please # make sure you meet these requirements before saying it doesn't work. +HOST=guifications.org + # This is the dir we're copying the docbook to, make sure that these files # (or the directory they're in) are group writable. -SF_DIR="/home/groups/g/gu/guifications/htdocs/Guifications/themes/theme_howto/" +DIR="/var/www/guifications.org/gaim/htdocs/gf_theme_howto/" # This is the directory that the docbook got outputed to OUTPUT=output @@ -21,6 +23,6 @@ # Lets do this now... OLDDIR=`pwd` -cd "$OUTPUT" -tar zcf - * | ssh shell.sf.net "cd $SF_DIR ; tar zxvf - ; chmod -R 664 *.html; chmod -R 644 images/*.png" -cd "$OLDDIR" +pushd ${OUTPUT} +tar zcf - * | ssh ${HOST} "cd ${DIR} && tar zxvf - && chmod -R g+w *" +popd ${OLDDIR} |
|
From: <gui...@re...> - 2007-02-09 23:55:52
|
Author: grim Date: 2007-02-09 17:55:47 -0600 (Fri, 09 Feb 2007) New Revision: 248 Modified: trunk/gf_theme_howto/output/ Log: ignore tweak... This revision's diffstat output: 0 files changed Property changes on: trunk/gf_theme_howto/output ___________________________________________________________________ Name: svn:ignore + * |
|
From: <gui...@re...> - 2007-02-09 23:38:10
|
Author: grim Date: 2007-02-09 17:38:07 -0600 (Fri, 09 Feb 2007) New Revision: 247 Added: trunk/gf_theme_howto/ trunk/gf_theme_howto/.cvsignore trunk/gf_theme_howto/Makefile trunk/gf_theme_howto/Makefile.opts trunk/gf_theme_howto/gf_theme_howto.xml trunk/gf_theme_howto/images/ trunk/gf_theme_howto/images/Makefile trunk/gf_theme_howto/images/item_delete.png trunk/gf_theme_howto/images/item_icon_page.png trunk/gf_theme_howto/images/item_image_page.png trunk/gf_theme_howto/images/item_new.png trunk/gf_theme_howto/images/item_text_page.png trunk/gf_theme_howto/images/notification_new.png trunk/gf_theme_howto/images/notification_page.png trunk/gf_theme_howto/images/theme_editor.png trunk/gf_theme_howto/images/theme_info.png trunk/gf_theme_howto/images/theme_ops.png trunk/gf_theme_howto/output/ trunk/gf_theme_howto/siteupdate.sh Log: Importing the theme howto since there have been requests for it. I'll put the compiled docbook up at gaim.gf.o/gf_theme_howto This revision's diffstat output: .cvsignore | 1 Makefile | 12 + Makefile.opts | 1 gf_theme_howto.xml | 505 +++++++++++++++++++++++++++++++++++++++++++++++++++++ images/Makefile | 20 ++ siteupdate.sh | 26 ++ 6 files changed, 565 insertions(+) Added: trunk/gf_theme_howto/.cvsignore =================================================================== --- trunk/gf_theme_howto/.cvsignore (rev 0) +++ trunk/gf_theme_howto/.cvsignore 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1 @@ +output Added: trunk/gf_theme_howto/Makefile =================================================================== --- trunk/gf_theme_howto/Makefile (rev 0) +++ trunk/gf_theme_howto/Makefile 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1,12 @@ +SOURCE=gf_theme_howto.xml + +include Makefile.opts + +all: + $(MAKE) -C images + docbook2html -o $(OUTPUT) $(SOURCE) + +clean: + $(MAKE) -C images clean + rm -rf $(OUTPUT) + Property changes on: trunk/gf_theme_howto/Makefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/gf_theme_howto/Makefile.opts =================================================================== --- trunk/gf_theme_howto/Makefile.opts (rev 0) +++ trunk/gf_theme_howto/Makefile.opts 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1 @@ +OUTPUT=output Added: trunk/gf_theme_howto/gf_theme_howto.xml =================================================================== --- trunk/gf_theme_howto/gf_theme_howto.xml (rev 0) +++ trunk/gf_theme_howto/gf_theme_howto.xml 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1,505 @@ +<?xml version="1.0"?> +<!DOCTYPE article PUBLIC "-//OASIS/DTD DocBook XML V4.1.2//EN" + "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> + +<article id="index"> + <articleinfo> + <title>Guifications Theme Howto</title> + <releaseinfo>0.1</releaseinfo> + <date>8 May 2005</date> + <authorgroup> + <author> + <firstname>Gary</firstname> + <surname>Kramlich</surname> + <affiliation> + <address> + <email>gr...@re...</email> + </address> + </affiliation> + </author> + </authorgroup> + <revhistory> + <revision> + <revnumber>1.0</revnumber> + <date>8 May 2005</date> + <authorinitials>gk</authorinitials> + <revremark>Initial version</revremark> + </revision> + </revhistory> + </articleinfo> + + <sect1 id="intro"> + <title>Introduction</title> + + <para> + This guide was written to help new theme authors get a good start + on understanding the capabilities of the theme editor. + Unfortunately it is not very intuitive, but I hope to make it a bit + easier to work with as time goes on. + </para> + + <para> + This guide is not meant to be comprehensive, it's focus is on the + use of the Guifications theme editor and nothing more. + </para> + </sect1> + + <sect1 id="theme-editor"> + <title>The Theme Editor</title> + + <figure> + <title>The Theme Editor</title> + <graphic fileref="images/theme_editor.png" /> + </figure> + + <para> + This is the theme editor, the user interface is pretty clunky, but + it is slowly getting better over time. + </para> + + <para> + Across the top, there is a menu bar where you can add and remove + items and notifications. On the left is the actual tree that makes + up the theme. It starts with the theme itself, which contains + information, options and notifications, while notification contain + items. If that didn't sit well with you, don't worry it will all + become clear throughout the rest of this howto. On the right you + will be doing the majority of your editing. This area is used to + update probably more settings than you'd expect. + </para> + + <table> + <title>Toolbar</title> + + <tgroup cols="2"> + <tbody valign="top"> + <row> + <entry>New Theme</entry> + <entry>Creates a new theme.</entry> + </row> + <row> + <entry>Save Theme</entry> + <entry>Saves the current theme.</entry> + </row> + <row> + <entry>New Notification</entry> + <entry>Creates a new notification.</entry> + </row> + <row> + <entry>New Item</entry> + <entry>Creates a new item.</entry> + </row> + <row> + <entry>Duplicate</entry> + <entry> + Creates a duplicate of a notification or an item. + </entry> + </row> + <row> + <entry>Delete</entry> + <entry>Deletes a notification or an item.</entry> + </row> + <row> + <entry>Move Up</entry> + <entry> + Moves a notification or an item up in the list. + While the order of notifications has no impact on + how Guifications treats the theme, it can be handy + to move them around. + + Items however, are drawn in the order that they are + in the theme. So, if you wanted to create a layer + effect, or add drop shadows, you can do that by + making sure your shadow is above the actual item + that it is a shadow for. + </entry> + </row> + <row> + <entry>Move Down</entry> + <entry> + Moves a notification or an item down in the list. + </entry> + </row> + <row> + <entry>Help</entry> + <entry>Brings you to this tutorial.</entry> + </row> + </tbody> + </tgroup> + </table> + </sect1> + + <sect1 id="page-theme-info"> + <title>Editing Theme Information</title> + + <figure> + <title>Theme Information Page</title> + <graphic fileref="images/theme_info.png" /> + </figure> + + <para> + This is the theme information page. Here you can set some basic + information about your theme. These fields should be + self-explanatory, so they will not be discused further. + </para> + <para> + NOTE: Theme names MUST be unique to not only avoid confusion in the + theme list, but they are used to create the directory for new + themes. + </para> + </sect1> + + <sect1 id="page-theme-options"> + <title>Editing Theme Options</title> + + <figure> + <title>Theme Options Page</title> + <graphic fileref="images/theme_ops.png" /> + </figure> + + <para> + The time and date formats follow the strftime format. A simple + google search for 'strftime' or a 'man 3 strftime' on Unix should + be able to help you there. + </para> + + <para> + Warning is the text to display if a text item contains a %w and the + protocol for the notification does not support warning levels. + This would be any protocols besides AIM or ICQ. + </para> + + <para> + Ellipsis is the text to use when clipping text. If your clipping + format for text items is set to truncate this option has no effect. + </para> + </sect1> + + <sect1 id="window-notification-new"> + <title>Creating Notifications</title> + + <figure> + <title>New Notification Window</title> + <graphic fileref="images/notification_new.png" /> + </figure> + + <para> + When you click on the new notification button in the toolbar, you + will be presented with this window. It contains a dropdown of all + of the currently available notifications, as well as a master + notification. + </para> + + <para> + A master notification is used as a template for any notifications + created after it. When you create a new theme, a master + notification will automatically be created for you. If you know + your theme is going to look basically the same for all + notifications, you can create a master notification that already + has a background image set, contains some text, and any other + items you want. + </para> + + <para> + You can add as many notifications of as many types as you want. + When an event happens, Guifications looks at all the loaded themes, + checks how notifications of that type that they have, and chooses + one at random to display. This gives another level to + customization, since you do not have to create another theme if you + want to make the same notifications have subtle differences. + </para> + </sect1> + + <sect1 id="page-notification"> + <title>Editing Notifications</title> + + <figure> + <title>The Notification Page</title> + <graphic fileref="images/notification_page.png" /> + </figure> + + <para> + In the notification page, you will create the basic look of your + notification. You can have it fit in with your gtk theme by + checking the 'Use Gtk theme background' or you can choose to use + an image. Guifications supports 1-bit alpha which you can use to + create non-rectangular notifications. + </para> + + <para> + If you choose to use the Gtk theme's background, you can decide how + big you want the notification. If you decide that you want to use + an image as the background, the notification size will be set to + the size of the image. If the image is non-rectangular, it will + still use the resolution of the image. + </para> + + <para> + The alias entry has been added for those of you that would like to + support multiple notifications of the same type in a theme. By + using aliases, you can tell at a glance which notification is + which. Hopefully this will prove to be useful for someone besides + me. :) + </para> + </sect1> + + <sect1 id="window-item-new"> + <title>Creating Items</title> + + <figure> + <title>New Item Window</title> + <graphic fileref="images/item_new.png" /> + </figure> + + <para> + Similar to the new notification window, the new item window + presents you with a list of all the currently available items. + Notifications can contain as many items as many times as they want. + You can use this, with the order they are in to have text overlay + icons and images, or to add drop shadows, or anything else you can + think of. + </para> + </sect1> + + <sect1 id="page-item-icon"> + <title>Editing Icons</title> + + <figure> + <title>Icon Page</title> + <graphic fileref="images/item_icon_page.png" /> + </figure> + + <para> + All items have three common attributes. These are position, + horizontal offset, and vertical offset. Guifications does not + place items like most people are used to. You select a general + position of where the item will be placed (Top Left, Center, + Bottom Right, etc) and then place it exactly where you want it by + using the horizontal and vertical offsets. As you can see in the + screen shot, the offsets can also be used as percentages. All + items use the notification's height and width to calculate the + values of the percentages. + </para> + + <para> + Icons have two unique attributes. These are type and size. The + type is what type of icon to show, which includes protocol, status, + and buddy icon. Size is the size to scale the icon too. You can + choose from some previously defined values between 16x16 all the + way to 144x144. + </para> + </sect1> + + <sect1 id="page-item-image"> + <title>Editing Images</title> + + <figure> + <title>Image Page</title> + <graphic fileref="images/item_image_page.png" /> + </figure> + + <para> + Images have one unique attribute which is the image to display. + Guifications supports any image format that Gtk supports, which + gives you quite a range to choose from. However, if you are + planning on distrubuting your theme, then you'll probably want to + stick to the formats that Gtk supports internally. + </para> + </sect1> + + <sect1 id="page-item-text"> + <title>Editing Text</title> + + <figure> + <title>Text Page</title> + <graphic fileref="images/item_text_page.png" /> + </figure> + + <para> + Text has five atrributes that you can modify. The first is the + format string to use (See the table below for specifics). Width + allows you to set a maximum width for the text. If the width is + zero or greater than the width of the notification it will + automatically be set to the width of the notification minus the + position of the text. Clipping allows you to decide what happens + when all of the text will not fit. You have four options for when + this occurs. You can either truncate the text, or put an ellipsis + at the beginning, middle, or end. The text that is used for the + ellipsis can be modified within the theme options page. Lastly, + there is font and color, which modify the text's font and color + respectively. + </para> + + <table> + <title>Format Tokens</title> + + <tgroup cols="2"> + <tbody valign="top"> + <row> + <entry>%</entry> + <entry>A literal '%'</entry> + </row> + <row> + <entry>a</entry> + <entry>Account name</entry> + </row> + <row> + <entry>C</entry> + <entry>The conversation title</entry> + </row> + <row> + <entry>c</entry> + <entry>The conversation name</entry> + </row> + <row> + <entry>D</entry> + <entry>Date formatted using the theme option</entry> + </row> + <row> + <entry>d</entry> + <entry>The day of the month</entry> + </row> + <row> + <entry>F</entry> + <entry>E-Mail From (only used for email notifications)</entry> + </row> + <row> + <entry>H</entry> + <entry>Hour (0-23)</entry> + </row> + <row> + <entry>h</entry> + <entry>Hour (0-12)</entry> + </row> + <row> + <entry>i</entry> + <entry>Your public IP address</entry> + </row> + <row> + <entry>M</entry> + <entry>Month (1-12)</entry> + </row> + <row> + <entry>m</entry> + <entry>Minute (0-59)</entry> + </row> + <row> + <entry>N</entry> + <entry>Computer name</entry> + </row> + <row> + <entry>n</entry> + <entry>Buddy's name (following preferences for aliases)</entry> + </row> + <row> + <entry>p</entry> + <entry>Protocol ID</entry> + </row> + <row> + <entry>r</entry> + <entry>Received message</entry> + </row> + <row> + <entry>S</entry> + <entry>E-Mail Subject (only used for E-Mail notifications</entry> + </row> + <row> + <entry>s</entry> + <entry>Seconds (0-59)</entry> + </row> + <row> + <entry>T</entry> + <entry>Time formatted using the theme option</entry> + </row> + <row> + <entry>t</entry> + <entry>Seconds since the epoc</entry> + </row> + <row> + <entry>U</entry> + <entry>E-Mail to (only used for email notifications)</entry> + </row> + <row> + <entry>u</entry> + <entry>Computer username</entry> + </row> + <row> + <entry>W</entry> + <entry>The name of who warned you (Does this even work?)</entry> + </row> + <row> + <entry>w</entry> + <entry>Your warning level or the theme option</entry> + </row> + <row> + <entry>X</entry> + <entry>Extra info (needs clarification)</entry> + </row> + <row> + <entry>Y</entry> + <entry>Year with century</entry> + </row> + <row> + <entry>y</entry> + <entry>Year without century</entry> + </row> + </tbody> + </tgroup> + </table> + </sect1> + + <sect1 id="window-delete"> + <title>Deleting Items and Notifications</title> + + <figure> + <title>Delete Window</title> + <graphic fileref="images/item_delete.png" /> + </figure> + + <para> + When you click the delete button in the toolbar when an item or a + notification is selected you will be presented with this dialog. + This is your last chance to keep your item or notification, since + currently there is no undo functionality. If you delete an item or + a notification, there is no way to restore it, except by manually + recreating it. + </para> + </sect1> + + <sect1 id="saving"> + <title>Saving</title> + + <para> + Once you have populated your theme with a fair ammount of + notifications and items, hit the save button in the toolbar. + Guifications will notice when this happens and update the theme + list in preferences if you have it open. From the themes list you + can load your theme, and see it in action! + </para> + </sect1> + + <sect1 id="Summary"> + <title>Summary</title> + + <para> + Guifications has always been about user customization, and with the + introduction of themes in 2.x it has been taken to a new level. I + love seeing people submitting new themes as well. You can always + submit your themes to the + <ulink url="http://sf.net/tracker/?atid=676821&group_id=92888&func=browse">theme tracker</ulink> + on <ulink url="http://sf.net">sourceforge.net</ulink>. + </para> + + <para> + If you have any questions or comments, please don't be afraid to + ask. You can always find us in #guifications on irc.freenode.net, + or by sending an email to + <ulink url="mailto:gui...@li...">gui...@li...</ulink>. + </para> + + <para> + I hope this tutorial has been helpful, and as always, thank you for + using Guifications. + </para> + </sect1> +</article> Property changes on: trunk/gf_theme_howto/gf_theme_howto.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Added: trunk/gf_theme_howto/images/Makefile =================================================================== --- trunk/gf_theme_howto/images/Makefile (rev 0) +++ trunk/gf_theme_howto/images/Makefile 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1,20 @@ +IMAGES=\ + item_delete.png \ + item_icon_page.png \ + item_image_page.png \ + item_new.png \ + item_text_page.png \ + notification_new.png \ + notification_page.png \ + theme_editor.png \ + theme_info.png \ + theme_ops.png + +include ../Makefile.opts + +all: $(IMAGES) + mkdir -p ../$(OUTPUT)/images + cp $(IMAGES) ../$(OUTPUT)/images + +clean: + Property changes on: trunk/gf_theme_howto/images/Makefile ___________________________________________________________________ Name: svn:eol-style + native Added: trunk/gf_theme_howto/images/item_delete.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/item_delete.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/item_icon_page.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/item_icon_page.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/item_image_page.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/item_image_page.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/item_new.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/item_new.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/item_text_page.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/item_text_page.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/notification_new.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/notification_new.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/notification_page.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/notification_page.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/theme_editor.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/theme_editor.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/theme_info.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/theme_info.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/images/theme_ops.png =================================================================== (Binary files differ) Property changes on: trunk/gf_theme_howto/images/theme_ops.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/gf_theme_howto/siteupdate.sh =================================================================== --- trunk/gf_theme_howto/siteupdate.sh (rev 0) +++ trunk/gf_theme_howto/siteupdate.sh 2007-02-09 23:38:07 UTC (rev 247) @@ -0,0 +1,26 @@ +#!/bin/sh + +# guifications i18n stats update utility. +# (C) 2005 The Guifications Team +# +# Author(s): +# Gary Kramlich + +# This script assumes one of two things. One being that your sourceforge name +# is the same username as your shell username, or that you have added a host +# block to your ~/.ssh/config containing your username for sourceforge. Please +# make sure you meet these requirements before saying it doesn't work. + +# This is the dir we're copying the docbook to, make sure that these files +# (or the directory they're in) are group writable. +SF_DIR="/home/groups/g/gu/guifications/htdocs/Guifications/themes/theme_howto/" + +# This is the directory that the docbook got outputed to +OUTPUT=output + +# Lets do this now... + +OLDDIR=`pwd` +cd "$OUTPUT" +tar zcf - * | ssh shell.sf.net "cd $SF_DIR ; tar zxvf - ; chmod -R 664 *.html; chmod -R 644 images/*.png" +cd "$OLDDIR" Property changes on: trunk/gf_theme_howto/siteupdate.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:eol-style + native |
|
From: <gui...@re...> - 2007-02-07 13:59:10
|
Author: sadrul Date: 2007-02-07 07:58:56 -0600 (Wed, 07 Feb 2007) New Revision: 246 Added: trunk/plugin_pack/switchspell/.build Modified: trunk/plugin_pack/configure.ac trunk/plugin_pack/switchspell/Makefile.am trunk/plugin_pack/switchspell/switchspell.c Log: Add a check for gtkspell in configure. If it's there, build switchspell. This revision's diffstat output: configure.ac | 10 ++++++++++ switchspell/Makefile.am | 9 ++++++--- switchspell/switchspell.c | 3 ++- 3 files changed, 18 insertions(+), 4 deletions(-) Modified: trunk/plugin_pack/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/configure.ac 2007-02-06 05:45:27 UTC (rev 245) +++ trunk/plugin_pack/configure.ac 2007-02-07 13:58:56 UTC (rev 246) @@ -103,6 +103,8 @@ dnl ####################################################################= ### dnl # Plugin dependency checking dnl ####################################################################= ### + +# talkfilters AC_CHECK_HEADER(talkfilters.h, HAVE_TALKFILTERS=3Dyes, AC_MSG_WARN([ *** GNU Talk Filters is required to build the talkfilters plugin; *** please make sure you have the GNU Talk Filters development headers i= nstalled. @@ -117,6 +119,14 @@ AC_SUBST(TALKFILTERS_LIBS) fi =20 +# switchspell +gtkspell=3Dyes +PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >=3D 2.0.2, , [gtkspell=3Dno]) +AC_SUBST(GTKSPELL_CFLAGS) +AC_SUBST(GTKSPELL_LIBS) +AM_CONDITIONAL(HAVE_GTKSPELL, test x"$gtkspell" =3D x"yes") + +# xmmsremote XMMS_LIBS=3D"" XMMS_CFLAGS=3D"" HAVE_XMMS=3D"no" Added: trunk/plugin_pack/switchspell/.build =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Modified: trunk/plugin_pack/switchspell/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/switchspell/Makefile.am 2007-02-06 05:45:27 UTC (re= v 245) +++ trunk/plugin_pack/switchspell/Makefile.am 2007-02-07 13:58:56 UTC (re= v 246) @@ -1,9 +1,10 @@ EXTRA_DIST =3D .plugin Makefile.mingw .build =20 +if HAVE_GTKSPELL switchspelldir =3D $(GAIM_LIBDIR)/gaim =20 switchspell_la_LDFLAGS =3D -module -avoid-version \ - `pkg-config --libs gtkspell-2.0` + $(GTKSPELL_LIBS) =20 if PLUGINS =20 @@ -16,7 +17,7 @@ $(GAIM_LIBS) \ $(GTK_LIBS) =20 -endif +endif # PLUGINS =20 AM_CPPFLAGS =3D \ -DLIBDIR=3D\"$(GAIM_LIBDIR)/gaim/\" \ @@ -25,4 +26,6 @@ $(GTK_CFLAGS) \ $(DEBUG_CFLAGS) \ $(GAIM_CFLAGS) \ - `pkg-config --cflags gtkspell-2.0` + $(GTKSPELL_CFLAGS) + +endif # HAVE_GTKSPELL Modified: trunk/plugin_pack/switchspell/switchspell.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/switchspell/switchspell.c 2007-02-06 05:45:27 UTC (= rev 245) +++ trunk/plugin_pack/switchspell/switchspell.c 2007-02-07 13:58:56 UTC (= rev 246) @@ -42,6 +42,7 @@ #include <debug.h> =20 #include <gtkconv.h> +#include <gtkplugin.h> =20 /* Pack/Local headers */ #include "../common/i18n.h" @@ -71,7 +72,7 @@ gtkconv =3D GAIM_GTK_CONVERSATION(conv); spell =3D gtkspell_get_from_text_view(GTK_TEXT_VIEW(gtkconv->entry)); if (spell !=3D NULL) - gtkspell_set_language(spell, lang, &error); + gtkspell_set_language(spell, lang, &error); /* XXX: error can possibl= y leak here */ g_object_set_data(G_OBJECT(gtkconv->entry), PROP_LANG, lang); } =20 |
|
From: <gui...@re...> - 2007-02-06 05:45:33
|
Author: jbailey
Date: 2007-02-05 23:45:27 -0600 (Mon, 05 Feb 2007)
New Revision: 245
Modified:
trunk/plugin_pack/groupmsg/Makefile.mingw
Log:
Submission from Lee Roach to fix building groupmsg on Win32 platforms.
This revision's diffstat output:
Makefile.mingw | 118 --------------------------------------------------=
-------
1 file changed, 2 insertions(+), 116 deletions(-)
Modified: trunk/plugin_pack/groupmsg/Makefile.mingw
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/plugin_pack/groupmsg/Makefile.mingw 2007-02-04 05:18:29 UTC (re=
v 244)
+++ trunk/plugin_pack/groupmsg/Makefile.mingw 2007-02-06 05:45:27 UTC (re=
v 245)
@@ -4,122 +4,8 @@
# Description: Makefile for groupmsg plugin.
#
=20
-#
-# PATHS
-#
+GPP_TOP :=3D ..
=20
-GPP_TOP :=3D ../
-GTK_TOP :=3D ../../../../win32-dev/gtk_2_0
-GAIM_TOP :=3D ../../..
-GAIM_INSTALL_DIR :=3D $(GAIM_TOP)/win32-install-dir
-DLL_INSTALL_DIR :=3D $(GAIM_INSTALL_DIR)/plugins
-
-GPP_VERSION :=3D $(shell cat ${GPP_TOP}/VERSION)
-
-##
-## VARIABLE DEFINITIONS
-##
-
GPP =3D groupmsg
=20
-# Compiler Options
-
-CFLAGS =3D=20
-
-DEFINES =3D -DGPP_VERSION=3D\"$(GPP_VERSION)\"
-
-LDFLAGS =3D=20
-
-#-mwindows
-
-##
-## INCLUDE MAKEFILES
-##
-
-include $(GAIM_TOP)/src/win32/global.mak
-
-##
-## INCLUDE PATHS
-##
-
-INCLUDE_PATHS +=3D -I. \
- -I$(GTK_TOP)/include \
- -I$(GTK_TOP)/include/gtk-2.0 \
- -I$(GTK_TOP)/include/glib-2.0 \
- -I$(GTK_TOP)/include/pango-1.0 \
- -I$(GTK_TOP)/include/atk-1.0 \
- -I$(GTK_TOP)/include/freetype2 \
- -I$(GTK_TOP)/lib/glib-2.0/include \
- -I$(GTK_TOP)/lib/gtk-2.0/include \
- -I$(GAIM_TOP)/src \
- -I$(GAIM_TOP)/src/win32 \
- -I$(GAIM_TOP)
-
-
-LIB_PATHS =3D \
- -L$(GTK_TOP)/lib \
- -L$(GAIM_TOP)/src
-
-
-##
-## SOURCES, OBJECTS
-##
-
-GPP_SRC =3D groupmsg.c
-
-
-GPP_OBJ =3D $(GPP_SRC:%.c=3D%.o)
-
-##
-## LIBRARIES
-##
-
-PLUGIN_LIBS =3D \
- -lglib-2.0 \
- -lgmodule-2.0 \
- -lgobject-2.0 \
- -lws2_32 \
- -lintl \
- -lgaim
-
-##
-## RULES
-##
-
-# How to make a C file
-%.o: %.c
- $(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@
-
-##
-## TARGET DEFINITIONS
-##
-
-.PHONY: all clean install
-
-all: $(GPP).dll
-
-install: all
- cp $(GPP).dll $(DLL_INSTALL_DIR)
-
-##
-## BUILD Dependencies
-##
-
-$(GAIM_TOP)/src/gaim.lib:
- $(MAKE) -C $(GAIM_TOP)/src -f Makefile.mingw gaim.lib
-
-##
-## BUILD DLL
-##
-
-$(GPP).dll: $(GPP_OBJ) $(GAIM_TOP)/src/gaim.lib
- $(CC) -shared $(GPP_OBJ) $(LIB_PATHS) $(PLUGIN_LIBS) $(DLL_LD_FLAGS) -o=
$(GPP).dll
-
-
-##
-## CLEAN RULES
-##
-
-clean:
- rm -rf *.o
- rm -rf $(GPP).dll
+include $(GPP_TOP)/win_gpp.mak
|
|
From: <gui...@re...> - 2007-02-04 05:24:33
|
Author: jbailey
Date: 2007-02-03 23:18:29 -0600 (Sat, 03 Feb 2007)
New Revision: 244
Removed:
trunk/guifications2/src/gf_release.c
trunk/guifications2/src/gf_release.h
Modified:
trunk/guifications2/src/Makefile.am
trunk/guifications2/src/Makefile.mingw
trunk/guifications2/src/gf_event.c
trunk/guifications2/src/gf_preferences.c
Log:
(2007-02-03 22:50:53) Me: should we change the url the update notify
in gf2 looks at for 2.13 and later?
(2007-02-03 22:51:07) Gary Kramlich: we need to just remove that
This revision's diffstat output:
Makefile.am | 2=20
Makefile.mingw | 1=20
gf_event.c | 3 -
gf_preferences.c | 6 --
gf_release.c | 114 ------------------------------------------------=
-------
gf_release.h | 28 -------------
6 files changed, 154 deletions(-)
Modified: trunk/guifications2/src/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/Makefile.am 2007-01-27 09:31:49 UTC (rev 243)
+++ trunk/guifications2/src/Makefile.am 2007-02-04 05:18:29 UTC (rev 244)
@@ -15,7 +15,6 @@
gf_menu.h \
gf_notification.h \
gf_preferences.h \
- gf_release.h \
gf_stock.h \
gf_theme.h \
gf_theme_editor.h \
@@ -48,7 +47,6 @@
gf_menu.c \
gf_notification.c \
gf_preferences.c \
- gf_release.c \
gf_stock.c \
gf_theme.c \
gf_theme_editor.c \
Modified: trunk/guifications2/src/Makefile.mingw
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/Makefile.mingw 2007-01-27 09:31:49 UTC (rev 2=
43)
+++ trunk/guifications2/src/Makefile.mingw 2007-02-04 05:18:29 UTC (rev 2=
44)
@@ -77,7 +77,6 @@
gf_menu.c \
gf_notification.c \
gf_preferences.c \
- gf_release.c \
gf_stock.c \
gf_theme.c \
gf_theme_editor.c \
Modified: trunk/guifications2/src/gf_event.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/gf_event.c 2007-01-27 09:31:49 UTC (rev 243)
+++ trunk/guifications2/src/gf_event.c 2007-02-04 05:18:29 UTC (rev 244)
@@ -41,7 +41,6 @@
#include "gf_internal.h"
#include "gf_notification.h"
#include "gf_preferences.h"
-#include "gf_release.h"
=20
struct _GfEvent {
gchar *n_type;
@@ -238,8 +237,6 @@
gf_event_connection_throttle_cb(gpointer data) {
GaimAccount *account =3D (GaimAccount *)data;
=20
- gf_release_check();
-
if(!account)
return FALSE;
=20
Modified: trunk/guifications2/src/gf_preferences.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/gf_preferences.c 2007-01-27 09:31:49 UTC (rev=
243)
+++ trunk/guifications2/src/gf_preferences.c 2007-02-04 05:18:29 UTC (rev=
244)
@@ -1271,12 +1271,6 @@
=20
vbox =3D make_notebook_page(GTK_NOTEBOOK(notebook), _("Advanced"), -1);
=20
- frame =3D gaim_gtk_make_frame(vbox, _("Release Notification"));
-
- gaim_gtk_prefs_checkbox(_("_Check for new releases"),
- GF_PREF_ADVANCED_RELEASE_NOTIFICATION, =20
- frame);
-
frame =3D gaim_gtk_make_frame(vbox, _("Display Options"));
=20
gaim_gtk_prefs_labeled_spin_button(frame, _("Max _Visible Guifications:=
"),
Deleted: trunk/guifications2/src/gf_release.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/gf_release.c 2007-01-27 09:31:49 UTC (rev 243=
)
+++ trunk/guifications2/src/gf_release.c 2007-02-04 05:18:29 UTC (rev 244=
)
@@ -1,114 +0,0 @@
-/*
- * Guifications - The end all, be all, toaster popup plugin
- * Copyright (C) 2003-2005 Gary Kramlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,=
USA.
- */
-#include <glib.h>
-
-#include <debug.h>
-#include <notify.h>
-#include <prefs.h>
-#include <util.h>
-
-#ifdef HAVE_CONFIG_H
-# include "../gf_config.h"
-#endif
-
-#include "gf_internal.h"
-#include "gf_preferences.h"
-#include "gf_release.h"
-
-static void
-gf_release_check_cb(GaimUtilFetchUrlData *url_data, gpointer userdata,
- const gchar *data, size_t len, const gchar *err_msg)
-{
- const gchar *changelog =3D data;
- GString *notification;
- gchar *cur_ver, *formatted;
- gint i =3D 0;
-
- if (!changelog || !len)
- return;
-
- while (changelog[i] && changelog[i] !=3D '\n')
- i++;
-
- cur_ver =3D g_strndup(changelog, i);
- changelog +=3D i;
-
- while (*changelog =3D=3D '\n')
- changelog++;
-
- notification =3D g_string_new("");
- g_string_append_printf(notification,
- _("Guifications %s is available, "
- "you are running version %s."),
- cur_ver,
-#ifdef _WIN32
- GF_VERSION
-#else
- VERSION
-#endif
- );
-
- notification =3D g_string_append(notification, "<hr>");
-
- if (*changelog) {
- formatted =3D gaim_strdup_withhtml(changelog);
- g_string_append_printf(notification, "<b>%s</b><br>%s",
- _("ChangeLog:"), formatted);
- g_free(formatted);
- }
-
- formatted =3D g_strdup_printf(_("You can download version %s from"), cu=
r_ver);
- g_string_append_printf(notification,
- "<hr>%s <a href=3D\"%s\">%s</a>.",
- formatted, GF_WEBSITE, GF_WEBSITE);
- g_free(formatted);
-
- gaim_notify_formatted(NULL, _("New version available"),
- _("There is a new version of Guifications available!"),
- NULL, notification->str, NULL, NULL);
-
- g_string_free(notification, TRUE);
- g_free(cur_ver);
-}
-
-void
-gf_release_check() {
- int last_checked;
- gchar *url;
- time_t t;
-
- if(gaim_prefs_get_bool(GF_PREF_ADVANCED_RELEASE_NOTIFICATION)) {
- last_checked =3D gaim_prefs_get_int(GF_PREF_ADVANCED_RELEASE_LAST_CHEC=
K);
- t =3D time(NULL);
-
- if (t - last_checked > 86400 /* one day */) {
- gaim_debug_info("Guifications", "Checking for a new version\n");
-
- url =3D g_strdup_printf("http://guifications.sourceforge.net/version.=
php?module=3Dguifications&version=3D%s",
-#ifdef _WIN32
- GF_VERSION);
-#else
- VERSION);
-#endif
- gaim_util_fetch_url(url, TRUE, NULL, FALSE, gf_release_check_cb, NULL=
);
- gaim_prefs_set_int(GF_PREF_ADVANCED_RELEASE_LAST_CHECK, t);
- g_free(url);
- }
- }
-}
Deleted: trunk/guifications2/src/gf_release.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/guifications2/src/gf_release.h 2007-01-27 09:31:49 UTC (rev 243=
)
+++ trunk/guifications2/src/gf_release.h 2007-02-04 05:18:29 UTC (rev 244=
)
@@ -1,28 +0,0 @@
-/*
- * Guifications - The end all, be all, toaster popup plugin
- * Copyright (C) 2003-2005 Gary Kramlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,=
USA.
- */
-#ifndef GF_RELEASE_H
-#define GF_RELEASE_H
-
-G_BEGIN_DECLS
-
-void gf_release_check();
-
-G_END_DECLS
-
-#endif /* GF_RELEASE_H */
|
|
From: <gui...@re...> - 2007-02-04 04:45:17
|
Author: jbailey Date: 2007-02-03 22:45:14 -0600 (Sat, 03 Feb 2007) New Revision: 1752 Added: trunk/extras/trac/lastmodified/ trunk/extras/trac/lastmodified/LastModified.py Log: Adding a slightly modified version of the LastModified trac macro here so I can keep track (no pun intended) of any changes made/needed This revision's diffstat output: LastModified.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++++= +++++++ 1 file changed, 102 insertions(+) Added: trunk/extras/trac/lastmodified/LastModified.py =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/extras/trac/lastmodified/LastModified.py = (rev 0) +++ trunk/extras/trac/lastmodified/LastModified.py 2007-02-04 04:45:14 UT= C (rev 1752) @@ -0,0 +1,102 @@ +# Author: Steven N. Severinghaus <sn...@se...> +# Last Modified: 2006-04-14 +# Home: http://trac-hacks.org/wiki/LastModifiedMacro +# +# The LastModified macro is free software; you can redistribute it and/o= r +# modify it under the terms of the GNU General Public License as publish= ed +# by the Free Software Foundation; either version 2 of the License, or (= at +# your option) any later version. +# +# Created for the BFGFF project, http://chimp.acm.uiuc.edu/ +# +# Shows the last modification date of the specified page, or the page th= e +# macro appears in if not specified. An optional argument, delta, can b= e +# given to show the time elapsed since the last modification. The output= is +# placed in span with a title that gives the exact modification date and +# the author of the change. +# +# For example, [[LastModified(CustomMacros)]] produces: +# <span class=3D"last-modified" title=3D"Wed Oct 6 20:34:51 2004 by s= evrnghs">2004-10-06</span> +# +# Alternatively, [[LastModified(CustomMacros,delta)]] produces: +# <span class=3D"last-modified" title=3D"Wed Oct 6 20:34:51 2004 by s= evrnghs">7 weeks</span> +# +# This is a CSS style to apply that will make it about 3.14% slicker: +# span.last-modified { border-bottom: 1px dotted gray; cursor: help; } +# + +import time +import datetime +import re + +def execute(hdf, txt, env): + if not txt: + page_name=3Dhdf.getValue('title', '') + page_name=3Dre.sub(' \(.*$', '', page_name) + page_name=3Dpage_name or 'WikiStart' + mode=3D'normal' + elif txt.find(',')=3D=3D-1: + if txt=3D=3D'delta': + mode=3D'delta' + page_name=3Dhdf.getValue('title', '') + page_name=3Dre.sub(' \(.*$', '', page_name) + page_name=3Dpage_name or 'WikiStart' + else: + page_name=3Dtxt + mode=3D'normal' + else: + args=3Dtxt.split(',',1) + page_name=3Dargs[0] + mode=3Dargs[1] + + db=3Denv.get_db_cnx() + cursor=3Ddb.cursor() + cursor.execute("SELECT author, time FROM wiki WHERE name =3D '%s' " + "ORDER BY version DESC LIMIT 1" % page_name) + row=3Dcursor.fetchone() + author=3Drow[0] + time_int=3Drow[1] + timestamp=3Dtime.localtime(time_int) + + if mode=3D=3D'delta': + now=3Ddatetime.datetime.utcfromtimestamp(time.time()) + last_modified=3Ddatetime.datetime.utcfromtimestamp(time_int) + elapsed=3Dnow-last_modified + if elapsed.days=3D=3D0: + if elapsed.seconds/3600>1.5: + count=3Delapsed.seconds/3600 + unit=3D'hour' + elif elapsed.seconds/60>1.5: + count=3Delapsed.seconds/60 + unit=3D'minute' + else: + count=3Delapsed.seconds + unit=3D'second' + elif elapsed.days/3650>1.5: + count=3Delapsed.days/3650 + unit=3D'decade' + elif elapsed.days/365>1.5: + count=3Delapsed.days/365 + unit=3D'year' + elif elapsed.days/30>1.5: + count=3Delapsed.days/30 + unit=3D'month' + elif elapsed.days/7>1.5: + count=3Delapsed.days/7 + unit=3D'week' + else: + count=3Delapsed.days + unit=3D'day' + output=3D""+repr(count)+" "+unit + if (count !=3D 1 and count !=3D -1): output+=3D"s" + # changes by jbailey (guifications.org and gaim.guifications.org= trac envs) + wrapped_output=3D'<p align=3D"center">Last Modified on ' + time.= asctime(timestamp) + ' by ' \ + + author+ ' (' + output + ' ago)</p>' + else: + output=3Dtime.strftime("%Y-%m-%d", timestamp) + # changes by jbailey (guifications.org and gaim.guifications.org= trac envs) + wrapped_output=3D'<p align=3D"center">Last Modified on ' + \ + time.asctime(timestamp) + ' by ' + author + '</p>' + + return wrapped_output + |
|
From: <gui...@re...> - 2007-02-04 02:23:53
|
Author: jbailey
Date: 2007-02-03 20:23:24 -0600 (Sat, 03 Feb 2007)
New Revision: 1751
Modified:
trunk/extras/trac/plugininfo/PluginInfo.py
Log:
Adding Platforms and Dependencies fields to our Trac PluginInfo
macro. Use & instead of , as a list delimiter for these new
macro parameters.
This revision's diffstat output:
PluginInfo.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Modified: trunk/extras/trac/plugininfo/PluginInfo.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/extras/trac/plugininfo/PluginInfo.py 2007-01-23 01:35:00 UTC (r=
ev 1750)
+++ trunk/extras/trac/plugininfo/PluginInfo.py 2007-02-04 02:23:24 UTC (r=
ev 1751)
@@ -1,19 +1,25 @@
from cStringIO import StringIO
=20
def execute(hdf, txt, env):
- args =3D txt.split(',', 3)
+ args =3D txt.split(',', 5)
=20
authors =3D args[0]
release =3D args[1]
dirname =3D args[2]
+ platforms =3D args[3]
+ depends =3D args[4]
=20
authors =3D authors.replace('&', ', ')
+ platforms =3D platforms.replace('&', ', ')
+ depends =3D depends.replace('&', ', ')
=20
buff =3D StringIO()
buff.write("<table class=3D\"wiki\">")
buff.write("<tr><td><b>Author(s)</b></td><td>" + authors + "</td></tr>"=
)
buff.write("<tr><td><b>First Released</b></td><td>" + release + "</td><=
/tr>")
buff.write("<tr><td><b>Directory</b></td><td>" + dirname + "</td></tr>"=
)
+ buff.write("<tr><td><b>Platforms</b></td><td>" + platforms + "</td></tr=
>")
+ buff.write("<tr><td><b>Dependencies</b></td><td>" + depends + "</td></t=
r>")
buff.write("</table>")
=20
table =3D buff.getvalue()
|
|
From: <gui...@re...> - 2007-01-27 09:31:53
|
Author: sadrul Date: 2007-01-27 03:31:49 -0600 (Sat, 27 Jan 2007) New Revision: 243 Added: trunk/plugin_pack/switchspell/ trunk/plugin_pack/switchspell/.plugin trunk/plugin_pack/switchspell/Makefile.am trunk/plugin_pack/switchspell/Makefile.mingw trunk/plugin_pack/switchspell/switchspell.c Modified: trunk/plugin_pack/configure.ac Log: New plugin switchspell to allow switching spelling-languages at runtime. = It's been converted from gaim path #1023340. A possible feature would be = to allow remembering the switches and restore them for later conversation= s. This revision's diffstat output: configure.ac | 1=20 switchspell/Makefile.am | 28 ++++ switchspell/Makefile.mingw | 12 + switchspell/switchspell.c | 276 ++++++++++++++++++++++++++++++++++++++= +++++++ 4 files changed, 317 insertions(+) Modified: trunk/plugin_pack/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/configure.ac 2007-01-26 01:43:04 UTC (rev 242) +++ trunk/plugin_pack/configure.ac 2007-01-27 09:31:49 UTC (rev 243) @@ -214,6 +214,7 @@ slashexec/Makefile sslinfo/Makefile stocker/Makefile + switchspell/Makefile talkfilters/Makefile xchat-chats/Makefile xmmsremote/Makefile Added: trunk/plugin_pack/switchspell/.plugin =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Added: trunk/plugin_pack/switchspell/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/switchspell/Makefile.am (re= v 0) +++ trunk/plugin_pack/switchspell/Makefile.am 2007-01-27 09:31:49 UTC (re= v 243) @@ -0,0 +1,28 @@ +EXTRA_DIST =3D .plugin Makefile.mingw .build + +switchspelldir =3D $(GAIM_LIBDIR)/gaim + +switchspell_la_LDFLAGS =3D -module -avoid-version \ + `pkg-config --libs gtkspell-2.0` + +if PLUGINS + +switchspell_LTLIBRARIES =3D switchspell.la + +switchspell_la_SOURCES =3D \ + switchspell.c + +switchspell_la_LIBADD =3D \ + $(GAIM_LIBS) \ + $(GTK_LIBS) + +endif + +AM_CPPFLAGS =3D \ + -DLIBDIR=3D\"$(GAIM_LIBDIR)/gaim/\" \ + -DDATADIR=3D\"$(GAIM_DATADIR)\" \ + -DLOCALEDIR=3D\"$(GAIM_DATADIR)/locale\" \ + $(GTK_CFLAGS) \ + $(DEBUG_CFLAGS) \ + $(GAIM_CFLAGS) \ + `pkg-config --cflags gtkspell-2.0` Added: trunk/plugin_pack/switchspell/Makefile.mingw =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/switchspell/Makefile.mingw = (rev 0) +++ trunk/plugin_pack/switchspell/Makefile.mingw 2007-01-27 09:31:49 UTC = (rev 243) @@ -0,0 +1,12 @@ +# +# Makefile.mingw +# +# Description: Makefile for switchspell plugin. +# + +GPP_TOP :=3D .. + +GPP =3D switchspell + +include $(GPP_TOP)/win_gpp.mak + Added: trunk/plugin_pack/switchspell/switchspell.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/switchspell/switchspell.c (= rev 0) +++ trunk/plugin_pack/switchspell/switchspell.c 2007-01-27 09:31:49 UTC (= rev 243) @@ -0,0 +1,276 @@ +/* + * Switchspell - Switch spelling language during run time. + * Copyright (C) 2007 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ +#ifdef HAVE_CONFIG_H +# include "../gpp_config.h" +#endif + +#define GAIM_PLUGINS + +#define PLUGIN_ID "gtk-plugin_pack-switchspell" +#define PLUGIN_NAME "Switch Spell" +#define PLUGIN_STATIC_NAME "Switch Spell" +#define PLUGIN_SUMMARY "Switch Spell Checker Language" +#define PLUGIN_DESCRIPTION "Switch Spell Checker Language" +#define PLUGIN_AUTHOR "Alfredo Raul Pena (arpena)\n" \ + "Sadrul H Chowdhury <sa...@us...= e.net>" + +/* System headers */ +#include <glib.h> + +/* Gaim headers */ +#include <plugin.h> +#include <version.h> + +#include <conversation.h> +#include <debug.h> + +#include <gtkconv.h> + +/* Pack/Local headers */ +#include "../common/i18n.h" + +#include <aspell.h> +#include <gtkspell/gtkspell.h> +#include <string.h> + +#define PROP_LANG "switchspell::language" + +/* TODO: Add option to save the selected language for the dude and resto= re it */ + +static void regenerate_switchspell_menu(GaimGtkConversation *gtkconv); + +static void +menu_conv_use_dict_cb(GObject *m, gpointer data) +{ + GaimGtkWindow *win =3D g_object_get_data(m, "user_data"); + gchar *lang =3D g_object_get_data(m, "lang"); + GaimConversation *conv; + GaimGtkConversation *gtkconv; + GtkSpell *spell; + GError *error =3D NULL; + + conv =3D gaim_gtk_conv_window_get_active_conversation(win); + + gtkconv =3D GAIM_GTK_CONVERSATION(conv); + spell =3D gtkspell_get_from_text_view(GTK_TEXT_VIEW(gtkconv->entry)); + if (spell !=3D NULL) + gtkspell_set_language(spell, lang, &error); + g_object_set_data(G_OBJECT(gtkconv->entry), PROP_LANG, lang); +} + +static void +regenerate_switchspell_menu(GaimGtkConversation *gtkconv) +{ + GaimGtkWindow *win; + GtkWidget *menu; + GtkWidget *mitem; + GSList *group =3D NULL; + AspellConfig * config; + AspellDictInfoList * dlist; + AspellDictInfoEnumeration * dels; + const AspellDictInfo * entry; + + if (gtkconv =3D=3D NULL) + return; + + win =3D gaim_gtkconv_get_window(gtkconv); + if (win =3D=3D NULL) + return; + + mitem =3D g_object_get_data(G_OBJECT(win->window), PROP_LANG); + if (mitem =3D=3D NULL) { + mitem =3D gtk_menu_item_new_with_mnemonic(_("Spe_ll Check")); + gtk_menu_shell_insert(GTK_MENU_SHELL(win->menu.menubar), mitem, 3); + g_object_set_data(G_OBJECT(win->window), PROP_LANG, mitem); + gtk_widget_show(mitem); + } + else + return; + + menu =3D gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(mitem), menu); + + config =3D new_aspell_config(); + dlist =3D get_aspell_dict_info_list(config); + delete_aspell_config(config); + + dels =3D aspell_dict_info_list_elements(dlist); + while ((entry =3D aspell_dict_info_enumeration_next(dels)) !=3D 0) { + GtkWidget *menuitem =3D gtk_radio_menu_item_new_with_label(group, entr= y->name); + group =3D gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem))= ; + g_object_set_data(G_OBJECT(menuitem), "user_data", win); + g_object_set_data(G_OBJECT(menuitem), "lang", (gchar *)entry->name); + g_signal_connect(G_OBJECT(menuitem), "activate", + G_CALLBACK(menu_conv_use_dict_cb), NULL); + gtk_widget_show(menuitem); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + } + + delete_aspell_dict_info_enumeration(dels); + gtk_widget_show_all(menu); +} + +static void +update_switchspell_selection(GaimGtkConversation *gtkconv) +{ + GaimGtkWindow *win; + GtkWidget *menu; + GList *item; + const char *curlang; + + if (gtkconv =3D=3D NULL) + return; + + win =3D gaim_gtkconv_get_window(gtkconv); + if (win =3D=3D NULL) + return; + + menu =3D g_object_get_data(G_OBJECT(win->window), PROP_LANG); + if (menu =3D=3D NULL) + return; + menu =3D gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu)); + + curlang =3D g_object_get_data(G_OBJECT(gtkconv->entry), PROP_LANG); + + g_list_foreach(gtk_container_get_children(GTK_CONTAINER(menu)), + (GFunc)gtk_check_menu_item_set_active, GINT_TO_POINTER(FALSE)); + + for (item =3D gtk_container_get_children(GTK_CONTAINER(menu)); + item; item =3D item->next) { + const char *lang =3D g_object_get_data(G_OBJECT(item->data), "lang"); + if (lang && curlang && strcmp(lang, curlang) =3D=3D 0) { + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item->data), TRUE)= ; + break; + } =09 + } +} + +static void +conversation_switched_cb(GaimConversation *conv) +{ + GaimGtkConversation *gtkconv =3D GAIM_GTK_CONVERSATION(conv); + regenerate_switchspell_menu(gtkconv); + update_switchspell_selection(gtkconv); +} + =09 +static gboolean +make_sure_gtkconv(GaimConversation *conv) +{ + GaimGtkConversation *gtkconv =3D GAIM_GTK_CONVERSATION(conv); + if (gtkconv =3D=3D NULL) + return TRUE; + g_object_set_data(G_OBJECT(gtkconv->entry), PROP_LANG, getenv("LANG")); + update_switchspell_selection(gtkconv); + return FALSE; +} + +static void +conversation_created_cb(GaimConversation *conv) +{ + /* Read all about it (and more!) in xmmsremote */ + g_timeout_add(500, (GSourceFunc)make_sure_gtkconv, conv); +} + +static void attach_switchspell_menu(gpointer data, gpointer dontcare) +{ + GaimGtkWindow *win =3D data; + GaimGtkConversation *gtkconv; + + gtkconv =3D gaim_gtk_conv_window_get_active_gtkconv(win); + regenerate_switchspell_menu(gtkconv); + update_switchspell_selection(gtkconv); +} + +static gboolean plugin_load(GaimPlugin *plugin) +{ + void *conv_handle =3D gaim_conversations_get_handle(); + + gaim_signal_connect(conv_handle, "conversation-created", plugin, + GAIM_CALLBACK(conversation_created_cb), NULL); + gaim_signal_connect(gaim_gtk_conversations_get_handle(), "conversation-= switched", + plugin, GAIM_CALLBACK(conversation_switched_cb), NULL); + + g_list_foreach(gaim_gtk_conv_windows_get_list(), attach_switchspell_men= u, NULL); + + return TRUE; +} + +static void remove_switchspell_menu(gpointer data, gpointer dontcare) +{ + GaimGtkWindow *win =3D data; + GtkWidget *menu; + + menu =3D g_object_get_data(G_OBJECT(win->window), PROP_LANG); + if (menu) { + gtk_widget_destroy(menu); + g_object_set_data(G_OBJECT(win->window), PROP_LANG, NULL); + } +} + +static gboolean plugin_unload(GaimPlugin *plugin) +{ + gaim_prefs_disconnect_by_handle(plugin); + + g_list_foreach(gaim_gtk_conv_windows_get_list(), remove_switchspell_men= u, NULL); + + return TRUE; +} + +static GaimPluginInfo info =3D { + GAIM_PLUGIN_MAGIC, /* Magic */ + GAIM_MAJOR_VERSION, /* Gaim Major Version */ + GAIM_MINOR_VERSION, /* Gaim Minor Version */ + GAIM_PLUGIN_STANDARD, /* plugin type */ + GAIM_GTK_PLUGIN_TYPE, /* ui requirement */ + 0, /* flags */ + NULL, /* dependencies */ + GAIM_PRIORITY_DEFAULT, /* priority */ + + PLUGIN_ID, /* plugin id */ + NULL, /* name */ + GPP_VERSION, /* version */ + NULL, /* summary */ + NULL, /* description */ + PLUGIN_AUTHOR, /* author */ + GPP_WEBSITE, /* website */ + + plugin_load, /* load */ + plugin_unload, /* unload */ + NULL, /* destroy */ + + NULL, /* ui_info */ + NULL, /* extra_info */ + NULL, /* prefs_info */ + NULL /* actions */ +}; + +static void init_plugin(GaimPlugin *plugin) +{ +#ifdef ENABLE_NLS + bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); +#endif /* ENABLE_NLS */ + + info.name =3D _(PLUGIN_NAME); + info.summary =3D _(PLUGIN_SUMMARY); + info.description =3D _(PLUGIN_DESCRIPTION); +} + +GAIM_INIT_PLUGIN(talkfilters, init_plugin, info) Property changes on: trunk/plugin_pack/switchspell/switchspell.c ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native |
|
From: <gui...@re...> - 2007-01-26 01:43:05
|
Author: grim
Date: 2007-01-25 19:43:04 -0600 (Thu, 25 Jan 2007)
New Revision: 242
Modified:
trunk/plugin_pack/irssi/textfmt.c
Log:
Making the text format not work with spaces
This revision's diffstat output:
textfmt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: trunk/plugin_pack/irssi/textfmt.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/plugin_pack/irssi/textfmt.c 2007-01-21 05:35:54 UTC (rev 241)
+++ trunk/plugin_pack/irssi/textfmt.c 2007-01-26 01:43:04 UTC (rev 242)
@@ -36,7 +36,7 @@
/***********************************************************************=
*******
* Globals
***********************************************************************=
******/
-#define EXPRESSION "(^|[ ])(%s)(.+)(%s)($|[ ])"
+#define EXPRESSION "(^|[ ])(%s)([^ ]+)(%s)($|[ ])"
=20
enum {
GROUP_ALL =3D 0,
|
|
From: <gui...@re...> - 2007-01-23 01:35:06
|
Author: grim
Date: 2007-01-22 19:35:00 -0600 (Mon, 22 Jan 2007)
New Revision: 1750
Modified:
trunk/gflib/gflib/gf_native_plugin.c
Log:
syncing this since programming at a desk with a chair that has no back is=
intolerable...
This revision's diffstat output:
gf_native_plugin.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++=
++++++-
1 file changed, 160 insertions(+), 2 deletions(-)
Modified: trunk/gflib/gflib/gf_native_plugin.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/gflib/gflib/gf_native_plugin.c 2007-01-20 04:38:12 UTC (rev 174=
9)
+++ trunk/gflib/gflib/gf_native_plugin.c 2007-01-23 01:35:00 UTC (rev 175=
0)
@@ -27,6 +27,7 @@
#include <gmodule.h>
=20
#include <gflib/gf_intl.h>
+#include <gflib/gf_log.h>
=20
#define GF_NATIVE_PLUGIN_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE((obj), GF_TYPE_NATIVE_PLUGIN, GfNativePlug=
inPriv))
@@ -34,10 +35,33 @@
/***********************************************************************=
*******
* Structs
***********************************************************************=
******/
-typedef struct {
+typedef struct _GfNativePluginPriv GfNativePluginPriv;
+typedef struct _GfNativePluginTypeInfo GfNativePluginTypeInfo;
+typedef struct _GfNativePluginInterfaceInfo GfNativePluginInterfaceInfo;
+
+struct _GfNativePluginPriv {
GModule *module;
-} GfNativePluginPriv;
=20
+ guint use_count;
+
+ GHashTable *types;
+ GHashTable *interfaces;
+};
+
+struct _GfNativePluginTypeInfo {
+ gboolean loaded;
+ GType type;
+ GType parent;
+ GTypeInfo info;
+};
+
+struct _GfNativePluginInterfaceInfo {
+ gboolean loaded;
+ GType instance_type;
+ GType interface_type;
+ GInterfaceInfo info;
+};
+
/***********************************************************************=
*******
* Enums
***********************************************************************=
******/
@@ -53,6 +77,40 @@
static GObjectClass *parent_class =3D NULL;
=20
/***********************************************************************=
*******
+ * Interface Stuff
+ ***********************************************************************=
******/
+static void
+gf_native_plugin_use(GTypePlugin *plugin) {
+}
+
+static void
+gf_native_plugin_unuse(GTypePlugin *plugin) {
+}
+
+static void
+gf_native_plugin_complete_type_info(GTypePlugin *plugin, GType gtype,
+ GTypeInfo *info,
+ GTypeValueTable *value_table)
+{
+}
+
+static void
+gf_native_plugin_complete_interface_info(GTypePlugin *plugin,
+ GType instance_type,
+ GType interface_type,
+ GInterfaceInfo *info)
+{
+}
+
+static void
+gf_native_plugin_iface_init(GTypePluginClass *iface) {
+ iface->use_plugin =3D gf_native_plugin_use;
+ iface->unuse_plugin =3D gf_native_plugin_unuse;
+ iface->complete_type_info =3D gf_native_plugin_complete_type_info;
+ iface->complete_interface_info =3D gf_native_plugin_complete_interface_=
info;
+}
+
+/***********************************************************************=
*******
* Object Stuff
***********************************************************************=
******/
static void
@@ -89,6 +147,11 @@
=20
static void
gf_native_plugin_finalize(GObject *obj) {
+ GfNativePluginPriv *priv =3D GF_NATIVE_PLUGIN_GET_PRIVATE(obj);
+
+ g_hash_table_destroy(priv->types);
+ g_hash_table_destroy(priv->interfaces);
+
G_OBJECT_CLASS(parent_class)->finalize(obj);
}
=20
@@ -99,6 +162,8 @@
=20
parent_class =3D g_type_class_peek_parent(klass);
=20
+ g_type_class_add_private(klass, sizeof(GfNativePluginPriv));
+
obj_class->finalize =3D gf_native_plugin_finalize;
obj_class->get_property =3D gf_native_plugin_get_property;
obj_class->set_property =3D gf_native_plugin_set_property;
@@ -109,6 +174,18 @@
g_object_class_install_property(obj_class, PROP_MODULE, psec);
}
=20
+static void
+gf_native_plugin_init(GTypeInstance *instance, gpointer gclass) {
+ GfNativePluginPriv *priv =3D GF_NATIVE_PLUGIN_GET_PRIVATE(instance);
+/*
+ priv->types =3D g_hash_table_new_full(g_int_hash, g_int_equal, NULL,
+ gf_native_plugin_type_info_free);
+=09
+ priv->interfaces =3D g_hash_table_new_full(g_int_hash, g_int_equal, NUL=
L,
+ gf_native_plugin_interface_info_free);
+*/
+}
+
/***********************************************************************=
*******
* API
***********************************************************************=
******/
@@ -126,15 +203,96 @@
NULL,
sizeof(GfNativePlugin),
0,
+ gf_native_plugin_init,
+ };
+
+ static const GInterfaceInfo iface_info =3D {
+ (GInterfaceInitFunc)gf_native_plugin_iface_init,
NULL,
+ NULL
};
=20
type =3D g_type_register_static(GF_TYPE_PLUGIN,
"GfNativePlugin",
&info, 0);
+
+ g_type_add_interface_static(type, G_TYPE_TYPE_PLUGIN, &iface_info);
}
=20
return type;
}
=20
+GType
+gf_native_plugin_register_type(GfNativePlugin *plugin, GType parent,
+ const gchar *name, const GTypeInfo *info,
+ GTypeFlags flags)
+{
+ GfNativePluginPriv *priv =3D GF_NATIVE_PLUGIN_GET_PRIVATE(plugin);
+ GfNativePluginTypeInfo *type_info =3D NULL;
+ GType type =3D G_TYPE_INVALID;
=20
+ g_return_val_if_fail(GF_IS_NATIVE_PLUGIN(plugin), G_TYPE_INVALID);
+ g_return_val_if_fail(name, G_TYPE_INVALID);
+ g_return_val_if_fail(info, G_TYPE_INVALID);
+
+ type =3D g_type_from_name(name);
+
+ if(type !=3D G_TYPE_INVALID) {
+ /* this type is already loaded, let's make sure it's the same plugin
+ * loading it again.
+ */
+ GTypePlugin *old =3D g_type_get_plugin(type);
+
+ if(old !=3D G_TYPE_PLUGIN(plugin)) {
+ gf_log_warning("GfNativePlugin",
+ "Two different plugins tried to register '%s'\n",
+ name);
+
+ return G_TYPE_INVALID;
+ }
+
+ /* The same plugin is reloading the type */
+ type_info =3D (GfNativePluginTypeInfo *)
+ g_hash_table_lookup(priv->types,
+ GINT_TO_POINTER(type));
+
+ if(type_info->parent !=3D parent) {
+ /* eek, them bastards tried to reparent this type! */
+
+ const gchar *parent_name =3D g_type_name(parent);
+
+ gf_log_warning("GfNativePlugin",
+ "Type '%s' was recreated with a different parent "
+ "type.\n (was '%s', now '%s')\n",
+ name, g_type_name(type_info->parent),
+ (parent_name) ? parent_name : "(unknown)");
+
+ return G_TYPE_INVALID;
+ }
+
+ /* we need to free the old value table if the old type had one */
+ if(type_info->info.value_table)
+ g_free((GTypeValueTable *)type_info->info.value_table);
+ } else {
+ /* the type hasn't been loaded before, so now we need to add it */
+
+ type_info =3D g_new(GfNativePluginTypeInfo, 1);
+
+ type_info->parent =3D parent;
+ type_info->type =3D g_type_register_dynamic(parent, name,
+ G_TYPE_PLUGIN(plugin), flags);
+
+ g_hash_table_insert(priv->types, GINT_TO_POINTER(type_info->type),
+ type_info);
+ }
+
+ /* ok, now finish up */
+ type_info->loaded =3D TRUE;
+ type_info->info =3D *info;
+ if(info->value_table) {
+ type_info->info.value_table =3D g_memdup(info->value_table,
+ sizeof(GTypeValueTable));
+ }
+
+ return type_info->type;
+}
|
|
From: <gui...@re...> - 2007-01-21 05:35:55
|
Author: jbailey Date: 2007-01-20 23:35:54 -0600 (Sat, 20 Jan 2007) New Revision: 241 Modified: branches/ignorance_pluginpack/configure.ac trunk/guifications2/ChangeLog trunk/guifications2/VERSION trunk/guifications2/configure.ac trunk/plugin_pack/ChangeLog trunk/plugin_pack/VERSION trunk/plugin_pack/chronic/chronic.c trunk/plugin_pack/configure.ac Log: Cleaning out my tree. This includes changing our version strings back to 1.0svn and 2.13svn, and a change to the configure.ac in my branch that I can't recall actually making. This revision's diffstat output: branches/ignorance_pluginpack/configure.ac | 2 ++ trunk/guifications2/ChangeLog | 2 ++ trunk/guifications2/VERSION | 2 +- trunk/guifications2/configure.ac | 2 +- trunk/plugin_pack/ChangeLog | 2 ++ trunk/plugin_pack/VERSION | 2 +- trunk/plugin_pack/chronic/chronic.c | 8 ++++---- trunk/plugin_pack/configure.ac | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) Modified: branches/ignorance_pluginpack/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/ignorance_pluginpack/configure.ac 2007-01-20 19:36:51 UTC (r= ev 240) +++ branches/ignorance_pluginpack/configure.ac 2007-01-21 05:35:54 UTC (r= ev 241) @@ -103,6 +103,8 @@ dnl ####################################################################= ### dnl # Plugin dependency checking dnl ####################################################################= ### +AC_CHECK_HEADERS(regex.h) + AC_CHECK_HEADER(talkfilters.h, HAVE_TALKFILTERS=3Dyes, AC_MSG_WARN([ *** GNU Talk Filters is required to build the talkfilters plugin; *** please make sure you have the GNU Talk Filters development headers i= nstalled. Modified: trunk/guifications2/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/guifications2/ChangeLog 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/guifications2/ChangeLog 2007-01-21 05:35:54 UTC (rev 241) @@ -1,3 +1,5 @@ +Version 2.13svn: + Version 2.13beta6 1/19/07: * Repackaged for Gaim 2.0.0beta6 =20 Modified: trunk/guifications2/VERSION =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/guifications2/VERSION 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/guifications2/VERSION 2007-01-21 05:35:54 UTC (rev 241) @@ -1 +1 @@ -2.13beta6 +2.13svn Modified: trunk/guifications2/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/guifications2/configure.ac 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/guifications2/configure.ac 2007-01-21 05:35:54 UTC (rev 241) @@ -3,7 +3,7 @@ # gaim-encryption configure script, thanks guys ;) # =20 -AC_INIT([gaim-guifications], [2.13beta6], [gui...@li...= ceforge.net]) +AC_INIT([gaim-guifications], [2.13svn], [gui...@li...= forge.net]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(pre_config.h) =20 Modified: trunk/plugin_pack/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/ChangeLog 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/plugin_pack/ChangeLog 2007-01-21 05:35:54 UTC (rev 241) @@ -1,3 +1,5 @@ +Version 1.0svn: + Version 1.0beta6: 1/19/07 * Extensive changes to the irssi plugin, especially in its text formatt= ing. * Added a menuconfig script that allows a text-mode menu selection of Modified: trunk/plugin_pack/VERSION =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/VERSION 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/plugin_pack/VERSION 2007-01-21 05:35:54 UTC (rev 241) @@ -1 +1 @@ -1.0beta6 +1.0svn Modified: trunk/plugin_pack/chronic/chronic.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/chronic/chronic.c 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/plugin_pack/chronic/chronic.c 2007-01-21 05:35:54 UTC (rev 241) @@ -107,10 +107,10 @@ chronic_info.name =3D _("Chronic"); chronic_info.summary =3D _("Sound playing triggers"); chronic_info.description =3D _("Allows buddies to remotely trigger soun= d" - " playing in your instance of Gaim with {S <sound> or !sound" - " <sound>. Inspired by #guifications channel resident" - " EvilDennisR and ancient versions of AOL. THIS PLUGIN IS NOT" - " YET FUNCTIONAL! IT IS USELESS!"); + " playing in your instance of Gaim with {S <sound>. Inspired" + " by #guifications channel resident EvilDennisR and ancient" + " versions of AOL. THIS PLUGIN IS NOT YET FUNCTIONAL!" + " IT IS USELESS!"); } =20 GAIM_INIT_PLUGIN(chronic, chronic_init, chronic_info) Modified: trunk/plugin_pack/configure.ac =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/configure.ac 2007-01-20 19:36:51 UTC (rev 240) +++ trunk/plugin_pack/configure.ac 2007-01-21 05:35:54 UTC (rev 241) @@ -1,4 +1,4 @@ -AC_INIT([gaim-plugin_pack], [1.0beta6], [gui...@li...= forge.net]) +AC_INIT([gaim-plugin_pack], [1.0svn], [gui...@li...= rge.net]) AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(pre_config.h) =20 |
|
From: <gui...@re...> - 2007-01-20 19:36:52
|
Author: sadrul
Date: 2007-01-20 13:36:51 -0600 (Sat, 20 Jan 2007)
New Revision: 240
Modified:
trunk/plugin_pack/mystatusbox/mystatusbox.c
Log:
This fixes the compile error for me.
This revision's diffstat output:
mystatusbox.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: trunk/plugin_pack/mystatusbox/mystatusbox.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 19:33:00 UTC (=
rev 239)
+++ trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 19:36:51 UTC (=
rev 240)
@@ -124,13 +124,13 @@
GList *list, *iter;
int i;
gboolean headline_showing;
- GtkWidget *holds[6];
+ GtkWidget **holds;
=20
gtkblist =3D gaim_gtk_blist_get_default_gtk_blist();
if (!gtkblist)
return;
=20
- holds =3D {gtkblist->headline_hbox->parent, gtkblist->treeview->parent,
+ holds =3D (GtkWidget*[]){gtkblist->headline_hbox->parent, gtkblist->tre=
eview->parent,
gtkblist->error_buttons, gtkblist->statusbox,
gtkblist->scrollbook, NULL};
=20
|
|
From: <gui...@re...> - 2007-01-20 19:33:01
|
Author: jbailey Date: 2007-01-20 13:33:00 -0600 (Sat, 20 Jan 2007) New Revision: 239 Modified: trunk/plugin_pack/mystatusbox/mystatusbox.c Log: This should fix sadrul's compile error This revision's diffstat output: mystatusbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: trunk/plugin_pack/mystatusbox/mystatusbox.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 18:23:18 UTC (= rev 238) +++ trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 19:33:00 UTC (= rev 239) @@ -124,7 +124,7 @@ GList *list, *iter; int i; gboolean headline_showing; - GtkWidget *holds[5]; + GtkWidget *holds[6]; =20 gtkblist =3D gaim_gtk_blist_get_default_gtk_blist(); if (!gtkblist) |
|
From: <gui...@re...> - 2007-01-20 18:23:20
|
Author: jbailey Date: 2007-01-20 12:23:18 -0600 (Sat, 20 Jan 2007) New Revision: 238 Modified: trunk/plugin_pack/irssi/Makefile.mingw Log: These are the changes I needed to make to get irssi to build on Windows. This revision's diffstat output: Makefile.mingw | 8 ++++++++ 1 file changed, 8 insertions(+) Modified: trunk/plugin_pack/irssi/Makefile.mingw =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/plugin_pack/irssi/Makefile.mingw 2007-01-20 05:34:22 UTC (rev 2= 37) +++ trunk/plugin_pack/irssi/Makefile.mingw 2007-01-20 18:23:18 UTC (rev 2= 38) @@ -8,5 +8,13 @@ =20 GPP =3D irssi =20 +GPP_SRC :=3D \ + datechange.c \ + layout.c \ + lastlog.c \ + textfmt.c \ + window.c \ + irssi.c + include $(GPP_TOP)/win_gpp.mak =20 |
|
From: <gui...@re...> - 2007-01-20 05:34:23
|
Author: jbailey
Date: 2007-01-19 23:34:22 -0600 (Fri, 19 Jan 2007)
New Revision: 237
Modified:
trunk/plugin_pack/mystatusbox/mystatusbox.c
Log:
Fix compiling on compilers that don't understand C99
This revision's diffstat output:
mystatusbox.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: trunk/plugin_pack/mystatusbox/mystatusbox.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 01:39:01 UTC (=
rev 236)
+++ trunk/plugin_pack/mystatusbox/mystatusbox.c 2007-01-20 05:34:22 UTC (=
rev 237)
@@ -124,12 +124,13 @@
GList *list, *iter;
int i;
gboolean headline_showing;
+ GtkWidget *holds[5];
=20
gtkblist =3D gaim_gtk_blist_get_default_gtk_blist();
if (!gtkblist)
return;
=20
- GtkWidget *holds[] =3D {gtkblist->headline_hbox->parent, gtkblist->tree=
view->parent,
+ holds =3D {gtkblist->headline_hbox->parent, gtkblist->treeview->parent,
gtkblist->error_buttons, gtkblist->statusbox,
gtkblist->scrollbook, NULL};
=20
|
|
From: <gui...@re...> - 2007-01-20 04:38:12
|
Author: grim
Date: 2007-01-19 22:38:12 -0600 (Fri, 19 Jan 2007)
New Revision: 1749
Added:
trunk/extras/django/
trunk/extras/django/cms/
trunk/extras/django/cms/__init__.py
trunk/extras/django/cms/models.py
trunk/extras/django/cms/views.py
Log:
Adding this stuff here...
This revision's diffstat output:
models.py | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
Added: trunk/extras/django/cms/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Added: trunk/extras/django/cms/models.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/extras/django/cms/models.py (rev 0)
+++ trunk/extras/django/cms/models.py 2007-01-20 04:38:12 UTC (rev 1749)
@@ -0,0 +1,51 @@
+from django.db import models
+from django.contrib.auth.models import User
+
+class Link(models.Model):
+ text =3D models.CharField('Text', maxlength=3D200)
+ url =3D models.URLField('URL', verify_exists=3DTrue)
+ alt =3D models.CharField('Alternate Text', maxlength=3D200)
+
+ def __str__(self):
+ return self.text
+=09
+ class Meta:
+ verbose_name =3D "Links"
+ verbose_name_plural =3D "Links"
+
+ class Admin:
+ fields =3D (
+ ('Text', {'fields': ('text',)}),
+ ('URL', {'fields': ('url',)}),
+ ('Alternate', {'fields': ('alt',)}),
+ )
+
+ list_display =3D ('text', 'url', 'alt')
+ search_fields =3D ['text', 'url', 'alt']
+=09
+class News(models.Model):
+ author =3D models.ForeignKey(User, limit_coices_to=3D{'is_staff': True}=
)
+ pub_date =3D models.DateTimeField('Date Published', auto_now_add=3DTrue=
)
+ headline =3D models.CharField(maxlength=3D200)
+ story =3D models.TextField()
+
+ def __str__(self):
+ return self.headline
+=09
+ class Meta:
+ verbose_name =3D "News"
+ verbose_name_plural =3D "News"
+
+ class Admin:
+ fields =3D (
+ ('Headline', {'fields': ('headline',)}),
+ ('Author', {'fields': ('author',)}),
+ ('Published Date', {'fields': ('pub_date',), 'classes': 'collapse'}),
+ (None, {'fields': ('story',)}),
+ )
+
+ list_display =3D ('headline', 'pub_date', 'author')
+ list_filter =3D ['pub_date']
+ search_fields =3D ['headline', 'author', 'pub_date', 'story']
+ date_hierarchy =3D 'pub_date'
+
Added: trunk/extras/django/cms/views.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
|
30 messages has been excluded from this view by a project administrator.
