changeset 15830:e04c98c1bce9

win32 fixes for s/gaim/purple/ stuff.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 19 Mar 2007 16:56:26 +0000
parents 2edbd4fede72
children a57f8e456cb1
files config.h.mingw libpurple/Makefile.mingw libpurple/win32/wgaimerror.h libpurple/win32/wpurpleerror.h 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
diffstat 9 files changed, 77 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/config.h.mingw	Mon Mar 19 13:31:34 2007 +0000
+++ b/config.h.mingw	Mon Mar 19 16:56:26 2007 +0000
@@ -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@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" */
--- a/libpurple/Makefile.mingw	Mon Mar 19 13:31:34 2007 +0000
+++ b/libpurple/Makefile.mingw	Mon Mar 19 16:56:26 2007 +0000
@@ -113,7 +113,7 @@
 	$(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)
--- a/libpurple/win32/wgaimerror.h	Mon Mar 19 13:31:34 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * purple
- *
- * File: wpurpleerror.h
- * Date: October 14, 2002
- * Description: Convert Winsock errors to Unix errors
- *
- * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
- *
- * 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 _WPURPLEERROR_H
-#define _WPURPLEERROR_H
-
-/* Here we define unix socket errors as windows socket errors */
-
-#define ENETDOWN WSAENETDOWN
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#define EINPROGRESS WSAEINPROGRESS
-#define ENOBUFS WSAENOBUFS
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#define EPROTOTYPE WSAEPROTOTYPE
-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-
-#define EADDRINUSE WSAEADDRINUSE
-#define EINPROGRESS WSAEINPROGRESS
-#define EALREADY WSAEALREADY
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#define ECONNREFUSED WSAECONNREFUSED
-#define EISCONN WSAEISCONN
-#define ENETUNREACH WSAENETUNREACH
-#define ENOTSOCK WSAENOTSOCK
-#define ETIMEDOUT WSAETIMEDOUT
-#define EWOULDBLOCK WSAEWOULDBLOCK
-
-#define ENOTCONN WSAENOTCONN
-#define ENETRESET WSAENETRESET
-#define EOPNOTSUPP WSAEOPNOTSUPP
-#define ESHUTDOWN WSAESHUTDOWN
-#define EMSGSIZE WSAEMSGSIZE
-#define ECONNABORTED WSAECONNABORTED
-#define ECONNRESET WSAECONNRESET
-#define EHOSTUNREACH WSAEHOSTUNREACH
-
-#endif /* end _WPURPLEERROR_H */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/win32/wpurpleerror.h	Mon Mar 19 16:56:26 2007 +0000
@@ -0,0 +1,58 @@
+/*
+ * purple
+ *
+ * File: wpurpleerror.h
+ * Date: October 14, 2002
+ * Description: Convert Winsock errors to Unix errors
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
+ *
+ * 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 _WPURPLEERROR_H
+#define _WPURPLEERROR_H
+
+/* Here we define unix socket errors as windows socket errors */
+
+#define ENETDOWN WSAENETDOWN
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#define EINPROGRESS WSAEINPROGRESS
+#define ENOBUFS WSAENOBUFS
+#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#define EPROTOTYPE WSAEPROTOTYPE
+#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
+
+#define EADDRINUSE WSAEADDRINUSE
+#define EINPROGRESS WSAEINPROGRESS
+#define EALREADY WSAEALREADY
+#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#define ECONNREFUSED WSAECONNREFUSED
+#define EISCONN WSAEISCONN
+#define ENETUNREACH WSAENETUNREACH
+#define ENOTSOCK WSAENOTSOCK
+#define ETIMEDOUT WSAETIMEDOUT
+#define EWOULDBLOCK WSAEWOULDBLOCK
+
+#define ENOTCONN WSAENOTCONN
+#define ENETRESET WSAENETRESET
+#define EOPNOTSUPP WSAEOPNOTSUPP
+#define ESHUTDOWN WSAESHUTDOWN
+#define EMSGSIZE WSAEMSGSIZE
+#define ECONNABORTED WSAECONNABORTED
+#define ECONNRESET WSAECONNRESET
+#define EHOSTUNREACH WSAEHOSTUNREACH
+
+#endif /* end _WPURPLEERROR_H */
--- a/pidgin/Makefile.mingw	Mon Mar 19 13:31:34 2007 +0000
+++ b/pidgin/Makefile.mingw	Mon Mar 19 16:56:26 2007 +0000
@@ -53,7 +53,6 @@
 ##  SOURCES, OBJECTS
 ##
 GTKGAIM_C_SRC =	\
-			gaimstock.c \
 			gtkaccount.c \
 			gtkblist.c \
 			gtkconn.c \
@@ -89,6 +88,7 @@
 			gtkthemes.c \
 			gtkutils.c \
 			gtkwhiteboard.c \
+			pidginstock.c \
 			win32/MinimizeToTray.c \
 			win32/gtkdocklet-win32.c \
 			win32/gtkwin32dep.c \
@@ -137,7 +137,7 @@
 	$(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 @@
 	$(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)
--- a/pidgin/win32/gtkdocklet-win32.c	Mon Mar 19 13:31:34 2007 +0000
+++ b/pidgin/win32/gtkdocklet-win32.c	Mon Mar 19 16:56:26 2007 +0000
@@ -34,7 +34,7 @@
 #include "MinimizeToTray.h"
 #include "gtkwin32dep.h"
 #include "gtkdocklet.h"
-#include "purplestock.h"
+#include "pidginstock.h"
 
 /*
  *  DEFINES, MACROS & DATA TYPES
--- a/pidgin/win32/pidgin_dll_rc.rc.in	Mon Mar 19 13:31:34 2007 +0000
+++ b/pidgin/win32/pidgin_dll_rc.rc.in	Mon Mar 19 16:56:26 2007 +0000
@@ -2,8 +2,8 @@
 #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 @@
       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"
--- a/pidgin/win32/pidgin_exe_rc.rc.in	Mon Mar 19 13:31:34 2007 +0000
+++ b/pidgin/win32/pidgin_exe_rc.rc.in	Mon Mar 19 16:56:26 2007 +0000
@@ -5,8 +5,8 @@
 #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 @@
       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 @@
     END
   END
 
-GAIM_ICON			ICON PIXMAPDIR "gaim.ico"
+PURPLE_ICON			ICON PIXMAPDIR "gaim.ico"
--- a/po/Makefile.mingw	Mon Mar 19 13:31:34 2007 +0000
+++ b/po/Makefile.mingw	Mon Mar 19 16:56:26 2007 +0000
@@ -6,7 +6,7 @@
 GAIM_TOP := ..
 include $(GAIM_TOP)/libpurple/win32/global.mak
 
-PACKAGE = gaim
+PACKAGE = pidgin
 
 .SUFFIXES:
 .SUFFIXES: .po .gmo