Pidgin

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11006/src

Modified Files:
	util.c util.h 
Log Message:
" As discussed on #gaim
(15:02:02) Paco-Paco: the ugliness of this feature
trumps compatability, unless there is some pretty
important functionality to be lost
(15:04:02) aatharuv: Paco-Paco: Because zephyr is a
silly UDP based protocol, and sometimes subscriptions
(chats you've registered for) get lost, and you can
tell a user to a cli tool 'zctl' which will restore the
subs.
(15:04:32) aatharuv: Paco-Paco: Of course, I should
just add this as a protocol option, so users don't have
to do that.
(15:04:39) Paco-Paco: yes
(15:04:50) Paco-Paco: that would be the appropriate answer
(15:06:05) LSchiere: okay, so rather then messing with
anoncvs delays, i'm going to leave this in for now, and
aatharuv can just change to to a account option in place

Okay, here's a patch to reload subscriptions incase the
server loses track of them, as a protocol action. Since
my anoncvs hasn't even gotten the original zephyr patch
yet, you might as well reverse the original patch, and
apply this new one." --Arun A Tharuvai


Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -p -r1.310 -r1.311
--- util.c	29 Jun 2004 17:23:07 -0000	1.310
+++ util.c	29 Jun 2004 20:35:29 -0000	1.311
@@ -1951,13 +1951,7 @@ int gaim_build_dir (const char *path, in
 static const char *gaim_mkstemp_templ = {"gaimXXXXXX"};
 
 FILE *
-gaim_mkstemp(char **fpath) {
-  return gaim_mkstemp_template(fpath, gaim_mkstemp_templ);
-}
-
-
-FILE *
-gaim_mkstemp_template(char **fpath, const char *template)
+gaim_mkstemp(char **fpath)
 {
 	const gchar *tmpdir;
 #ifndef _WIN32
@@ -1968,7 +1962,7 @@ gaim_mkstemp_template(char **fpath, cons
 	g_return_val_if_fail(fpath != NULL, NULL);
 
 	if((tmpdir = (gchar*)g_get_tmp_dir()) != NULL) {
-		if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, template)) != NULL) {
+		if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, gaim_mkstemp_templ)) != NULL) {
 #ifdef _WIN32
 			char* result = _mktemp( *fpath );
 			if( result == NULL )

Index: util.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -p -r1.60 -r1.61
--- util.h	29 Jun 2004 17:23:07 -0000	1.60
+++ util.h	29 Jun 2004 20:35:29 -0000	1.61
@@ -394,26 +394,6 @@ int gaim_build_dir(const char *path, int
 FILE *gaim_mkstemp(char **path);
 
 /**
- * Creates a temporary file and returns a file pointer to it.
- *
- * This is like mkstemp(), but returns a file pointer. It uses the
- * semantics of tempnam() for the directory to use and allocates the
- * space for the file path.
- *
- * The caller is responsible for closing the file and removing it when
- * done, as well as freeing the space pointed to by @a path with
- * g_free().
- *
- * @param path The returned path to the temp file.
- *
- * @param pattern Pattern for use with the returned filename.
- *
- * @return A file pointer to the temporary file, or @c NULL on failure.
- */
-
-FILE *gaim_mkstemp_template(char **path,const char *template);
-
-/**
  * Checks if the given program name is valid and executable.
  *
  * @param program The file name of the application.