Revision aa92b4b3216f8107b52bf642c9d37a382b4e77c6

datallah at pidgin.im datallah at pidgin.im
Mon Mar 19 13:03:24 EDT 2007 

o   -----------------------------------------------------------------
|   Revision: aa92b4b3216f8107b52bf642c9d37a382b4e77c6
|   Ancestor: 2017d102244fde3b5b1550b8ce6c2a0cc090e05a
|   Author: datallah at pidgin.im
|   Date: 2007-03-19T16:56:26
|   Branch: im.pidgin.pidgin
|   
|   Renamed entries:
|           libpurple/win32/wgaimerror.h to libpurple/win32/wpurpleerror.h
|   Modified files:
|           config.h.mingw libpurple/Makefile.mingw
|           pidgin/Makefile.mingw pidgin/win32/gtkdocklet-win32.c
|           pidgin/win32/pidgin_dll_rc.rc.in
|           pidgin/win32/pidgin_exe_rc.rc.in po/Makefile.mingw
|   
|   ChangeLog: 
|   
|   win32 fixes for s/gaim/purple/ stuff.
|   
|   ============================================================
|   --- config.h.mingw	abbb087db000a011ac4cfd4537457fd8d30d1f23
|   +++ config.h.mingw	61620e56a47fd744f392c5b3f3139b8f69a7076f
|   @@ -520,19 +520,19 @@
|    /* #undef OLD_PERL */
|    
|    /* Name of package */
|   -#define PACKAGE "gaim"
|   +#define PACKAGE "pidgin"
|    
|    /* Define to the address where bug reports for this package should be sent. */
|    #define PACKAGE_BUGREPORT "gaim-devel at lists.sourceforge.net"
|    
|    /* Define to the full name of this package. */
|   -#define PACKAGE_NAME "gaim"
|   +#define PACKAGE_NAME "pidgin"
|    
|    /* Define to the full name and version of this package. */
|   -/* #define PACKAGE_STRING "gaim 2.0.0dev" */
|   +/* #define PACKAGE_STRING "pidgin 2.0.0dev" */
|    
|    /* Define to the one symbol short name of this package. */
|   -#define PACKAGE_TARNAME "gaim"
|   +#define PACKAGE_TARNAME "pidgin"
|    
|    /* Define to the version of this package. */
|    /* #define PACKAGE_VERSION "2.0.0dev" */
|   ============================================================
|   --- libpurple/Makefile.mingw	27b61fb04a08956a1077cd8ab2db3b61b28d704f
|   +++ libpurple/Makefile.mingw	306f3ff607b2623deffaff628cec01f31e33ab1a
|   @@ -113,7 +113,7 @@ install: install_shallow all
|    	$(MAKE) -C $(GAIM_LIB_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE) install
|    
|    ./win32/libpurplerc.rc: ./win32/libpurplerc.rc.in $(GAIM_TOP)/VERSION
|   -	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
|   +	sed -e 's/@PURPLE_VERSION@/$(GAIM_VERSION)/g' \
|    	    $@.in > $@
|    
|    $(OBJECTS): $(GAIM_CONFIG_H)
|   ============================================================
|   --- pidgin/Makefile.mingw	7a45273d818187d11d486f32a21498ab1e4d4e27
|   +++ pidgin/Makefile.mingw	b9e9c431c692770dc13ab0e52ae98f9928cb2bf4
|   @@ -53,7 +53,6 @@ GTKGAIM_C_SRC =	\
|    ##  SOURCES, OBJECTS
|    ##
|    GTKGAIM_C_SRC =	\
|   -			gaimstock.c \
|    			gtkaccount.c \
|    			gtkblist.c \
|    			gtkconn.c \
|   @@ -89,6 +88,7 @@ GTKGAIM_C_SRC =	\
|    			gtkthemes.c \
|    			gtkutils.c \
|    			gtkwhiteboard.c \
|   +			pidginstock.c \
|    			win32/MinimizeToTray.c \
|    			win32/gtkdocklet-win32.c \
|    			win32/gtkwin32dep.c \
|   @@ -137,7 +137,7 @@ win32/pidgin_exe_rc.rc: win32/pidgin_exe
|    	$(MAKE) -C $(GAIM_GTK_PLUGINS_TOP) -f $(GAIM_WIN32_MAKEFILE)
|    
|    win32/pidgin_exe_rc.rc: win32/pidgin_exe_rc.rc.in $(GAIM_TOP)/VERSION
|   -	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
|   +	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
|    	    -e 's/@ORIGINAL_FILENAME@/$(EXE_NAME)/' \
|    	    $@.in > $@
|    
|   @@ -152,7 +152,7 @@ win32/pidgin_dll_rc.rc: win32/pidgin_dll
|    	$(MAKE) -C $(GAIM_GTK_IDLETRACK_TOP) -f $(GAIM_WIN32_MAKEFILE) install
|    
|    win32/pidgin_dll_rc.rc: win32/pidgin_dll_rc.rc.in $(GAIM_TOP)/VERSION
|   -	sed -e 's/@GAIM_VERSION@/$(GAIM_VERSION)/g' \
|   +	sed -e 's/@PIDGIN_VERSION@/$(GAIM_VERSION)/g' \
|    	    $@.in > $@
|    
|    $(EXE_OBJECTS) $(GTKGAIM_OBJECTS): $(GAIM_CONFIG_H)
|   ============================================================
|   --- pidgin/win32/gtkdocklet-win32.c	35820f8ca48f5dcdff16dc4d0bd47c8dab3baa85
|   +++ pidgin/win32/gtkdocklet-win32.c	921b1715317b514e72fe1501cd9e4583c669b5c0
|   @@ -34,7 +34,7 @@
|    #include "MinimizeToTray.h"
|    #include "gtkwin32dep.h"
|    #include "gtkdocklet.h"
|   -#include "purplestock.h"
|   +#include "pidginstock.h"
|    
|    /*
|     *  DEFINES, MACROS & DATA TYPES
|   ============================================================
|   --- pidgin/win32/pidgin_dll_rc.rc.in	daaf8015fdb942903c288f172cc54bc41aad3e3e
|   +++ pidgin/win32/pidgin_dll_rc.rc.in	cd24dca73034fb23adce3bd3b3bad9b36a1ff27d
|   @@ -1,9 +1,9 @@ VS_VERSION_INFO VERSIONINFO
|    #include <winver.h>
|    #include "version.h"
|    
|    VS_VERSION_INFO VERSIONINFO
|   -  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
|   -  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
|   +  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|   +  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|      FILEFLAGSMASK 0
|      FILEFLAGS 0
|      FILEOS VOS__WINDOWS32
|   @@ -16,12 +16,12 @@ VS_VERSION_INFO VERSIONINFO
|          BEGIN
|            VALUE "CompanyName", "The Pidgin developer community"
|            VALUE "FileDescription", "GTK+ Pidgin Library"
|   -        VALUE "FileVersion", "@GAIM_VERSION@"
|   +        VALUE "FileVersion", "@PIDGIN_VERSION@"
|            VALUE "InternalName", "libpidgin"
|            VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
|            VALUE "OriginalFilename", "pidgin.dll"
|            VALUE "ProductName", "Pidgin"
|   -        VALUE "ProductVersion", "@GAIM_VERSION@"
|   +        VALUE "ProductVersion", "@PIDGIN_VERSION@"
|          END
|        END
|        BLOCK "VarFileInfo"
|   ============================================================
|   --- pidgin/win32/pidgin_exe_rc.rc.in	58165102ca18bade4e99d76c53e080137305054f
|   +++ pidgin/win32/pidgin_exe_rc.rc.in	2c37d1ed01ea64c3c1db0378091700a5abb5f3c2
|   @@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
|    #define PIXMAPDIR "pixmaps/"
|    
|    VS_VERSION_INFO VERSIONINFO
|   -  FILEVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
|   -  PRODUCTVERSION GAIM_MAJOR_VERSION,GAIM_MINOR_VERSION,GAIM_MICRO_VERSION,0
|   +  FILEVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|   +  PRODUCTVERSION PURPLE_MAJOR_VERSION,PURPLE_MINOR_VERSION,PURPLE_MICRO_VERSION,0
|      FILEFLAGSMASK 0
|      FILEFLAGS 0
|      FILEOS VOS__WINDOWS32
|   @@ -19,12 +19,12 @@ VS_VERSION_INFO VERSIONINFO
|          BEGIN
|            VALUE "CompanyName", "The Pidgin developer community"
|            VALUE "FileDescription", "Pidgin"
|   -        VALUE "FileVersion", "@GAIM_VERSION@"
|   +        VALUE "FileVersion", "@PIDGIN_VERSION@"
|            VALUE "InternalName", "pidgin"
|            VALUE "LegalCopyright", "Copyright (C) 1998-2007 The Pidgin developer community (See the COPYRIGHT file in the source distribution)."
|            VALUE "OriginalFilename", "@ORIGINAL_FILENAME@"
|            VALUE "ProductName", "Pidgin"
|   -        VALUE "ProductVersion", "@GAIM_VERSION@"
|   +        VALUE "ProductVersion", "@PIDGIN_VERSION@"
|          END
|        END
|        BLOCK "VarFileInfo"
|   @@ -33,4 +33,4 @@ VS_VERSION_INFO VERSIONINFO
|        END
|      END
|    
|   +PURPLE_ICON			ICON PIXMAPDIR "gaim.ico"
|   -GAIM_ICON			ICON PIXMAPDIR "gaim.ico"
|   ============================================================
|   --- po/Makefile.mingw	f4cdbdd93513d33ae5c01661f0ae8f69ddc72dad
|   +++ po/Makefile.mingw	b97f96b5c187cc9d976c22988a41007949c40eb7
|   @@ -6,7 +6,7 @@ include $(GAIM_TOP)/libpurple/win32/glob
|    GAIM_TOP := ..
|    include $(GAIM_TOP)/libpurple/win32/global.mak
|    
|   -PACKAGE = gaim
|   +PACKAGE = pidgin
|    
|    .SUFFIXES:
|    .SUFFIXES: .po .gmo

To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from aa92b4b3216f8107b52bf642c9d37a382b4e77c6

More information about the Commits mailing list