Download as
Browse Code »

Commit da57b5b8c2f3925bf635fdff2b61d1de3a9a58f5

Authored by Perry Werneck
1 parent 8abd6f5e
Exists in develop

Less debug messsages.

Showing 3 changed files with 16 additions and 12 deletions   Show diff stats
src/terminal/font/properties.c
  Diff comments   View file @da57b5b
... ... @@ -136,7 +136,7 @@ static guint check_font_family(const gchar *family_name)
136 136 if(rc)
137 137 g_warning(invalid_font_messages[rc],family_name);
138 138 else
139   - g_message(invalid_font_messages[rc],family_name);
  139 + g_message(invalid_font_messages[0],family_name);
140 140  
141 141 return rc;
142 142 }
... ...
src/terminal/keyboard/accelerator.c
  Diff comments   View file @da57b5b
... ... @@ -217,6 +217,7 @@
217 217 }
218 218 */
219 219  
  220 + /*
220 221 #ifdef DEBUG
221 222 {
222 223 g_autofree gchar * keyname = gtk_accelerator_name(accel->key,accel->mods);
... ... @@ -245,7 +246,7 @@
245 246  
246 247 }
247 248 #endif // DEBUG
248   -
  249 + */
249 250 }
250 251  
251 252 const gchar * v3270_accelerator_get_name(const V3270Accelerator * accel)
... ...
src/terminal/windows/init.c
  Diff comments   View file @da57b5b
... ... @@ -40,24 +40,29 @@
40 40  
41 41 BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED(lpvResvd))
42 42 {
43   - debug("%s starts",__FUNCTION__);
44   -
45 43 switch(dwcallpurpose)
46 44 {
47 45 case DLL_PROCESS_ATTACH:
48   - debug("%s: DLL_PROCESS_ATTACH",__FUNCTION__);
49 46 {
50   - char lpFilename[4096];
  47 + char lpFilename[MAX_PATH+1];
51 48  
52 49 memset(lpFilename,0,sizeof(lpFilename));
53   - DWORD szPath = GetModuleFileName(hInstance,lpFilename,4095);
  50 +
  51 + DWORD szPath = GetModuleFileName(hInstance,lpFilename,MAX_PATH);
54 52 lpFilename[szPath] = 0;
55 53  
56 54 char * ptr = strrchr(lpFilename,'\\');
57   - if(ptr)
58   - ptr[1] = 0;
  55 + if(ptr) {
  56 + ptr[0] = 0;
  57 +
  58 + ptr = strrchr(lpFilename,'\\');
  59 + if(ptr && !(strcasecmp(ptr,"\\bin") && strcasecmp(ptr,"\\lib"))) {
  60 + *ptr = 0;
  61 + }
  62 +
  63 + }
59 64  
60   - strncat(lpFilename,"locale",4095);
  65 + strncat(lpFilename,"\\locale",MAX_PATH);
61 66  
62 67 bindtextdomain(GETTEXT_PACKAGE,lpFilename);
63 68 bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
... ... @@ -67,11 +72,9 @@ BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwcallpurpose, LPVOID G_GNUC_UNUSED(
67 72 break;
68 73  
69 74 case DLL_PROCESS_DETACH:
70   - debug("%s: DLL_PROCESS_DETACH",__FUNCTION__);
71 75 break;
72 76  
73 77 }
74 78  
75   - debug("%s ends",__FUNCTION__);
76 79 return TRUE;
77 80 }
... ...