Download as
Browse Code »

Commit a7dc416809b54804859f53f7b219b8c9a717adee

Authored by Perry Werneck
1 parent f0c7a0ad
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Debugging windows version.

Showing 5 changed files with 16 additions and 4 deletions   Show diff stats
schemas/windows/window.gschema.xml.in
  Diff comments   View file @a7dc416
@@ -75,13 +75,13 @@ @@ -75,13 +75,13 @@
75 </key> 75 </key>
76 76
77 <key name="toolbar-style" type="i"> 77 <key name="toolbar-style" type="i">
78 - <default>-1</default> 78 + <default>0</default>
79 <summary>How to draw the toolbar.</summary> 79 <summary>How to draw the toolbar.</summary>
80 <description></description> 80 <description></description>
81 </key> 81 </key>
82 82
83 <key name="toolbar-icon-size" type="i"> 83 <key name="toolbar-icon-size" type="i">
84 - <default>0</default> 84 + <default>2</default>
85 <summary>The size of the icons in a toolbar</summary> 85 <summary>The size of the icons in a toolbar</summary>
86 <description></description> 86 <description></description>
87 </key> 87 </key>
src/objects/application/actions/window.c
  Diff comments   View file @a7dc416
@@ -89,10 +89,10 @@ @@ -89,10 +89,10 @@
89 return G_ACTION(action); 89 return G_ACTION(action);
90 } 90 }
91 91
92 - static void new_window_activated(GAction *action, GVariant *parameter, GtkApplication *application) { 92 + static void new_window_activated(GAction G_GNUC_UNUSED(*action), GVariant G_GNUC_UNUSED(*parameter), GtkApplication *application) {
93 93
94 debug("%s",__FUNCTION__); 94 debug("%s",__FUNCTION__);
95 - g_application_activate(application); 95 + g_application_activate(G_APPLICATION(application));
96 96
97 } 97 }
98 98
src/objects/settings/dialog.c
  Diff comments   View file @a7dc416
@@ -27,6 +27,11 @@ @@ -27,6 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
  30 +#ifdef _WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 +#endif // _WIN32
  34 +
30 #include <pw3270.h> 35 #include <pw3270.h>
31 #include <pw3270/settings.h> 36 #include <pw3270/settings.h>
32 #include <pw3270/actions.h> 37 #include <pw3270/actions.h>
src/objects/settings/widget.c
  Diff comments   View file @a7dc416
@@ -27,6 +27,11 @@ @@ -27,6 +27,11 @@
27 * 27 *
28 */ 28 */
29 29
  30 +#ifdef _WIN32
  31 + #include <winsock2.h>
  32 + #include <windows.h>
  33 +#endif // _WIN32
  34 +
30 #include <pw3270.h> 35 #include <pw3270.h>
31 #include <pw3270/settings.h> 36 #include <pw3270/settings.h>
32 #include <lib3270.h> 37 #include <lib3270.h>
win/pw3270.nsi.in
  Diff comments   View file @a7dc416
@@ -309,6 +309,8 @@ Section &quot;Uninstall&quot; @@ -309,6 +309,8 @@ Section &quot;Uninstall&quot;
309 DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH" 309 DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH"
310 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 310 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
311 311
  312 + DeleteRegKey HKLM "Software\GSettings\apps\@PACKAGE_NAME@\@PRODUCT_NAME@"
  313 +
312 # Delete System libraries 314 # Delete System libraries
313 ${@NSISREDIR@} 315 ${@NSISREDIR@}
314 316