Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 20 insertions, 20 deletions

diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index c7448163..77e07828 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -67,7 +67,7 @@ int destroy = 0;
 /* TODO - If MAX_SLOTS changes, need to find a way to automatically set all positions */
 int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 
-void ResetMenuSlots(GladeXML *xml) {
+static void ResetMenuSlots(GladeXML *xml) {
 	GtkWidget *widget;
 	gchar *str;
 	int i;
@@ -411,7 +411,7 @@ void OnDestroy() {
 	if (!destroy) OnFile_Exit();
 }
 
-void destroy_main_window () {
+static void destroy_main_window () {
 	destroy = 1;
 	gtk_widget_destroy(Window);
 	Window = NULL;
@@ -467,7 +467,7 @@ void OnFile_RunExe() {
 				g_free(file);
 				SysRunGui();
 			} else {
-				// Auto-detect: get region first, then rcnt-bios reset

+				// Auto-detect: get region first, then rcnt-bios reset
 				SysReset();
 
 				if (Load(file) == 0) {
@@ -510,9 +510,9 @@ void OnFile_RunCd() {
 		return;
 	}
 
-	// Auto-detect: get region first, then rcnt-bios reset

-	SysReset();

-

+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	// Read main executable directly from CDRom and start it
 	if (LoadCdrom() == -1) {
 		ClosePlugins();
@@ -651,9 +651,9 @@ void OnFile_RunImage() {
 		return;
 	}
 
-	// Auto-detect: get region first, then rcnt-bios reset

-	SysReset();

-

+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	// Read main executable directly from CDRom and start it
 	if (LoadCdrom() == -1) {
 		ClosePlugins();
@@ -698,9 +698,9 @@ void OnEmu_Reset() {
 		LoadCdrom();
 	}
 
-	// Auto-detect: get region first, then rcnt-bios reset

-	SysReset();

-

+	// Auto-detect: get region first, then rcnt-bios reset
+	SysReset();
+
 	psxCpu->Execute();
 }
 
@@ -805,11 +805,11 @@ void state_load(gchar *state_filename) {
 			SysRunGui();
 			return;
 		}
-

+
 		// Auto-detect: region first, then rcnt reset
-		SysReset();

-		ret = LoadState(state_filename);

-

+		SysReset();
+		ret = LoadState(state_filename);
+
 		sprintf(Text, _("Loaded state %s."), state_filename);
 		GPU_displayText(Text);
 	} else {
@@ -833,7 +833,7 @@ void state_save(gchar *state_filename) {
 
 void on_states_load (GtkWidget *widget, gpointer user_data) {
 	gchar *state_filename;
-	gint state = (int)user_data;
+	gint state = (int)(long)user_data;
 
 	state_filename = get_state_filename(state);
 
@@ -846,7 +846,7 @@ void on_states_load (GtkWidget *widget, gpointer user_data) {
 
 void on_states_save (GtkWidget *widget, gpointer user_data) {
 	gchar *state_filename;
-	gint state = (int)user_data;
+	gint state = (int)(long)user_data;
 
 	state_filename = get_state_filename(state);
 
@@ -959,7 +959,7 @@ void SysErrorMessage(gchar *primary, gchar *secondary) {
 				primary,
 				NULL);
 		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
-				secondary);
+				"%s", secondary);
 
 		gtk_dialog_run(GTK_DIALOG(message_dialog));
 		gtk_widget_destroy(message_dialog);
@@ -978,7 +978,7 @@ void SysInfoMessage(gchar *primary, gchar *secondary) {
 				primary,
 				NULL);
 		gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog),
-				secondary);
+				"%s", secondary);
 
 		gtk_dialog_run(GTK_DIALOG(message_dialog));
 		gtk_widget_destroy(message_dialog);