[mednaffe] 84/99: Move 'get_cfg' function
Stephen Kitt
skitt at moszumanska.debian.org
Tue Aug 2 21:00:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository mednaffe.
commit 452d35064dc1e7442f9e1d6fbede4049ecca8fdb
Author: AmatCoder <amatcoder at gmail.com>
Date: Thu Jul 23 11:14:10 2015 +0200
Move 'get_cfg' function
---
src/mednaffe.c | 32 --------------------------------
src/toggles.c | 31 +++++++++++++++++++++++++++++++
src/toggles.h | 1 +
3 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/src/mednaffe.c b/src/mednaffe.c
index 0c2cf09..499ad8f 100644
--- a/src/mednaffe.c
+++ b/src/mednaffe.c
@@ -33,7 +33,6 @@
#include "common.h"
#include "toggles.h"
-#include "log.h"
#include "prefs.h"
#include "logo.h"
#include "mednaffe_glade.h"
@@ -296,37 +295,6 @@ void delete(GtkWidget *widget, GdkEvent *event, guidata *gui)
quit(widget,gui);
}
-gchar *get_cfg(const gchar *home, guidata *gui)
-{
- gchar *cfg_path;
-
- /* Search for mednafen configuration file */
- #ifdef G_OS_WIN32
- cfg_path = g_strconcat(home, "\\mednafen-09x.cfg", NULL);
- #else
- cfg_path = g_strconcat(home, "/.mednafen/mednafen-09x.cfg", NULL);
- #endif
-
- if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR))
- print_log("Starting Mednaffe 0.7\n\
-Mednafen 09x configuration file found.\n", FE, gui);
- else return NULL;
-
- /*{
- #ifdef G_OS_WIN32
- cfg_path = g_strconcat(home, "\\mednafen.cfg", NULL);
- #else
- cfg_path = g_strconcat(home, "/.mednafen/mednafen.cfg", NULL);
- #endif
- if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR))
- printf(" Mednafen 08x configuration file found\n");
- else
- cfg_path = NULL;
- }*/
-
- return cfg_path;
-}
-
int main(int argc, char **argv)
{
guidata gui;
diff --git a/src/toggles.c b/src/toggles.c
index b31bcf0..6bf2e17 100644
--- a/src/toggles.c
+++ b/src/toggles.c
@@ -345,6 +345,37 @@ if (event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
}
}*/
+gchar* get_cfg(const gchar *home, guidata *gui)
+{
+ gchar *cfg_path;
+
+ /* Search for mednafen configuration file */
+ #ifdef G_OS_WIN32
+ cfg_path = g_strconcat(home, "\\mednafen-09x.cfg", NULL);
+ #else
+ cfg_path = g_strconcat(home, "/.mednafen/mednafen-09x.cfg", NULL);
+ #endif
+
+ if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR))
+ print_log("Starting Mednaffe 0.7\n\
+Mednafen 09x configuration file found.\n", FE, gui);
+ else return NULL;
+
+ /*{
+ #ifdef G_OS_WIN32
+ cfg_path = g_strconcat(home, "\\mednafen.cfg", NULL);
+ #else
+ cfg_path = g_strconcat(home, "/.mednafen/mednafen.cfg", NULL);
+ #endif
+ if (g_file_test (cfg_path, G_FILE_TEST_IS_REGULAR))
+ printf(" Mednafen 08x configuration file found\n");
+ else
+ cfg_path = NULL;
+ }*/
+
+ return cfg_path;
+}
+
gboolean check_version(gchar *stout, guidata *gui)
{
if (stout)
diff --git a/src/toggles.h b/src/toggles.h
index af61bfe..0e1c5b3 100644
--- a/src/toggles.h
+++ b/src/toggles.h
@@ -28,6 +28,7 @@
void set_combo(gpointer widget, guidata *gui);
void set_spin(gpointer widget, guidata *gui);
void set_values(GtkBuilder *builder, guidata *gui);
+ gchar* get_cfg(const gchar *home, guidata *gui);
gboolean check_version(gchar *stout, guidata *gui);
gboolean read_cfg(guidata *gui);
--
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