# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177710699 0
# Node ID b33f5b606573240f50413ba476e8de1bcbd88ee8
# Parent  5382c414aab1a9af14ce64d4111ab11f6b7e517a# Parent  42362f23d5a84784da3403105c286608bcfd2938
merge of '3470d9c0747eae8c926e33748f29f946efd419b0'
     and 'cf51292b9bf12554eecb319a673f153ef5c6f0e4'

diff -r 42362f23d5a8 -r b33f5b606573 PROGRAMMING_NOTES
--- a/PROGRAMMING_NOTES	Fri Apr 27 20:21:41 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-Notes on keeping Pidgin, Finch, and libpurple OS independant
-------------------------------------------------------------
-
-General
--------
-- Use G_DIR_SEPARATOR_S and G_DIR_SEPARATOR for paths
-
-- Use g_getenv, g_snprintf, g_vsnprintf
-
-- Use purple_home_dir instead of g_get_home_dir or g_getenv("HOME")
-
-- Make sure when including win32dep.h that it is the last header to
-  be included.
-
-- Open binary files when reading or writing with 'b' mode.
-
-  e.g: fopen("somefile", "wb");
-
-  Not doing so will open files in windows using default translation mode. 
-  i.e. newline -> <CR><LF>
-
-Paths
------
-
-- DATADIR, LOCALEDIR & LIBDIR are defined as functions in the win32 build
-  Doing the following will therefore break the windows build:
-
-  printf("File in DATADIR is: %s\n", DATADIR G_DIR_SEPARATOR_S "pic.png");
-
-  it should be:
-
-  printf("File in DATADIR is: %s%s%s\n", DATADIR, G_DIR_SEPARATOR_S, "pic.png");
-
-PLUGINS & PROTOS
-----------------
-
-- G_MODULE_EXPORT all functions which are to be accessed from outside the
-  scope of its "dll" or "so". (E.G. purple_plugin_init)
-
-- G_MODULE_IMPORT all global variables which are located outside your
-  dynamic library. (E.G. connections)
-
-  (Not doing this will cause "Memory Access Violations" in win32)
diff -r 42362f23d5a8 -r b33f5b606573 libpurple/imgstore.h
--- a/libpurple/imgstore.h	Fri Apr 27 20:21:41 2007 +0000
+++ b/libpurple/imgstore.h	Fri Apr 27 21:51:39 2007 +0000
@@ -100,7 +100,7 @@
  * @return The size of the data that the pointer returned by
  *         purple_imgstore_get_data points to.
  */
-size_t purple_imgstore_get_size(PurpleStoredImage *i);
+size_t purple_imgstore_get_size(PurpleStoredImage *img);
 
 /**
  * Retrieves a pointer to the image's filename.