changeset 5913:9657e243d001

[gaim-migrate @ 6345] win32 adjustments for header re-org, and GPL header insertions where missing committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Tue, 17 Jun 2003 18:56:53 +0000
parents b3c412884a22
children 1344aeab6baa
files src/win32/libc_interface.c src/win32/libc_interface.h src/win32/libc_internal.h src/win32/systray.c src/win32/systray.h src/win32/wgaimerror.h src/win32/win32dep.c src/win32/win32dep.h src/win32/wspell.c src/win32/wspell.h
diffstat 10 files changed, 201 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/src/win32/libc_interface.c	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/libc_interface.c	Tue Jun 17 18:56:53 2003 +0000
@@ -1,9 +1,26 @@
 /*
- *  libc_interface.c
- *  
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: October 14, 2002
- *  Description: Commonly used libc routines.
+ * gaim
+ *
+ * File: libc_interface.c
+ * Date: October 14, 2002
+ * Description: libc interface for Windows api
+ * 
+ * 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
+ *
  */
 #include <winsock.h>
 #include <io.h>
@@ -348,7 +365,7 @@
 	struct tm* tmptm;
 
 	if(!time)
-		return;
+		return NULL;
 	tmptm = localtime(time);
 	if(resultp && tmptm)
 		return memcpy(resultp, tmptm, sizeof(struct tm));
--- a/src/win32/libc_interface.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/libc_interface.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,7 +1,25 @@
 /*
- *  libc_interface.h
+ * gaim
+ *
+ * File: libc_interface.h
+ *
+ * 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 _LIBC_INTERFACE_H_
 #define _LIBC_INTERFACE_H_
 #include <winsock.h>
--- a/src/win32/libc_internal.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/libc_internal.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,7 +1,25 @@
 /*
- *  libc_internal.h
+ * gaim
+ *
+ * File: libc_internal.h
+ *
+ * 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 _LIBC_INTERNAL_
 #define _LIBC_INTERNAL_
 
--- a/src/win32/systray.c	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/systray.c	Tue Jun 17 18:56:53 2003 +0000
@@ -1,10 +1,11 @@
 /*
- * gaim - Windows Gaim systray module
+ * gaim
  *
  * File: systray.c
  * Date: November, 2002
+ * Description: Windows Gaim systray module
  * 
- * Copyright (C) 2002, Herman Bloggs <hermanator12002@yahoo.com>
+ * 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
@@ -23,12 +24,17 @@
  */
 #include <windows.h>
 #include <gdk/gdkwin32.h>
-#include "resource.h"
+
+#include "internal.h"
+#include "gtkblist.h"
+#include "gtkprefs.h"
+#include "debug.h"
+
 #include "gaim.h"
-#include "win32dep.h"
+#include "ui.h"
+
+#include "resource.h"
 #include "MinimizeToTray.h"
-#include "ui.h"
-#include "gtkblist.h"
 
 /*
  *  DEFINES, MACROS & DATA TYPES
--- a/src/win32/systray.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/systray.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,11 +1,25 @@
 /*
- *  systray.h
+ * gaim
+ *
+ * File: systray.h
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: November, 2002
- *  Description: Gaim systray functionality
+ * 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 _SYSTRAY_H_
 #define _SYSTRAY_H_
 
--- a/src/win32/wgaimerror.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/wgaimerror.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,11 +1,27 @@
 /*
- *  wgaimerror.h
+ * gaim
+ *
+ * File: wgaimerror.h
+ * Date: October 14, 2002
+ * Description: Convert Winsock errors to Unix errors
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: October 14, 2002
- *  Description: Redefine Unix Errors
+ * 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 _WGAIMERROR_H
 #define _WGAIMERROR_H
 
--- a/src/win32/win32dep.c	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/win32dep.c	Tue Jun 17 18:56:53 2003 +0000
@@ -1,18 +1,39 @@
 /*
- *  win32dep.c
+ * gaim
+ *
+ * File: win32dep.c
+ * Date: June, 2002
+ * Description: Windows dependant code for Gaim
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: June, 2002
- *  Description: Windows dependant code for Gaim
+ * 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
+ *
  */
 #include <windows.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <winuser.h>
+
+#include <gtk/gtk.h>
 #include <glib.h>
 #include <gdk/gdkwin32.h>
 
 #include "gaim.h"
+#include "debug.h"
+
 #include "stdafx.h"
 #include "resource.h"
 #include "MinimizeToTray.h"
@@ -22,6 +43,7 @@
 #include "zlib.h"
 #include "untar.h"
 
+
 /*
  *  DEFINES & MACROS
  */
--- a/src/win32/win32dep.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/win32dep.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,7 +1,25 @@
 /*
- *  win32dep.h
+ * gaim
+ *
+ * File: win32dep.h
+ *
+ * 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 _WIN32DEP_H_
 #define _WIN32DEP_H_
 #include <winsock.h>
@@ -52,15 +70,5 @@
 #define gtk_window_move( window, x, y ) \
 wgaim_gtk_window_move( ## window ##, ## x ##, ## y ## )
 
-/*
- *  Gtk specific
- */
-/* Needed for accessing global variables outside the current module */
-#ifdef G_MODULE_IMPORT
-#undef G_MODULE_IMPORT
-#endif
-#define G_MODULE_IMPORT __declspec(dllimport)
-
-
 #endif /* _WIN32DEP_H_ */
 
--- a/src/win32/wspell.c	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/wspell.c	Tue Jun 17 18:56:53 2003 +0000
@@ -1,9 +1,26 @@
 /*
- *  wspell.c
+ * gaim
+ *
+ * File: wspell.c
+ * Date: March, 2003
+ * Description: Windows Gaim gtkspell interface.
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: March, 2003
- *  Description: Windows Gaim gtkspell interface.
+ * 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
+ *
  */
 #include <windows.h>
 #include <string.h>
--- a/src/win32/wspell.h	Tue Jun 17 18:53:49 2003 +0000
+++ b/src/win32/wspell.h	Tue Jun 17 18:56:53 2003 +0000
@@ -1,9 +1,24 @@
 /*
- *  wspell.h
+ * gaim
+ *
+ * File: wspell.h
+ *
+ * Copyright (C) 2002-2003, Herman Bloggs <hermanator12002@yahoo.com>
  *
- *  Author: Herman Bloggs <hermanator12002@yahoo.com>
- *  Date: March, 2003
- *  Description: Windows Gaim gtkspell interface.
+ * 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 _WSPELL_H_
 #define _WSPELL_H_