From da57b5b8c2f3925bf635fdff2b61d1de3a9a58f5 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Sat, 8 Apr 2023 11:32:00 -0300 Subject: [PATCH] Less debug messsages. --- src/terminal/font/properties.c | 2 +- src/terminal/keyboard/accelerator.c | 3 ++- src/terminal/windows/init.c | 23 +++++++++++++---------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/terminal/font/properties.c b/src/terminal/font/properties.c index f095875..1b1c627 100644 --- a/src/terminal/font/properties.c +++ b/src/terminal/font/properties.c @@ -136,7 +136,7 @@ static guint check_font_family(const gchar *family_name) if(rc) g_warning(invalid_font_messages[rc],family_name); else - g_message(invalid_font_messages[rc],family_name); + g_message(invalid_font_messages[0],family_name); return rc; } diff --git a/src/terminal/keyboard/accelerator.c b/src/terminal/keyboard/accelerator.c index b3331ef..44bcae1 100644 --- a/src/terminal/keyboard/accelerator.c +++ b/src/terminal/keyboard/accelerator.c @@ -217,6 +217,7 @@ } */ + /* #ifdef DEBUG { g_autofree gchar * keyname = gtk_accelerator_name(accel->key,accel->mods); @@ -245,7 +246,7 @@ } #endif // DEBUG - + */ } const gchar * v3270_accelerator_get_name(const V3270Accelerator * accel) diff --git a/src/terminal/windows/init.c b/src/terminal/windows/init.c index 7d3d371..fc8e4de 100644 --- a/src/terminal/windows/init.c +++ b/src/terminal/windows/init.c @@ -40,24 +40,29 @@ BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED(lpvResvd)) { - debug("%s starts",__FUNCTION__); - switch(dwcallpurpose) { case DLL_PROCESS_ATTACH: - debug("%s: DLL_PROCESS_ATTACH",__FUNCTION__); { - char lpFilename[4096]; + char lpFilename[MAX_PATH+1]; memset(lpFilename,0,sizeof(lpFilename)); - DWORD szPath = GetModuleFileName(hInstance,lpFilename,4095); + + DWORD szPath = GetModuleFileName(hInstance,lpFilename,MAX_PATH); lpFilename[szPath] = 0; char * ptr = strrchr(lpFilename,'\\'); - if(ptr) - ptr[1] = 0; + if(ptr) { + ptr[0] = 0; + + ptr = strrchr(lpFilename,'\\'); + if(ptr && !(strcasecmp(ptr,"\\bin") && strcasecmp(ptr,"\\lib"))) { + *ptr = 0; + } + + } - strncat(lpFilename,"locale",4095); + strncat(lpFilename,"\\locale",MAX_PATH); bindtextdomain(GETTEXT_PACKAGE,lpFilename); bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); @@ -67,11 +72,9 @@ BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED( break; case DLL_PROCESS_DETACH: - debug("%s: DLL_PROCESS_DETACH",__FUNCTION__); break; } - debug("%s ends",__FUNCTION__); return TRUE; } -- libgit2 0.21.2