Download as
Browse Code »

Commit 03ced09fff547524ab001c3cc9139b2a1306dac9

Authored by Perry Werneck
Committed by GitHub
2 parents 7ea7bbb4 eb20d0c5
Exists in master and in 1 other branch develop

Merge pull request #21 from PerryWerneck/develop 

Small fixes and adjustments.
Showing 3 changed files with 16 additions and 12 deletions   Show diff stats
Makefile.in
  Diff comments   View file @03ced09
... ... @@ -46,10 +46,8 @@ PRODUCT_NAME=@PRODUCT_NAME@
46 46 INSTALL_PACKAGES=@INSTALL_PACKAGES@
47 47 GETTEXT_PACKAGE=@GETTEXT_PACKAGE@
48 48  
49   -SOURCES= \
  49 +COMMON_SOURCES= \
50 50 $(wildcard $(srcdir)/src/terminal/*.c) \
51   - $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.rc) \
52   - $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.c) \
53 51 $(wildcard $(srcdir)/src/terminal/properties/*.c) \
54 52 $(wildcard $(srcdir)/src/terminal/drawing/*.c) \
55 53 $(wildcard $(srcdir)/src/terminal/font/*.c) \
... ... @@ -57,16 +55,21 @@ SOURCES= \
57 55 $(wildcard $(srcdir)/src/terminal/actions/*.c) \
58 56 $(wildcard $(srcdir)/src/filetransfer/*.c) \
59 57 $(wildcard $(srcdir)/src/selection/*.c) \
60   - $(wildcard $(srcdir)/src/selection/@OSNAME@/*.c) \
61 58 $(wildcard $(srcdir)/src/trace/*.c) \
62 59 $(wildcard $(srcdir)/src/dialogs/*.c) \
63   - $(wildcard $(srcdir)/src/dialogs/@OSNAME@/*.c) \
64 60 $(wildcard $(srcdir)/src/dialogs/print/*.c) \
65 61 $(wildcard $(srcdir)/src/dialogs/save/*.c) \
66 62 $(wildcard $(srcdir)/src/dialogs/font/*.c) \
67 63 $(wildcard $(srcdir)/src/dialogs/settings/*.c) \
68 64 $(wildcard $(srcdir)/src/tools/*.c)
69 65  
  66 +SOURCES= \
  67 + $(COMMON_SOURCES) \
  68 + $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.rc) \
  69 + $(wildcard $(srcdir)/src/terminal/@OSNAME@/*.c) \
  70 + $(wildcard $(srcdir)/src/selection/@OSNAME@/*.c) \
  71 + $(wildcard $(srcdir)/src/dialogs/@OSNAME@/*.c) \
  72 +
70 73 TEST_SOURCES= \
71 74 $(wildcard $(srcdir)/src/testprogram/*.c)
72 75  
... ...
mac/libv3270.modules
  Diff comments   View file @03ced09
... ... @@ -12,6 +12,7 @@
12 12 <branch repo="github.com" module="PerryWerneck/libv3270" revision="macos" />
13 13 <dependencies>
14 14 <dep package="meta-gtk-osx-bootstrap"/>
  15 + <dep package="librsvg"/>
15 16 <dep package="glib"/>
16 17 <dep package="gtk+-3.0"/>
17 18 <!-- dep package="gtk-mac-integration"/ -->
... ...
src/dialogs/save/save.c
  Diff comments   View file @03ced09
... ... @@ -42,11 +42,11 @@
42 42  
43 43 /*--[ Formats ]--------------------------------------------------------------------------------------*/
44 44  
45   - static const struct _formats
  45 + static const struct _file_types
46 46 {
47 47 const gchar *name;
48 48 const gchar *extension;
49   - } formats[] =
  49 + } file_types[] =
50 50 {
51 51 {
52 52 N_("Plain text"),
... ... @@ -296,13 +296,13 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
296 296  
297 297 gtk_grid_attach(grid,GTK_WIDGET(dialog->format),3,1,1,1);
298 298  
299   - for(ix=0;ix<G_N_ELEMENTS(formats);ix++)
  299 + for(ix=0;ix<G_N_ELEMENTS(file_types);ix++)
300 300 {
301 301 gtk_combo_box_text_insert(
302 302 GTK_COMBO_BOX_TEXT(dialog->format),
303 303 -1,
304   - formats[ix].extension,
305   - g_dgettext(GETTEXT_PACKAGE,formats[ix].name)
  304 + file_types[ix].extension,
  305 + g_dgettext(GETTEXT_PACKAGE,file_types[ix].name)
306 306 );
307 307 }
308 308  
... ... @@ -579,9 +579,9 @@ static void icon_press(GtkEntry *entry, G_GNUC_UNUSED GtkEntryIconPosition icon_
579 579 const gchar * format = gtk_combo_box_get_active_id(GTK_COMBO_BOX(dialog->format));
580 580  
581 581 // Check for text formats.
582   - for(ix=0;ix<G_N_ELEMENTS(formats);ix++)
  582 + for(ix=0;ix<G_N_ELEMENTS(file_types);ix++)
583 583 {
584   - if(!strcmp(formats[ix].extension,format))
  584 + if(!strcmp(file_types[ix].extension,format))
585 585 {
586 586 // Is text format, save it
587 587 save_as_text(dialog, ix, error);
... ...