Download as
Browse Code »

Commit 800d3401370814fcfa4f18fb620c4bf7a1322807

Authored by Perry Werneck
1 parent acfaf4f5
Exists in master and in 1 other branch develop

Fixing win32 builds.

Showing 11 changed files with 46 additions and 47 deletions   Show diff stats
Makefile.in
  Diff comments   View file @800d340
... ... @@ -313,7 +313,7 @@ install-static: \
313 313 # Install static library
314 314 @$(INSTALL_DATA) \
315 315 $(BINRLS)/static/$(LIBNAME).a \
316   - $(DESTDIR)$(libdir)
  316 + $(DESTDIR)$(libdir)/$(LIBNAME)-static.a
317 317  
318 318 install-dev: \
319 319 install-shared
... ...
src/dialogs/hostselect.c
  Diff comments   View file @800d340
... ... @@ -298,7 +298,7 @@ static void V3270HostSelectWidget_init(V3270HostSelectWidget *widget)
298 298 gtk_container_add(GTK_CONTAINER(widget),GTK_WIDGET(grid));
299 299 }
300 300  
301   -GtkWidget * v3270_host_select_new(GtkWidget *widget)
  301 +LIB3270_EXPORT GtkWidget * v3270_host_select_new(GtkWidget *widget)
302 302 {
303 303 g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
304 304  
... ... @@ -309,7 +309,7 @@ GtkWidget * v3270_host_select_new(GtkWidget *widget)
309 309 return GTK_WIDGET(selector);
310 310 }
311 311  
312   -void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *session)
  312 +LIB3270_EXPORT void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *session)
313 313 {
314 314 g_return_if_fail(GTK_IS_V3270(session));
315 315 g_return_if_fail(GTK_IS_V3270HostSelectWidget(widget));
... ... @@ -376,7 +376,7 @@ void v3270_host_select_set_session(V3270HostSelectWidget *widget, GtkWidget *ses
376 376 widget->options = opt;
377 377 }
378 378  
379   -void v3270_select_host(GtkWidget *widget)
  379 +LIB3270_EXPORT void v3270_select_host(GtkWidget *widget)
380 380 {
381 381 g_return_if_fail(GTK_IS_V3270(widget));
382 382  
... ...
src/include/v3270.h
  Diff comments   View file @800d340
... ... @@ -193,11 +193,11 @@
193 193 V3270_SELECT_MAX
194 194 } V3270_SELECT_FORMAT;
195 195  
196   - void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut);
197   - void v3270_copy_append(GtkWidget *widget);
198   - gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);
  196 + void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut);
  197 + void v3270_copy_append(GtkWidget *widget);
  198 + gchar * v3270_get_selected(GtkWidget *widget, gboolean cut);
199 199 gchar * v3270_get_copy(GtkWidget *widget);
200   - void v3270_set_copy(GtkWidget *widget, const gchar *text);
  200 + void v3270_set_copy(GtkWidget *widget, const gchar *text);
201 201  
202 202 int v3270_run_script(GtkWidget *widget, const gchar *script);
203 203  
... ...
src/v3270/draw.c
  Diff comments   View file @800d340
... ... @@ -367,7 +367,7 @@ cairo_surface_t *gdk_window_create_similar_surface(GdkWindow *window, cairo_cont
367 367 }
368 368 #endif // GTK_CHECK_VERSION(2, 22, 0)
369 369  
370   -void v3270_reload(GtkWidget *widget)
  370 +LIB3270_EXPORT void v3270_reload(GtkWidget *widget)
371 371 {
372 372 v3270 * terminal = GTK_V3270(widget);
373 373  
... ...
src/v3270/properties.c
  Diff comments   View file @800d340
... ... @@ -258,13 +258,13 @@
258 258  
259 259 }
260 260  
261   - void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes)
  261 + LIB3270_EXPORT void v3270_set_auto_disconnect(GtkWidget *widget, guint minutes)
262 262 {
263 263 g_return_if_fail(GTK_IS_V3270(widget));
264 264 GTK_V3270(widget)->activity.disconnect = minutes;
265 265 }
266 266  
267   - guint v3270_get_auto_disconnect(GtkWidget *widget)
  267 + LIB3270_EXPORT guint v3270_get_auto_disconnect(GtkWidget *widget)
268 268 {
269 269 g_return_val_if_fail(GTK_IS_V3270(widget),0);
270 270 return GTK_V3270(widget)->activity.disconnect;
... ...
src/v3270/selection.c
  Diff comments   View file @800d340
... ... @@ -214,7 +214,7 @@ static const char * update_selected_text(GtkWidget *widget, gboolean cut)
214 214 * @return NULL if error, otherwise the selected buffer contents (release with g_free).
215 215 *
216 216 */
217   -gchar * v3270_get_selected(GtkWidget *widget, gboolean cut)
  217 +LIB3270_EXPORT gchar * v3270_get_selected(GtkWidget *widget, gboolean cut)
218 218 {
219 219 const char *text;
220 220  
... ... @@ -228,7 +228,7 @@ gchar * v3270_get_selected(GtkWidget *widget, gboolean cut)
228 228 return NULL;
229 229 }
230 230  
231   -gchar * v3270_get_copy(GtkWidget *widget)
  231 +LIB3270_EXPORT gchar * v3270_get_copy(GtkWidget *widget)
232 232 {
233 233 const char *text;
234 234 g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
... ... @@ -244,7 +244,7 @@ gchar * v3270_get_copy(GtkWidget *widget)
244 244 return NULL;
245 245 }
246 246  
247   -void v3270_set_copy(GtkWidget *widget, const gchar *text)
  247 +LIB3270_EXPORT void v3270_set_copy(GtkWidget *widget, const gchar *text)
248 248 {
249 249 v3270 * terminal;
250 250 gchar * isotext;
... ... @@ -335,7 +335,7 @@ void v3270_copy_append(GtkWidget *widget)
335 335  
336 336 }
337 337  
338   -void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut)
  338 +LIB3270_EXPORT void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut)
339 339 {
340 340 g_return_if_fail(GTK_IS_V3270(widget));
341 341 GTK_V3270(widget)->table = (mode == V3270_SELECT_TABLE ? 1 : 0);
... ... @@ -345,7 +345,7 @@ void v3270_copy(GtkWidget *widget, V3270_SELECT_FORMAT mode, gboolean cut)
345 345  
346 346 #ifdef _WIN32
347 347  
348   -void v3270_paste(GtkWidget *widget)
  348 +LIB3270_EXPORT void v3270_paste(GtkWidget *widget)
349 349 {
350 350 HGLOBAL hglb;
351 351  
... ...
src/v3270/widget.c
  Diff comments   View file @800d340
... ... @@ -997,7 +997,7 @@ static int popup_handler(H3270 *session, LIB3270_NOTIFY type, const char *title,
997 997  
998 998 }
999 999  
1000   -GtkWidget * v3270_new(void)
  1000 +LIB3270_EXPORT GtkWidget * v3270_new(void)
1001 1001 {
1002 1002 return g_object_new(GTK_TYPE_V3270, NULL);
1003 1003 }
... ... @@ -1447,7 +1447,7 @@ void v3270_set_color_table(GdkRGBA *table, const gchar *colors)
1447 1447  
1448 1448 }
1449 1449  
1450   -void v3270_set_font_family(GtkWidget *widget, const gchar *name)
  1450 +LIB3270_EXPORT void v3270_set_font_family(GtkWidget *widget, const gchar *name)
1451 1451 {
1452 1452 v3270 * terminal;
1453 1453  
... ... @@ -1478,13 +1478,13 @@ void v3270_set_font_family(GtkWidget *widget, const gchar *name)
1478 1478  
1479 1479 }
1480 1480  
1481   -const gchar * v3270_get_font_family(GtkWidget *widget)
  1481 +LIB3270_EXPORT const gchar * v3270_get_font_family(GtkWidget *widget)
1482 1482 {
1483 1483 g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
1484 1484 return GTK_V3270(widget)->font.family;
1485 1485 }
1486 1486  
1487   -void v3270_disconnect(GtkWidget *widget)
  1487 +LIB3270_EXPORT void v3270_disconnect(GtkWidget *widget)
1488 1488 {
1489 1489 g_return_if_fail(GTK_IS_V3270(widget));
1490 1490 v3270_disable_updates(widget);
... ... @@ -1497,14 +1497,14 @@ void v3270_disconnect(GtkWidget *widget)
1497 1497 debug("%s",__FUNCTION__);
1498 1498 }
1499 1499  
1500   -H3270 * v3270_get_session(GtkWidget *widget)
  1500 +LIB3270_EXPORT H3270 * v3270_get_session(GtkWidget *widget)
1501 1501 {
1502 1502 g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
1503 1503  
1504 1504 return GTK_V3270(widget)->host;
1505 1505 }
1506 1506  
1507   -int v3270_connect(GtkWidget *widget)
  1507 +LIB3270_EXPORT int v3270_connect(GtkWidget *widget)
1508 1508 {
1509 1509 g_return_val_if_fail(GTK_IS_V3270(widget),EINVAL);
1510 1510  
... ... @@ -1577,7 +1577,7 @@ GtkIMContext * v3270_get_im_context(GtkWidget *widget)
1577 1577 return GTK_V3270(widget)->input_method;
1578 1578 }
1579 1579  
1580   -gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
  1580 +LIB3270_EXPORT gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
1581 1581 {
1582 1582 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
1583 1583  
... ... @@ -1588,7 +1588,7 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
1588 1588 }
1589 1589  
1590 1590 /**
1591   - * v3270_set_host:
  1591 + * v3270_set_url:
1592 1592 *
1593 1593 * @widget: V3270 widget.
1594 1594 * @uri: a valid tn3270 URL.
... ... @@ -1597,25 +1597,25 @@ gboolean v3270_get_toggle(GtkWidget *widget, LIB3270_TOGGLE ix)
1597 1597 *
1598 1598 * Since: 5.0
1599 1599 **/
1600   -const void v3270_set_url(GtkWidget *widget, const gchar *uri)
  1600 +LIB3270_EXPORT void v3270_set_url(GtkWidget *widget, const gchar *uri)
1601 1601 {
1602 1602 g_return_val_if_fail(GTK_IS_V3270(widget),NULL);
1603 1603 lib3270_set_url(GTK_V3270(widget)->host,uri);
1604 1604 }
1605 1605  
1606   -const gchar * v3270_get_hostname(GtkWidget *widget)
  1606 +LIB3270_EXPORT const gchar * v3270_get_hostname(GtkWidget *widget)
1607 1607 {
1608 1608 g_return_val_if_fail(GTK_IS_V3270(widget),"");
1609 1609 return lib3270_get_hostname(GTK_V3270(widget)->host);
1610 1610 }
1611 1611  
1612   -const gchar * v3270_get_luname(GtkWidget *widget)
  1612 +LIB3270_EXPORT const gchar * v3270_get_luname(GtkWidget *widget)
1613 1613 {
1614 1614 g_return_val_if_fail(GTK_IS_V3270(widget),"");
1615 1615 return lib3270_get_luname(GTK_V3270(widget)->host);
1616 1616 }
1617 1617  
1618   -const gchar * v3270_get_session_name(GtkWidget *widget)
  1618 +LIB3270_EXPORT const gchar * v3270_get_session_name(GtkWidget *widget)
1619 1619 {
1620 1620 #ifdef DEBUG
1621 1621 v3270 * terminal = GTK_V3270(widget);
... ... @@ -1636,7 +1636,7 @@ void v3270_set_scaled_fonts(GtkWidget *widget, gboolean on)
1636 1636  
1637 1637 }
1638 1638  
1639   -void v3270_set_session_name(GtkWidget *widget, const gchar *name)
  1639 +LIB3270_EXPORT void v3270_set_session_name(GtkWidget *widget, const gchar *name)
1640 1640 {
1641 1641 g_return_if_fail(GTK_IS_V3270(widget));
1642 1642 g_return_if_fail(name != NULL);
... ... @@ -1647,37 +1647,37 @@ void v3270_set_session_name(GtkWidget *widget, const gchar *name)
1647 1647 GTK_V3270(widget)->session_name = g_strdup(name);
1648 1648 }
1649 1649  
1650   -void v3270_set_session_options(GtkWidget *widget, LIB3270_OPTION options)
  1650 +LIB3270_EXPORT void v3270_set_session_options(GtkWidget *widget, LIB3270_OPTION options)
1651 1651 {
1652 1652 g_return_if_fail(GTK_IS_V3270(widget));
1653 1653 lib3270_set_options(GTK_V3270(widget)->host,options);
1654 1654 }
1655 1655  
1656   -int v3270_set_session_color_type(GtkWidget *widget, unsigned short colortype)
  1656 +LIB3270_EXPORT int v3270_set_session_color_type(GtkWidget *widget, unsigned short colortype)
1657 1657 {
1658 1658 g_return_val_if_fail(GTK_IS_V3270(widget),EFAULT);
1659 1659 return lib3270_set_color_type(GTK_V3270(widget)->host,colortype);
1660 1660 }
1661 1661  
1662   -int v3270_set_host_type(GtkWidget *widget, const char *name)
  1662 +LIB3270_EXPORT int v3270_set_host_type(GtkWidget *widget, const char *name)
1663 1663 {
1664 1664 g_return_val_if_fail(GTK_IS_V3270(widget),EFAULT);
1665 1665 return lib3270_set_host_type(GTK_V3270(widget)->host,name);
1666 1666 }
1667 1667  
1668   -unsigned short v3270_get_session_color_type(GtkWidget *widget)
  1668 +LIB3270_EXPORT unsigned short v3270_get_session_color_type(GtkWidget *widget)
1669 1669 {
1670 1670 g_return_val_if_fail(GTK_IS_V3270(widget),-1);
1671 1671 return lib3270_get_color_type(GTK_V3270(widget)->host);
1672 1672 }
1673 1673  
1674   -gboolean v3270_is_connected(GtkWidget *widget)
  1674 +LIB3270_EXPORT gboolean v3270_is_connected(GtkWidget *widget)
1675 1675 {
1676 1676 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
1677 1677 return lib3270_connected(GTK_V3270(widget)->host) ? TRUE : FALSE;
1678 1678 }
1679 1679  
1680   -int v3270_set_host_charset(GtkWidget *widget, const gchar *name)
  1680 +LIB3270_EXPORT int v3270_set_host_charset(GtkWidget *widget, const gchar *name)
1681 1681 {
1682 1682 g_return_val_if_fail(GTK_IS_V3270(widget),FALSE);
1683 1683 return lib3270_set_host_charset(GTK_V3270(widget)->host,name);
... ...
src/v3270ft/filelist.c
  Diff comments   View file @800d340
... ... @@ -32,40 +32,39 @@
32 32  
33 33 /*--[ Implement ]------------------------------------------------------------------------------------*/
34 34  
35   -guint v3270ft_get_length(GtkWidget *widget) {
  35 +LIB3270_EXPORT guint v3270ft_get_length(GtkWidget *widget) {
36 36 return g_list_length(GTK_V3270FT(widget)->files);
37 37 }
38 38  
39   -
40   -void v3270ft_select_first(GtkWidget *widget) {
  39 +LIB3270_EXPORT void v3270ft_select_first(GtkWidget *widget) {
41 40  
42 41 v3270ft * dialog = GTK_V3270FT(widget);
43 42 v3270ft_set_active(dialog,g_list_first(dialog->files));
44 43  
45 44 }
46 45  
47   -void v3270ft_select_last(GtkWidget *widget) {
  46 +LIB3270_EXPORT void v3270ft_select_last(GtkWidget *widget) {
48 47  
49 48 v3270ft * dialog = GTK_V3270FT(widget);
50 49 v3270ft_set_active(dialog,g_list_last(dialog->files));
51 50  
52 51 }
53 52  
54   -void v3270ft_select_previous(GtkWidget *widget) {
  53 +LIB3270_EXPORT void v3270ft_select_previous(GtkWidget *widget) {
55 54  
56 55 v3270ft * dialog = GTK_V3270FT(widget);
57 56 v3270ft_set_active(dialog,g_list_previous(dialog->active));
58 57  
59 58 }
60 59  
61   -void v3270ft_select_next(GtkWidget *widget) {
  60 +LIB3270_EXPORT void v3270ft_select_next(GtkWidget *widget) {
62 61  
63 62 v3270ft * dialog = GTK_V3270FT(widget);
64 63 v3270ft_set_active(dialog,g_list_next(dialog->active));
65 64  
66 65 }
67 66  
68   -void v3270ft_remove_selected(GtkWidget *widget) {
  67 +LIB3270_EXPORT void v3270ft_remove_selected(GtkWidget *widget) {
69 68  
70 69 v3270ft * dialog = GTK_V3270FT(widget);
71 70  
... ...
src/v3270ft/load.c
  Diff comments   View file @800d340
... ... @@ -228,7 +228,7 @@ static void validate_item(struct v3270ft_entry *entry, GError *error) {
228 228 v3270ft_update_state(entry);
229 229 }
230 230  
231   -void v3270ft_load(GtkWidget *widget,const gchar *filename) {
  231 +LIB3270_EXPORT void v3270ft_load(GtkWidget *widget,const gchar *filename) {
232 232  
233 233 static const GMarkupParser parser = {
234 234 (void (*)(GMarkupParseContext *, const gchar *, const gchar **, const gchar **, gpointer, GError **)) element_start,
... ...
src/v3270ft/transfer.c
  Diff comments   View file @800d340
... ... @@ -133,7 +133,7 @@ static void transfer_failed(GtkWidget *progress, const gchar *primary, const gch
133 133  
134 134 }
135 135  
136   -gint v3270ft_transfer(GtkWidget *dialog, H3270 *session) {
  136 +LIB3270_EXPORT gint v3270ft_transfer(GtkWidget *dialog, H3270 *session) {
137 137  
138 138 GtkWidget * progress = v3270ftprogress_new();
139 139 gint rc = GTK_RESPONSE_NONE;
... ...
src/v3270ft/v3270ft.c
  Diff comments   View file @800d340
... ... @@ -44,7 +44,7 @@
44 44  
45 45 /*--[ Implement ]------------------------------------------------------------------------------------*/
46 46  
47   -void v3270ft_remove_all(GtkWidget *widget) {
  47 +LIB3270_EXPORT void v3270ft_remove_all(GtkWidget *widget) {
48 48  
49 49 v3270ft *dialog = GTK_V3270FT(widget);
50 50  
... ... @@ -688,13 +688,13 @@ static void v3270ft_init(v3270ft *dialog) {
688 688 }
689 689  
690 690 /**
691   - * v3270ft_dialog_new:
  691 + * v3270ft_new:
692 692 *
693 693 * Creates a new #v3270ft.
694 694 *
695 695 * Returns: a new #v3270ft.
696 696 */
697   -GtkWidget * v3270ft_new(void) {
  697 +LIB3270_EXPORT GtkWidget * v3270ft_new(void) {
698 698 return GTK_WIDGET(g_object_new(GTK_TYPE_V3270FT, "use-header-bar", (gint) 1, NULL));
699 699 }
700 700  
... ...