Mercurial > pidgin
changeset 17534:a8d6f071eb6d
Get rid of 'Gaim' in a few more places
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 07 Jun 2007 06:29:30 +0000 |
| parents | 7a493fc1e763 |
| children | 7a96dcb82ff7 |
| files | config.h.mingw pidgin/gtkdocklet-x11.c pidgin/win32/nsis/pidgin-installer.nsi valgrind-suppressions |
| diffstat | 4 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/config.h.mingw Thu Jun 07 06:26:06 2007 +0000 +++ b/config.h.mingw Thu Jun 07 06:29:30 2007 +0000 @@ -344,9 +344,6 @@ /* Define to the version of this package. */ /* #define PACKAGE_VERSION "2.0.0dev" */ -/* Define to make assertions fatal (useful for debugging). */ -/* #define PURPLE_FATAL_ASSERTS 1 */ - /* Define if plugins are enabled. */ #define PURPLE_PLUGINS 1
--- a/pidgin/gtkdocklet-x11.c Thu Jun 07 06:26:06 2007 +0000 +++ b/pidgin/gtkdocklet-x11.c Thu Jun 07 06:29:30 2007 +0000 @@ -281,7 +281,7 @@ * The x11 docklet tracks whether it successfully embedded in a pref and * allows for a longer timeout period if it successfully embedded the last * time it was run. This should hopefully solve problems with the buddy - * list not properly starting hidden when gaim is started on login. + * list not properly starting hidden when Pidgin is started on login. */ if(!recreate) { pidgin_docklet_embedded();
--- a/pidgin/win32/nsis/pidgin-installer.nsi Thu Jun 07 06:26:06 2007 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Thu Jun 07 06:29:30 2007 +0000 @@ -1068,6 +1068,7 @@ have_gtk: ; GTK+ is already installed; check version. + ; Change this to not even run the GTK installer if this version is already installed. ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3 IntCmp $3 1 +1 good_version good_version ${VersionCompare} ${GTK_MIN_VERSION} $0 $3
--- a/valgrind-suppressions Thu Jun 07 06:26:06 2007 +0000 +++ b/valgrind-suppressions Thu Jun 07 06:29:30 2007 +0000 @@ -147,8 +147,8 @@ fun:PR_Init fun:rsa_nss_init fun:GE_plugin_load - fun:gaim_plugin_load - fun:gaim_plugins_load_saved + fun:purple_plugin_load + fun:purple_plugins_load_saved fun:main }