Download as
Browse Code »

Commit 03d34987655395367d672a787117f3c68626f86c

Authored by Perry Werneck
1 parent 142ec7a9
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Fixing windows bugs.

Showing 4 changed files with 9 additions and 3 deletions   Show diff stats
@@ -50,6 +50,7 @@ resources.rc @@ -50,6 +50,7 @@ resources.rc
50 makeruntime.sh 50 makeruntime.sh
51 scripts 51 scripts
52 locale 52 locale
  53 +certs
53 *.xz 54 *.xz
54 src/include/lib3270 55 src/include/lib3270
55 *.desktop 56 *.desktop
src/pw3270/main.c
  Diff comments   View file @03d3498
@@ -254,7 +254,7 @@ int main(int argc, char *argv[]) @@ -254,7 +254,7 @@ int main(int argc, char *argv[])
254 trace("appdir=\"%s\"",appdir); 254 trace("appdir=\"%s\"",appdir);
255 trace("locdir=\"%s\"",locdir); 255 trace("locdir=\"%s\"",locdir);
256 256
257 - g_chdir(appdir); 257 +// g_chdir(appdir);
258 258
259 bindtextdomain( PACKAGE_NAME, locdir ); 259 bindtextdomain( PACKAGE_NAME, locdir );
260 bind_textdomain_codeset(PACKAGE_NAME, "UTF-8"); 260 bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
@@ -426,7 +426,7 @@ int main(int argc, char *argv[]) @@ -426,7 +426,7 @@ int main(int argc, char *argv[])
426 426
427 g_message("Windows Application directory is \"%s\"",appdir); 427 g_message("Windows Application directory is \"%s\"",appdir);
428 428
429 - g_chdir(appdir); 429 +// g_chdir(appdir);
430 430
431 g_message("Application name is \"%s\"", g_get_application_name()); 431 g_message("Application name is \"%s\"", g_get_application_name());
432 g_message("Session name is \"%s\"", session_name ? session_name : "undefined"); 432 g_message("Session name is \"%s\"", session_name ? session_name : "undefined");
@@ -476,6 +476,7 @@ int main(int argc, char *argv[]) @@ -476,6 +476,7 @@ int main(int argc, char *argv[])
476 session_name = PACKAGE_NAME; 476 session_name = PACKAGE_NAME;
477 477
478 rc = initialize(); 478 rc = initialize();
  479 +
479 if(!rc) 480 if(!rc)
480 { 481 {
481 GtkSettings *settings = gtk_settings_get_default(); 482 GtkSettings *settings = gtk_settings_get_default();
@@ -487,6 +488,7 @@ int main(int argc, char *argv[]) @@ -487,6 +488,7 @@ int main(int argc, char *argv[])
487 } 488 }
488 489
489 toplevel = pw3270_new(host,systype,syscolors); 490 toplevel = pw3270_new(host,systype,syscolors);
  491 +
490 pw3270_set_session_name(toplevel,session_name); 492 pw3270_set_session_name(toplevel,session_name);
491 493
492 if(oversize) 494 if(oversize)
src/pw3270/plugin.c
  Diff comments   View file @03d3498
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 { 43 {
44 #ifdef _WIN32 44 #ifdef _WIN32
45 UINT errorMode; 45 UINT errorMode;
46 - lib3270_autoptr(char) path = lib3270_build_data_filename("plugins") 46 + lib3270_autoptr(char) path = lib3270_build_data_filename("plugins",NULL);
47 #else 47 #else
48 const gchar * path = LIBDIR G_DIR_SEPARATOR_S G_STRINGIFY(PRODUCT_NAME) "-plugins"; 48 const gchar * path = LIBDIR G_DIR_SEPARATOR_S G_STRINGIFY(PRODUCT_NAME) "-plugins";
49 #endif // _WIN32 49 #endif // _WIN32
src/pw3270/window.c
  Diff comments   View file @03d3498
@@ -775,6 +775,9 @@ static GtkWidget * trace_window = NULL; @@ -775,6 +775,9 @@ static GtkWidget * trace_window = NULL;
775 lib3270_autoptr(char) path = lib3270_build_data_filename("ui",NULL); 775 lib3270_autoptr(char) path = lib3270_build_data_filename("ui",NULL);
776 #endif // DEBUG 776 #endif // DEBUG
777 777
  778 + trace("Loading UI from \"%s\"",path);
  779 + trace("Current dir is \"%s\"",g_get_current_dir());
  780 +
778 if(ui_parse_xml_folder(GTK_WINDOW(widget),path,groupname,popupname,widget->terminal,widget_setup)) 781 if(ui_parse_xml_folder(GTK_WINDOW(widget),path,groupname,popupname,widget->terminal,widget_setup))
779 { 782 {
780 gtk_widget_set_sensitive(widget->terminal,FALSE); 783 gtk_widget_set_sensitive(widget->terminal,FALSE);