Commit aea4aed0188c64cb7f83f3d0f4ae81c0de264c6d

Authored by Perry Werneck
1 parent b8476a9e

Fixing windows load of gschemas.

Showing 2 changed files with 10 additions and 5 deletions   Show diff stats
@@ -145,7 +145,6 @@ @@ -145,7 +145,6 @@
145 <Unit filename="src/objects/settings/gsettings.c"> 145 <Unit filename="src/objects/settings/gsettings.c">
146 <Option compilerVar="CC" /> 146 <Option compilerVar="CC" />
147 </Unit> 147 </Unit>
148 - <Unit filename="src/objects/settings/gsettings.cc" />  
149 <Unit filename="src/objects/settings/widget.c"> 148 <Unit filename="src/objects/settings/widget.c">
150 <Option compilerVar="CC" /> 149 <Option compilerVar="CC" />
151 </Unit> 150 </Unit>
src/objects/settings/gsettings.c
@@ -27,8 +27,6 @@ @@ -27,8 +27,6 @@
27 #include <glib/gi18n.h> 27 #include <glib/gi18n.h>
28 #include <gtk/gtk.h> 28 #include <gtk/gtk.h>
29 29
30 - #include <lib3270.h>  
31 - #include <v3270/dialogs.h>  
32 #include <pw3270/application.h> 30 #include <pw3270/application.h>
33 #include <pw3270/window.h> 31 #include <pw3270/window.h>
34 32
@@ -47,7 +45,9 @@ @@ -47,7 +45,9 @@
47 &error 45 &error
48 ); 46 );
49 47
50 - if(v3270_popup_gerror(NULL, &error, "Configuration error", _("Can't load '%s' from current path"), "gschemas.compiled")) { 48 + if(error) {
  49 + g_warning("Error loading '%s': %s","gschemas.compiled",error->message);
  50 + g_error_free(error);
51 return NULL; 51 return NULL;
52 } 52 }
53 53
@@ -80,7 +80,9 @@ @@ -80,7 +80,9 @@
80 &error 80 &error
81 ); 81 );
82 82
83 - if(v3270_popup_gerror(NULL, &error, "Configuration error", _("Can't load '%s'"), filename)) { 83 + if(error) {
  84 + g_warning("Error loading '%s': %s",filename,error->message);
  85 + g_error_free(error);
84 return NULL; 86 return NULL;
85 } 87 }
86 88
@@ -111,6 +113,10 @@ @@ -111,6 +113,10 @@
111 113
112 #endif // DEBUG 114 #endif // DEBUG
113 115
  116 + if(!settings) {
  117 + g_warning("Error creating settings");
  118 + }
  119 +
114 return settings; 120 return settings;
115 } 121 }
116 122