Download as
Browse Code »

Commit b8f0c934ada831edda053db749f8d2196960ff1f

Authored by Perry Werneck
2 parents e3e6bc1b a75d4e5f
Exists in develop

Merge branch 'develop' into winpkg

Showing 3 changed files with 22 additions and 5 deletions   Show diff stats
.github/workflows/msys2.yml
  Diff comments   View file @b8f0c93
@@ -3,23 +3,41 @@ on: @@ -3,23 +3,41 @@ on:
3 pull_request: 3 pull_request:
4 branches: 4 branches:
5 - master 5 - master
6 - schedule:  
7 - - cron: '30 13 3 2,4,6,8,10,12 *' 6 + push:
  7 + branches:
  8 + - develop
8 9
9 jobs: 10 jobs:
10 msys2-mingw: 11 msys2-mingw:
  12 + name: Publish Windows 64
11 runs-on: windows-latest 13 runs-on: windows-latest
12 defaults: 14 defaults:
13 run: 15 run:
14 shell: msys2 {0} 16 shell: msys2 {0}
15 steps: 17 steps:
16 - uses: actions/checkout@v3 18 - uses: actions/checkout@v3
  19 + - uses: oprypin/find-latest-tag@v1
  20 + id: gettag
  21 + with:
  22 + repository: PerryWerneck/libv3270
  23 + releases-only: true
17 - uses: msys2/setup-msys2@v2 24 - uses: msys2/setup-msys2@v2
18 with: 25 with:
19 msystem: mingw64 26 msystem: mingw64
20 update: true 27 update: true
21 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape 28 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape
  29 + - uses: robinraju/release-downloader@v1.7
  30 + with:
  31 + repository: "PerryWerneck/lib3270"
  32 + latest: true
  33 + fileName: "mingw-lib3270.x86_64.tar.xz"
  34 + - uses: robinraju/release-downloader@v1.7
  35 + with:
  36 + repository: "PerryWerneck/libv3270"
  37 + latest: true
  38 + fileName: "mingw-libv3270.x86_64.tar.xz"
22 - name: CI-Build 39 - name: CI-Build
23 run: | 40 run: |
24 ./win/ci-build.sh 41 ./win/ci-build.sh
25 42
  43 +
@@ -104,7 +104,7 @@ case "$host" in @@ -104,7 +104,7 @@ case "$host" in
104 LDFLAGS="$LDFLAGS -pthread" 104 LDFLAGS="$LDFLAGS -pthread"
105 105
106 # Windows and unix doesn't use the same defaults. 106 # Windows and unix doesn't use the same defaults.
107 - AC_SUBST(DEFAULT_UI_STYLE,0) 107 + AC_SUBST(DEFAULT_UI_STYLE,1)
108 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false") 108 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
109 ;; 109 ;;
110 110
@@ -116,7 +116,7 @@ case "$host" in @@ -116,7 +116,7 @@ case "$host" in
116 LDFLAGS="$LDFLAGS -pthread" 116 LDFLAGS="$LDFLAGS -pthread"
117 117
118 # Windows and unix doesn't use the same defaults. 118 # Windows and unix doesn't use the same defaults.
119 - AC_SUBST(DEFAULT_UI_STYLE,0) 119 + AC_SUBST(DEFAULT_UI_STYLE,1)
120 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false") 120 AC_SUBST(DEFAULT_MENUBAR_VISIBLE,"false")
121 121
122 esac 122 esac
src/objects/actions/view.c
  Diff comments   View file @b8f0c93
@@ -195,7 +195,6 @@ static GSList * append_action(GSList * list, const gchar *prefix, GAction *actio @@ -195,7 +195,6 @@ static GSList * append_action(GSList * list, const gchar *prefix, GAction *actio
195 195
196 GdkPixbuf * pixbuf = g_action_get_pixbuf(action, GTK_ICON_SIZE_MENU, GTK_ICON_LOOKUP_GENERIC_FALLBACK); 196 GdkPixbuf * pixbuf = g_action_get_pixbuf(action, GTK_ICON_SIZE_MENU, GTK_ICON_LOOKUP_GENERIC_FALLBACK);
197 if(!pixbuf) { 197 if(!pixbuf) {
198 - debug("Action \"%s\": Doesn't have a pixbuf",g_action_get_name(action));  
199 return list; 198 return list;
200 } 199 }
201 200