[mednaffe] 03/11: New upstream version 0.8.5
Stephen Kitt
skitt at moszumanska.debian.org
Thu Jul 13 07:23:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit f99595ed61f7a3fd2c9518855887d08f91bd640c
Author: Stephen Kitt <steve at sk2.org>
Date: Thu Jul 13 09:05:00 2017 +0200
New upstream version 0.8.5
---
ChangeLog | 9 +++++
README.md | 2 +-
configure | 52 ++++++++++++-------------
configure.ac | 6 +--
share/win/ChangeLog_Mednaffe.txt | 16 ++++++++
share/win/NOTICE.txt | 2 +-
share/win/README_WINDOWS.txt | 4 +-
share/win/mednaffe.rc | 10 ++---
src/about.c | 2 +-
src/mednaffe_glade.h | 10 ++++-
src/prefs.c | 2 +-
src/system_glade.h | 82 +++++++++++++++++++++++++++++++++++++++-
src/toggles.c | 28 ++++++++------
13 files changed, 169 insertions(+), 56 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6b19e4b..9c29b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+#### 14 / Feb / 2017
+
+Mednaffe 0.8.5 is released with the following changes:
+
+- Check properly version of mednafen emulator (It fails when used
+ spanish locale on Linux).
+- Fixed Saturn bios setup.
+- Add expansion cart option for Saturn.
+
#### 21 / Jan / 2017
Mednaffe 0.8.4 is released with the following changes:
diff --git a/README.md b/README.md
index c0a3e6a..1521553 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Its main features are:
* The only dependency (on Linux) is GTK+2 (or GTK+3).
* GPLv3 licensed.
-#### Downloads - Version 0.8.4
+#### Downloads - Version 0.8.5
* You can download Mednaffe [here](https://sites.google.com/site/amatcoder/mednaffe/downloads/ "Downloads").
* You can see the changelog [here](https://github.com/AmatCoder/mednaffe/blob/master/ChangeLog "ChangeLog").
diff --git a/configure b/configure
index c43d0c8..1bca6f6 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mednaffe 0.8.4.
+# Generated by GNU Autoconf 2.69 for mednaffe 0.8.5.
#
# Report bugs to <BUG-REPORT-ADDRESS>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='mednaffe'
PACKAGE_TARNAME='mednaffe'
-PACKAGE_VERSION='0.8.4'
-PACKAGE_STRING='mednaffe 0.8.4'
+PACKAGE_VERSION='0.8.5'
+PACKAGE_STRING='mednaffe 0.8.5'
PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
PACKAGE_URL=''
@@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mednaffe 0.8.4 to adapt to many kinds of systems.
+\`configure' configures mednaffe 0.8.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1304,7 +1304,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mednaffe 0.8.4:";;
+ short | recursive ) echo "Configuration of mednaffe 0.8.5:";;
esac
cat <<\_ACEOF
@@ -1402,7 +1402,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mednaffe configure 0.8.4
+mednaffe configure 0.8.5
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1457,7 +1457,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mednaffe $as_me 0.8.4, which was
+It was created by mednaffe $as_me 0.8.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2320,7 +2320,7 @@ fi
# Define the identity of the package.
PACKAGE='mednaffe'
- VERSION='0.8.4'
+ VERSION='0.8.5'
cat >>confdefs.h <<_ACEOF
@@ -3647,12 +3647,12 @@ if test -n "$GTK_CFLAGS"; then
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -3664,12 +3664,12 @@ if test -n "$GTK_LIBS"; then
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -3690,9 +3690,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -3724,12 +3724,12 @@ if test -n "$GTK_CFLAGS"; then
pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -3741,12 +3741,12 @@ if test -n "$GTK_LIBS"; then
pkg_cv_GTK_LIBS="$GTK_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -3767,9 +3767,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0" 2>&1`
else
- GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK_PKG_ERRORS" >&5
@@ -4327,7 +4327,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mednaffe $as_me 0.8.4, which was
+This file was extended by mednaffe $as_me 0.8.5, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4393,7 +4393,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mednaffe config.status 0.8.4
+mednaffe config.status 0.8.5
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 3f73752..f34ce96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.68])
-AC_INIT([mednaffe], [0.8.4], [BUG-REPORT-ADDRESS])
+AC_INIT([mednaffe], [0.8.5], [BUG-REPORT-ADDRESS])
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
AC_CONFIG_SRCDIR([src/common.h])
AC_CONFIG_HEADERS([config.h])
@@ -23,11 +23,11 @@ else
fi
if test "x$enable_gtk3" = xyes; then
- PKG_CHECK_MODULES([GTK],[gtk+-3.0 >= 3.4 glib-2.0 >= 2.28 gthread-2.0], AC_MSG_NOTICE([GTK 3.x selected explicitly]), AC_MSG_ERROR(Mednaffe needs GTK+ >= 3.4 development libraries))
+ PKG_CHECK_MODULES([GTK],[gtk+-3.0 >= 3.4 glib-2.0 >= 2.32 gthread-2.0], AC_MSG_NOTICE([GTK 3.x selected explicitly]), AC_MSG_ERROR(Mednaffe needs GTK+ >= 3.4 development libraries))
GTK_DEFINES="-DGTK3_ENABLED"
AC_DEFINE([GTK3_ENABLED],[1],[Define to 1 if you have GTK 3])
else
- PKG_CHECK_MODULES([GTK],[gtk+-2.0 >= 2.24 glib-2.0 >= 2.28 gthread-2.0], AC_MSG_NOTICE([selecting GTK 2.x automatically]), AC_MSG_ERROR(Mednaffe needs GTK+ >= 2.24 development libraries))
+ PKG_CHECK_MODULES([GTK],[gtk+-2.0 >= 2.24 glib-2.0 >= 2.32 gthread-2.0], AC_MSG_NOTICE([selecting GTK 2.x automatically]), AC_MSG_ERROR(Mednaffe needs GTK+ >= 2.24 development libraries))
GTK_DEFINES="-DGTK2_ENABLED"
AC_DEFINE([GTK2_ENABLED],[1],[Define to 1 if you have GTK 2])
fi
diff --git a/share/win/ChangeLog_Mednaffe.txt b/share/win/ChangeLog_Mednaffe.txt
index f1e26a8..eeb9236 100644
--- a/share/win/ChangeLog_Mednaffe.txt
+++ b/share/win/ChangeLog_Mednaffe.txt
@@ -1,3 +1,19 @@
+#### 14 / Feb / 2017
+
+Mednaffe 0.8.5 is released with the following changes:
+
+- Check properly version of mednafen emulator (It fails when used
+ spanish locale on Linux).
+- Fixed Saturn bios setup.
+- Add expansion cart option for Saturn.
+
+#### 21 / Jan / 2017
+
+Mednaffe 0.8.4 is released with the following changes:
+
+- Added support for new settings added by mednafen 0.9.41 (Obviously,
+ it needs this version or higher to work).
+
#### 19 / Nov / 2016
Mednaffe 0.8.3 is released with the following changes:
diff --git a/share/win/NOTICE.txt b/share/win/NOTICE.txt
index 4d0442f..3fd232e 100644
--- a/share/win/NOTICE.txt
+++ b/share/win/NOTICE.txt
@@ -2,7 +2,7 @@
------------------
Mednaffe is licensed under the GNU GENERAL PUBLIC LICENSE version 3.
-See: /licenses/mednaffe-0.8/COPYING
+See: /licenses/mednaffe/COPYING
This build of Mednaffe uses libraries (statically-linked) and resources
from various free sofware / open source projects.
diff --git a/share/win/README_WINDOWS.txt b/share/win/README_WINDOWS.txt
index f44a4e4..40b84ad 100644
--- a/share/win/README_WINDOWS.txt
+++ b/share/win/README_WINDOWS.txt
@@ -1,8 +1,8 @@
- README for Mednaffe 0.8.3 (Windows version)
+ README for Mednaffe 0.8.5 (Windows version)
-------------------------------------------------------------------------------------------
Mednaffe is a front-end (GUI) for mednafen emulator.
-It only works with 0.9.39.1 or higher versions of mednafen emulator.
+It only works with 0.9.41 or higher versions of mednafen emulator.
This is a static build. See NOTICE.txt for license details.
diff --git a/share/win/mednaffe.rc b/share/win/mednaffe.rc
index 988544c..ff67f23 100644
--- a/share/win/mednaffe.rc
+++ b/share/win/mednaffe.rc
@@ -1,21 +1,21 @@
1 ICON "mednaffe.ico"
1 VERSIONINFO
-FILEVERSION 0,8,3,0
-PRODUCTVERSION 0,8,3,0
+FILEVERSION 0,8,5,0
+PRODUCTVERSION 0,8,5,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "A front-end (GUI) for Mednafen emulator"
- VALUE "FileVersion", "0.8.3"
+ VALUE "FileVersion", "0.8.5"
VALUE "InternalName", "mednaffe"
- VALUE "LegalCopyright", "Copyright © 2010-2016 AmatCoder"
+ VALUE "LegalCopyright", "Copyright \251 2010-2017 AmatCoder"
VALUE "LegalTrademarks", "Released under GPLv3"
VALUE "OriginalFilename", "mednaffe.exe"
VALUE "ProductName", "Mednaffe"
- VALUE "ProductVersion", "0.8.3"
+ VALUE "ProductVersion", "0.8.5"
END
END
diff --git a/src/about.c b/src/about.c
index 4ec0d88..a346c36 100644
--- a/src/about.c
+++ b/src/about.c
@@ -45,7 +45,7 @@ along with Mednaffe. If not, see <http://www.gnu.org/licenses/>.";
gtk_show_about_dialog(
GTK_WINDOW(gui->topwindow),
"program-name", "Mednaffe",
- "version" ,"0.8.4",
+ "version" ,"0.8.5",
"authors", authors,
#ifdef STATIC_ENABLED
"copyright", "See NOTICE file for license details.",
diff --git a/src/mednaffe_glade.h b/src/mednaffe_glade.h
index 6e489aa..6a107a6 100644
--- a/src/mednaffe_glade.h
+++ b/src/mednaffe_glade.h
@@ -4675,6 +4675,9 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
@@ -4932,6 +4935,9 @@ static const char *mednaffe_glade =
"<child>\n"
"<placeholder/>\n"
"</child>\n"
+"<child>\n"
+"<placeholder/>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
@@ -5812,7 +5818,7 @@ static const char *mednaffe_glade =
"<property name=\"can_focus\">False</property>\n"
"<child>\n"
"<object class=\"GtkStatusbar\" id=\"sbnumber\">\n"
-"<property name=\"width_request\">150</property>\n"
+"<property name=\"width_request\">180</property>\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
"</object>\n"
@@ -5835,7 +5841,7 @@ static const char *mednaffe_glade =
"</child>\n"
"<child>\n"
"<object class=\"GtkStatusbar\" id=\"sbversion\">\n"
-"<property name=\"width_request\">170</property>\n"
+"<property name=\"width_request\">90</property>\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
"</object>\n"
diff --git a/src/prefs.c b/src/prefs.c
index 48ae3b9..4fcdf87 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -111,7 +111,7 @@ void save_prefs(guidata *gui)
key_file=g_key_file_new();
/*g_key_file_set_list_separator(key_file, 0x0D);*/
- g_key_file_set_comment(key_file, NULL, NULL, " Version 0.8.4\n \
+ g_key_file_set_comment(key_file, NULL, NULL, " Version 0.8.5\n \
Do not edit this file!", NULL);
g_key_file_set_string(key_file, "GUI", "Bin", gui->binpath);
diff --git a/src/system_glade.h b/src/system_glade.h
index d8fc656..6a13ab9 100644
--- a/src/system_glade.h
+++ b/src/system_glade.h
@@ -5638,6 +5638,29 @@ static const char *system_glade =
"</row>\n"
"</data>\n"
"</object>\n"
+"<object class=\"GtkListStore\" id=\"ss_extension_cart\">\n"
+"<columns>\n"
+"<!-- column-name gchararray1 -->\n"
+"<column type=\"gchararray\"/>\n"
+"</columns>\n"
+"<data>\n"
+"<row>\n"
+"<col id=\"0\">auto</col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\">none</col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\">backup</col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\">extram1</col>\n"
+"</row>\n"
+"<row>\n"
+"<col id=\"0\">extram4</col>\n"
+"</row>\n"
+"</data>\n"
+"</object>\n"
"<object class=\"GtkVBox\" id=\"ssinputbox\">\n"
"<property name=\"visible\">True</property>\n"
"<property name=\"can_focus\">False</property>\n"
@@ -5819,6 +5842,61 @@ static const char *system_glade =
"<property name=\"position\">4</property>\n"
"</packing>\n"
"</child>\n"
+"<child>\n"
+"<object class=\"GtkHBox\" id=\"hbox22\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"spacing\">12</property>\n"
+"<child>\n"
+"<object class=\"GtkLabel\" id=\"label123\">\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"label\" translatable=\"yes\">Expansion cart: </property>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"expand\">False</property>\n"
+"<property name=\"fill\">True</property>\n"
+"<property name=\"position\">0</property>\n"
+"</packing>\n"
+"</child>\n"
+"<child>\n"
+"<object class=\"GtkComboBox\" id=\"-ss.cart\">\n"
+"<property name=\"width_request\">100</property>\n"
+"<property name=\"visible\">True</property>\n"
+"<property name=\"can_focus\">False</property>\n"
+"<property name=\"has_tooltip\">True</property>\n"
+"<property name=\"tooltip_text\" translatable=\"yes\">auto - Automatic\n"
+"\n"
+"none - None\n"
+"\n"
+"backup - Backup Memory(512KiB)\n"
+"\n"
+"extram1 - 1MiB Extended RAM\n"
+"\n"
+"extram4 - 4MiB Extended RAM</property>\n"
+"<property name=\"model\">ss_extension_cart</property>\n"
+"<property name=\"active\">0</property>\n"
+"<child>\n"
+"<object class=\"GtkCellRendererText\" id=\"cellrenderertextsscart\"/>\n"
+"<attributes>\n"
+"<attribute name=\"text\">0</attribute>\n"
+"</attributes>\n"
+"</child>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"expand\">False</property>\n"
+"<property name=\"fill\">True</property>\n"
+"<property name=\"position\">1</property>\n"
+"</packing>\n"
+"</child>\n"
+"</object>\n"
+"<packing>\n"
+"<property name=\"expand\">False</property>\n"
+"<property name=\"fill\">True</property>\n"
+"<property name=\"padding\">6</property>\n"
+"<property name=\"position\">5</property>\n"
+"</packing>\n"
+"</child>\n"
"</object>\n"
"</child>\n"
"</object>\n"
@@ -6328,7 +6406,7 @@ static const char *system_glade =
"<property name=\"can_focus\">True</property>\n"
"<property name=\"receives_default\">True</property>\n"
"<property name=\"use_stock\">True</property>\n"
-"<signal name=\"clicked\" handler=\"on_button_entry_clicked\" swapped=\"no\"/>\n"
+"<signal name=\"clicked\" handler=\"on_button_entry_clicked\" object=\"-ss.bios_na_eu\" swapped=\"no\"/>\n"
"</object>\n"
"<packing>\n"
"<property name=\"expand\">False</property>\n"
@@ -6399,7 +6477,7 @@ static const char *system_glade =
"<property name=\"can_focus\">True</property>\n"
"<property name=\"receives_default\">True</property>\n"
"<property name=\"use_stock\">True</property>\n"
-"<signal name=\"clicked\" handler=\"on_button_entry_clicked\" swapped=\"no\"/>\n"
+"<signal name=\"clicked\" handler=\"on_button_entry_clicked\" object=\"-ss.bios_jp\" swapped=\"no\"/>\n"
"</object>\n"
"<packing>\n"
"<property name=\"expand\">False</property>\n"
diff --git a/src/toggles.c b/src/toggles.c
index dbdfef8..662d56a 100644
--- a/src/toggles.c
+++ b/src/toggles.c
@@ -360,7 +360,7 @@ gchar* get_cfg(const gchar *home, guidata *gui)
#endif
if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR))
- print_log("Starting Mednaffe 0.8.4\n\
+ print_log("Starting Mednaffe 0.8.5\n\
Mednafen 09x configuration file found.\n", FE, gui);
else return NULL;
@@ -381,20 +381,22 @@ Mednafen 09x configuration file found.\n", FE, gui);
gboolean check_version(gchar *stout, guidata *gui)
{
- if (stout)
+ if (stout !=NULL)
{
if (strlen(stout)<1) return FALSE;
gchar **achar = g_strsplit(stout, "\n", 0);
- gchar **aline = g_strsplit(achar[0], " ", 2);
- if (g_strv_length(aline)<2) return FALSE;
- if (strlen(aline[1])<15) return FALSE;
+ gchar *check =g_strrstr (achar[0], "0.9.");
+ if (check == NULL) return FALSE;
- if (aline[1][11]!='9')
- return FALSE;
- if (aline[1][13]-'0'<4)
+ gchar **aline = g_strsplit(check, " ", 2);
+
+ if (strlen(aline[0])<6) return FALSE;
+
+ if (aline[0][4]-'0'<4)
return FALSE;
+
/* if ((aline[1][13]=='3') && ((aline[1][14]-'0')<9))
return FALSE; */
/*
@@ -409,17 +411,19 @@ gboolean check_version(gchar *stout, guidata *gui)
return FALSE;
}
*/
- print_log("Version detected: ", FE, gui);
- print_log(aline[1], FE, gui);
+ print_log("Mednafen version detected: ", FE, gui);
+ print_log(aline[0], FE, gui);
#ifdef G_OS_UNIX
print_log("\n", FE, gui);
#endif
print_log("----\n", FE, gui);
GtkStatusbar *sbversion = GTK_STATUSBAR(gtk_builder_get_object(gui->builder, "sbversion"));
- gtk_statusbar_push(GTK_STATUSBAR(sbversion), 1, aline[1]);
+ gtk_statusbar_push(GTK_STATUSBAR(sbversion), 1, aline[0]);
- gtk_widget_set_tooltip_text(GTK_WIDGET(sbversion), gui->binpath);
+ gchar *tooltip = g_strconcat("Mednafen version detected: ",aline[0], "\nPath: ", gui->binpath, NULL);
+ gtk_widget_set_tooltip_text(GTK_WIDGET(sbversion), tooltip);
+ g_free(tooltip);
g_strfreev(achar);
g_strfreev(aline);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mednaffe.git
More information about the Pkg-games-commits
mailing list