changeset 7212:42ef0c41cefb

[gaim-migrate @ 7781] Remove win32 opt_gdebug code and fix critical error which caused console to appear committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Thu, 09 Oct 2003 21:15:42 +0000
parents fab036092ca5
children 8d8b3ab13607
files src/main.c src/win32/win32dep.c
diffstat 2 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.c	Thu Oct 09 20:23:28 2003 +0000
+++ b/src/main.c	Thu Oct 09 21:15:42 2003 +0000
@@ -83,9 +83,6 @@
 char *opt_away_arg = NULL;
 char *opt_rcfile_arg = NULL;
 int opt_debug = 0;
-#ifdef _WIN32
-int opt_gdebug = 0;
-#endif
 
 #if HAVE_SIGNAL_H
 /*
@@ -770,7 +767,7 @@
 #ifndef _WIN32
 				  "adhu:f:vns:", 
 #else
-				  "adghu:f:vn", 
+				  "adhu:f:vn", 
 #endif
 				  long_options, NULL)) != -1) {
 		switch (opt) {
@@ -799,11 +796,6 @@
 		case 'n':       /* don't autologin */
 			opt_nologin = 1;
 			break;
-#ifdef _WIN32
-		case 'g':       /* debug GTK and GLIB */
-			opt_gdebug = 1;
-			break;
-#endif
 		case '?':
 		default:
 			show_usage(1, argv[0]);
--- a/src/win32/win32dep.c	Thu Oct 09 20:23:28 2003 +0000
+++ b/src/win32/win32dep.c	Thu Oct 09 21:15:42 2003 +0000
@@ -481,8 +481,8 @@
                         }
                         g_free(new_home);
                         g_free(old_home);
-                        g_dir_close(dir_old);
-                        g_dir_close(dir_new);
+                        if(dir_old) g_dir_close(dir_old);
+                        if(dir_new) g_dir_close(dir_new);
                 }
         }
         else {