Download as
Browse Code »

Commit 18d3698b1a7a6f0c87da6f38dd9e1719883eef2d

Authored by Perry Werneck
1 parent 8d4eb8bc
Exists in master and in 2 other branches develop, script-support

Fixing icons in the windows package.

Showing 2 changed files with 13 additions and 4 deletions   Show diff stats
src/objects/application/application.c
  Diff comments   View file @18d3698
@@ -132,7 +132,7 @@ static void g_log_to_lib3270(const gchar *log_domain,GLogLevelFlags G_GNUC_UNUSE @@ -132,7 +132,7 @@ static void g_log_to_lib3270(const gchar *log_domain,GLogLevelFlags G_GNUC_UNUSE
132 debug("%s",message); 132 debug("%s",message);
133 lib3270_write_log( 133 lib3270_write_log(
134 NULL, 134 NULL,
135 - log_domain ? log_domain : G_STRINGIFY(PRODUCT_NAME), 135 + log_domain ? log_domain : "gtk",
136 "%s", 136 "%s",
137 message 137 message
138 ); 138 );
src/objects/window/window.c
  Diff comments   View file @18d3698
@@ -152,8 +152,11 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla @@ -152,8 +152,11 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla
152 152
153 size_t ix; 153 size_t ix;
154 for(ix = 0; ix < G_N_ELEMENTS(icon_search_paths); ix++) { 154 for(ix = 0; ix < G_N_ELEMENTS(icon_search_paths); ix++) {
155 -#ifdef DEBUG 155 +#if defined(DEBUG)
156 lib3270_autoptr(char) path = g_build_filename(g_get_current_dir(),icon_search_paths[ix],NULL); 156 lib3270_autoptr(char) path = g_build_filename(g_get_current_dir(),icon_search_paths[ix],NULL);
  157 +#elif defined(_WIN32)
  158 + g_autofree gchar * appdir = g_win32_get_package_installation_directory_of_module(NULL);
  159 + lib3270_autoptr(char) path = g_build_filename(appdir,icon_search_paths[ix],NULL);
157 #else 160 #else
158 lib3270_autoptr(char) path = lib3270_build_data_filename(icon_search_paths[ix],NULL); 161 lib3270_autoptr(char) path = lib3270_build_data_filename(icon_search_paths[ix],NULL);
159 #endif 162 #endif
@@ -164,10 +167,15 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla @@ -164,10 +167,15 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla
164 gtk_icon_theme_get_default(), 167 gtk_icon_theme_get_default(),
165 path 168 path
166 ); 169 );
  170 + } else {
  171 +
  172 + g_message("Folder '%s' is not valid",path);
  173 +
167 } 174 }
  175 +
168 } 176 }
169 177
170 -#ifdef DEBUG 178 +#if defined(DEBUG) || defined(_WIN32)
171 { 179 {
172 gchar **paths = NULL; 180 gchar **paths = NULL;
173 gint n_paths = 0; 181 gint n_paths = 0;
@@ -178,9 +186,10 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla @@ -178,9 +186,10 @@ static void pw3270ApplicationWindow_class_init(pw3270ApplicationWindowClass *kla
178 &n_paths 186 &n_paths
179 ); 187 );
180 188
  189 + g_message("Icon search path:");
181 gint p; 190 gint p;
182 for(p = 0; p < n_paths;p++) { 191 for(p = 0; p < n_paths;p++) {
183 - printf("**** [%s]\n",paths[p]); 192 + g_message("\t%s",paths[p]);
184 } 193 }
185 } 194 }
186 #endif // DEBUG 195 #endif // DEBUG